1 diff -Nur aptitude-0.2.11.1.orig/po/da.po aptitude-0.2.11.1/po/da.po
2 --- aptitude-0.2.11.1.orig/po/da.po Mon Apr 22 05:34:36 2002
3 +++ aptitude-0.2.11.1/po/da.po Sun Jan 19 17:11:50 2003
7 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
8 -"dpkg problems may not be completed.\n"
9 +"rpm problems may not be completed.\n"
15 #: src/download.cc:490
17 -"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
18 +"Could not regain the system lock! (Perhaps another apt or rpm is running?"
20 -"Kunne ikke gentage system låsen! (Måske kører en anden apt eller dpkg?"
21 +"Kunne ikke gentage system låsen! (Måske kører en anden apt eller rpm?"
23 #: src/pkg_info_screen.cc:82
25 diff -Nur aptitude-0.2.11.1.orig/po/de.po aptitude-0.2.11.1/po/de.po
26 --- aptitude-0.2.11.1.orig/po/de.po Mon Apr 22 05:34:37 2002
27 +++ aptitude-0.2.11.1/po/de.po Sun Jan 19 17:12:02 2003
28 @@ -1965,12 +1965,12 @@
29 #: src/download.cc:374
31 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
32 -"dpkg problems may not be completed.\n"
33 +"rpm problems may not be completed.\n"
36 "WICHTIG: dieses Protokoll zeigt nur geplante Aktionen an. Aktionen, die "
38 -"dpkg-Problemen fehlschlagen sind vielleicht nicht abgeschlossen.\n"
39 +"rpm-Problemen fehlschlagen sind vielleicht nicht abgeschlossen.\n"
41 #: src/download.cc:375
43 @@ -2056,10 +2056,10 @@
45 #: src/download.cc:490
47 -"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
48 +"Could not regain the system lock! (Perhaps another apt or rpm is running?"
50 "Konnte die System-Sperre nicht zurückerlangen! (Vielleicht läuft noch ein "
54 #: src/pkg_info_screen.cc:82
56 diff -Nur aptitude-0.2.11.1.orig/po/es.po aptitude-0.2.11.1/po/es.po
57 --- aptitude-0.2.11.1.orig/po/es.po Mon Nov 26 02:04:23 2001
58 +++ aptitude-0.2.11.1/po/es.po Sun Jan 19 17:12:10 2003
60 #: src/download.cc:220
62 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
63 -"dpkg problems may not be completed.\n"
64 +"rpm problems may not be completed.\n"
67 "IMPORTANTE: este log sólo muestra pretensión de las acciones; las acciones "
69 -"debidas a problemas dpkg no se completarán.\n"
70 +"debidas a problemas rpm no se completarán.\n"
73 #: src/download.cc:221
74 diff -Nur aptitude-0.2.11.1.orig/po/fi.po aptitude-0.2.11.1/po/fi.po
75 --- aptitude-0.2.11.1.orig/po/fi.po Mon Apr 22 05:34:37 2002
76 +++ aptitude-0.2.11.1/po/fi.po Sun Jan 19 17:12:24 2003
77 @@ -2135,11 +2135,11 @@
78 #: src/download.cc:374
80 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
81 -"dpkg problems may not be completed.\n"
82 +"rpm problems may not be completed.\n"
85 "TÄRKEÄÄ: tässä lokissa on vain aiotut toimenpiteet; jos toimenpide\n"
86 -"epäonnistuu dpkg:n ongelmien takia, sitä ei välttämättä suoritettu.\n"
87 +"epäonnistuu rpm:n ongelmien takia, sitä ei välttämättä suoritettu.\n"
90 #: src/download.cc:375
93 #: src/download.cc:490
95 -"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
96 +"Could not regain the system lock! (Perhaps another apt or rpm is running?"
98 -"En saanut järjestelmälukitusta! (Ehkä apt tai dpkg on ajossa muualta?)"
99 +"En saanut järjestelmälukitusta! (Ehkä apt tai rpm on ajossa muualta?)"
101 #: src/pkg_info_screen.cc:82
103 diff -Nur aptitude-0.2.11.1.orig/po/fr.po aptitude-0.2.11.1/po/fr.po
104 --- aptitude-0.2.11.1.orig/po/fr.po Sat Mar 16 04:40:10 2002
105 +++ aptitude-0.2.11.1/po/fr.po Sun Jan 19 17:12:31 2003
106 @@ -441,12 +441,12 @@
107 #: src/download.cc:220
109 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
110 -"dpkg problems may not be completed.\n"
111 +"rpm problems may not be completed.\n"
114 "IMPORTANT : Ces logs ne contiennent que les actions prévues ; Certaines "
116 -"échouer à cause d'erreurs de dpkg, et donc ne pas être réalisées.\n"
117 +"échouer à cause d'erreurs de rpm, et donc ne pas être réalisées.\n"
120 #: src/download.cc:221
121 diff -Nur aptitude-0.2.11.1.orig/po/gl.po aptitude-0.2.11.1/po/gl.po
122 --- aptitude-0.2.11.1.orig/po/gl.po Sat Mar 16 04:40:10 2002
123 +++ aptitude-0.2.11.1/po/gl.po Sun Jan 19 17:12:38 2003
124 @@ -462,12 +462,12 @@
125 #: src/download.cc:220
127 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
128 -"dpkg problems may not be completed.\n"
129 +"rpm problems may not be completed.\n"
132 "IMPORTANTE: este rexistro só fai un listado das accións que se quixeron "
134 -"as accións que fallen por problemas con dpkg poden non terse completado.\n"
135 +"as accións que fallen por problemas con rpm poden non terse completado.\n"
138 #: src/download.cc:221
139 diff -Nur aptitude-0.2.11.1.orig/po/ja.po aptitude-0.2.11.1/po/ja.po
140 --- aptitude-0.2.11.1.orig/po/ja.po Sat Mar 16 04:40:10 2002
141 +++ aptitude-0.2.11.1/po/ja.po Sun Jan 19 17:12:43 2003
143 #: src/download.cc:220
145 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
146 -"dpkg problems may not be completed.\n"
147 +"rpm problems may not be completed.\n"
151 diff -Nur aptitude-0.2.11.1.orig/po/pl.po aptitude-0.2.11.1/po/pl.po
152 --- aptitude-0.2.11.1.orig/po/pl.po Mon Apr 22 05:34:38 2002
153 +++ aptitude-0.2.11.1/po/pl.po Sun Jan 19 17:13:21 2003
154 @@ -2130,11 +2130,11 @@
155 #: src/download.cc:374
157 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
158 -"dpkg problems may not be completed.\n"
159 +"rpm problems may not be completed.\n"
162 "WA¯NE: ten dziennik zawiera planowane dzia³ania. Operacje, w czasie których\n"
163 -"wyst±pi³y b³êdy dpkg mog± nie byæ zakoñczone pomy¶lnie.\n"
164 +"wyst±pi³y b³êdy rpm mog± nie byæ zakoñczone pomy¶lnie.\n"
167 #: src/download.cc:375
168 @@ -2219,9 +2219,9 @@
170 #: src/download.cc:490
172 -"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
173 +"Could not regain the system lock! (Perhaps another apt or rpm is running?"
175 -"Nie uda³o siê odzyskaæ blokady systemowej! Mo¿e pracuje inny apt lub dpkg?"
176 +"Nie uda³o siê odzyskaæ blokady systemowej! Mo¿e pracuje inny apt lub rpm?"
178 #: src/pkg_info_screen.cc:82
180 diff -Nur aptitude-0.2.11.1.orig/src/download.cc aptitude-0.2.11.1/src/download.cc
181 --- aptitude-0.2.11.1.orig/src/download.cc Sun Mar 24 22:21:34 2002
182 +++ aptitude-0.2.11.1/src/download.cc Sun Jan 19 17:18:52 2003
184 #include <apt-pkg/init.h>
185 #include <apt-pkg/clean.h>
186 #include <apt-pkg/error.h>
187 -#include <apt-pkg/dpkgpm.h>
188 +#include <apt-pkg/rpmpm.h>
189 #include <apt-pkg/packagemanager.h>
190 #include <apt-pkg/sourcelist.h>
191 #include <apt-pkg/acquire.h>
195 // Make a package manager, get ready to download
196 - pkgDPkgPM pm(*apt_cache_file);
197 + pkgRPMPM pm(*apt_cache_file);
198 if(!pm.GetArchives(&fetcher, &list, apt_package_records) || _error->PendingError())
200 _error->Error(_("Internal error: couldn't generate list of packages to download"));
203 time_t curtime=time(NULL);
204 fprintf(f, "Aptitude " VERSION ": log report\n%s\n\n", ctime(&curtime));
205 - fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\ndpkg problems may not be completed.\n\n"));
206 + fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\nrpm problems may not be completed.\n\n"));
207 fprintf(f, _("Will install %li packages, and remove %li packages.\n"), (*apt_cache_file)->InstCount(), (*apt_cache_file)->DelCount());
208 if((*apt_cache_file)->UsrSize()>0)
209 fprintf(f, _("%li bytes of disk space will be used\n"), (long int) (*apt_cache_file)->UsrSize());
211 _error->DumpErrors();
212 cerr<<_("Ack! Something bad happened while installing packages. Trying to recover:")<<endl;
213 // and this is really a hack:
214 - system("dpkg --configure -a");
215 + // system("dpkg --configure -a");
220 if(!apt_cache_file->GainLock())
221 // This really shouldn't happen.
223 - _error->Error(_("Could not regain the system lock! (Perhaps another apt or dpkg is running?"));
224 + _error->Error(_("Could not regain the system lock! (Perhaps another apt or rpm is running?"));
228 diff -Nur aptitude-0.2.11.1.orig/src/pkg_info_screen.cc aptitude-0.2.11.1/src/pkg_info_screen.cc
229 --- aptitude-0.2.11.1.orig/src/pkg_info_screen.cc Sun Mar 24 19:54:44 2002
230 +++ aptitude-0.2.11.1/src/pkg_info_screen.cc Sun Jan 19 17:58:47 2003
233 tree->add_child(new vs_staticitem(_("Priority: "),pkgCache::VerIterator(ver).PriorityType()?pkgCache::VerIterator(ver).PriorityType():"Unknown"));
234 tree->add_child(new vs_staticitem(_("Section: "),pkg.Section()?pkg.Section():_("Unknown")));
235 - tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
236 + //tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
237 tree->add_child(new vs_staticitem(_("Compressed size: "), SizeToStr(ver->Size)));
238 tree->add_child(new vs_staticitem(_("Uncompressed size: "), SizeToStr(ver->InstalledSize)));
239 if(!rec.SourcePkg().empty())