+++ /dev/null
-diff -Nur aptitude-0.2.11.1.orig/po/da.po aptitude-0.2.11.1/po/da.po
---- aptitude-0.2.11.1.orig/po/da.po Mon Apr 22 05:34:36 2002
-+++ aptitude-0.2.11.1/po/da.po Sun Jan 19 17:11:50 2003
-@@ -1884,7 +1884,7 @@
- #: src/download.cc:374
- msgid ""
- "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
--"dpkg problems may not be completed.\n"
-+"rpm problems may not be completed.\n"
- "\n"
- msgstr ""
-
-@@ -1970,9 +1970,9 @@
-
- #: src/download.cc:490
- msgid ""
--"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
-+"Could not regain the system lock! (Perhaps another apt or rpm is running?"
- msgstr ""
--"Kunne ikke gentage system låsen! (Måske kører en anden apt eller dpkg?"
-+"Kunne ikke gentage system låsen! (Måske kører en anden apt eller rpm?"
-
- #: src/pkg_info_screen.cc:82
- msgid "Essential: "
-diff -Nur aptitude-0.2.11.1.orig/po/de.po aptitude-0.2.11.1/po/de.po
---- aptitude-0.2.11.1.orig/po/de.po Mon Apr 22 05:34:37 2002
-+++ aptitude-0.2.11.1/po/de.po Sun Jan 19 17:12:02 2003
-@@ -1965,12 +1965,12 @@
- #: src/download.cc:374
- msgid ""
- "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
--"dpkg problems may not be completed.\n"
-+"rpm problems may not be completed.\n"
- "\n"
- msgstr ""
- "WICHTIG: dieses Protokoll zeigt nur geplante Aktionen an. Aktionen, die "
- "wegen\n"
--"dpkg-Problemen fehlschlagen sind vielleicht nicht abgeschlossen.\n"
-+"rpm-Problemen fehlschlagen sind vielleicht nicht abgeschlossen.\n"
-
- #: src/download.cc:375
- #, c-format
-@@ -2056,10 +2056,10 @@
-
- #: src/download.cc:490
- msgid ""
--"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
-+"Could not regain the system lock! (Perhaps another apt or rpm is running?"
- msgstr ""
- "Konnte die System-Sperre nicht zurückerlangen! (Vielleicht läuft noch ein "
--"apt oder dpkg?)"
-+"apt oder rpm?)"
-
- #: src/pkg_info_screen.cc:82
- msgid "Essential: "
-diff -Nur aptitude-0.2.11.1.orig/po/es.po aptitude-0.2.11.1/po/es.po
---- aptitude-0.2.11.1.orig/po/es.po Mon Nov 26 02:04:23 2001
-+++ aptitude-0.2.11.1/po/es.po Sun Jan 19 17:12:10 2003
-@@ -511,12 +511,12 @@
- #: src/download.cc:220
- msgid ""
- "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
--"dpkg problems may not be completed.\n"
-+"rpm problems may not be completed.\n"
- "\n"
- msgstr ""
- "IMPORTANTE: este log sólo muestra pretensión de las acciones; las acciones "
- "fallidas\n"
--"debidas a problemas dpkg no se completarán.\n"
-+"debidas a problemas rpm no se completarán.\n"
- "\n"
-
- #: src/download.cc:221
-diff -Nur aptitude-0.2.11.1.orig/po/fi.po aptitude-0.2.11.1/po/fi.po
---- aptitude-0.2.11.1.orig/po/fi.po Mon Apr 22 05:34:37 2002
-+++ aptitude-0.2.11.1/po/fi.po Sun Jan 19 17:12:24 2003
-@@ -2135,11 +2135,11 @@
- #: src/download.cc:374
- msgid ""
- "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
--"dpkg problems may not be completed.\n"
-+"rpm problems may not be completed.\n"
- "\n"
- msgstr ""
- "TÄRKEÄÄ: tässä lokissa on vain aiotut toimenpiteet; jos toimenpide\n"
--"epäonnistuu dpkg:n ongelmien takia, sitä ei välttämättä suoritettu.\n"
-+"epäonnistuu rpm:n ongelmien takia, sitä ei välttämättä suoritettu.\n"
- "\n"
-
- #: src/download.cc:375
-@@ -2224,9 +2224,9 @@
-
- #: src/download.cc:490
- msgid ""
--"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
-+"Could not regain the system lock! (Perhaps another apt or rpm is running?"
- msgstr ""
--"En saanut järjestelmälukitusta! (Ehkä apt tai dpkg on ajossa muualta?)"
-+"En saanut järjestelmälukitusta! (Ehkä apt tai rpm on ajossa muualta?)"
-
- #: src/pkg_info_screen.cc:82
- msgid "Essential: "
-diff -Nur aptitude-0.2.11.1.orig/po/fr.po aptitude-0.2.11.1/po/fr.po
---- aptitude-0.2.11.1.orig/po/fr.po Sat Mar 16 04:40:10 2002
-+++ aptitude-0.2.11.1/po/fr.po Sun Jan 19 17:12:31 2003
-@@ -441,12 +441,12 @@
- #: src/download.cc:220
- msgid ""
- "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
--"dpkg problems may not be completed.\n"
-+"rpm problems may not be completed.\n"
- "\n"
- msgstr ""
- "IMPORTANT : Ces logs ne contiennent que les actions prévues ; Certaines "
- "actions peuvent\n"
--"échouer à cause d'erreurs de dpkg, et donc ne pas être réalisées.\n"
-+"échouer à cause d'erreurs de rpm, et donc ne pas être réalisées.\n"
- "\n"
-
- #: src/download.cc:221
-diff -Nur aptitude-0.2.11.1.orig/po/gl.po aptitude-0.2.11.1/po/gl.po
---- aptitude-0.2.11.1.orig/po/gl.po Sat Mar 16 04:40:10 2002
-+++ aptitude-0.2.11.1/po/gl.po Sun Jan 19 17:12:38 2003
-@@ -462,12 +462,12 @@
- #: src/download.cc:220
- msgid ""
- "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
--"dpkg problems may not be completed.\n"
-+"rpm problems may not be completed.\n"
- "\n"
- msgstr ""
- "IMPORTANTE: este rexistro só fai un listado das accións que se quixeron "
- "facer;\n"
--"as accións que fallen por problemas con dpkg poden non terse completado.\n"
-+"as accións que fallen por problemas con rpm poden non terse completado.\n"
- "\n"
-
- #: src/download.cc:221
-diff -Nur aptitude-0.2.11.1.orig/po/ja.po aptitude-0.2.11.1/po/ja.po
---- aptitude-0.2.11.1.orig/po/ja.po Sat Mar 16 04:40:10 2002
-+++ aptitude-0.2.11.1/po/ja.po Sun Jan 19 17:12:43 2003
-@@ -516,7 +516,7 @@
- #: src/download.cc:220
- msgid ""
- "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
--"dpkg problems may not be completed.\n"
-+"rpm problems may not be completed.\n"
- "\n"
- msgstr ""
-
-diff -Nur aptitude-0.2.11.1.orig/po/pl.po aptitude-0.2.11.1/po/pl.po
---- aptitude-0.2.11.1.orig/po/pl.po Mon Apr 22 05:34:38 2002
-+++ aptitude-0.2.11.1/po/pl.po Sun Jan 19 17:13:21 2003
-@@ -2130,11 +2130,11 @@
- #: src/download.cc:374
- msgid ""
- "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
--"dpkg problems may not be completed.\n"
-+"rpm problems may not be completed.\n"
- "\n"
- msgstr ""
- "WA¯NE: ten dziennik zawiera planowane dzia³ania. Operacje, w czasie których\n"
--"wyst±pi³y b³êdy dpkg mog± nie byæ zakoñczone pomy¶lnie.\n"
-+"wyst±pi³y b³êdy rpm mog± nie byæ zakoñczone pomy¶lnie.\n"
- "\n"
-
- #: src/download.cc:375
-@@ -2219,9 +2219,9 @@
-
- #: src/download.cc:490
- msgid ""
--"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
-+"Could not regain the system lock! (Perhaps another apt or rpm is running?"
- msgstr ""
--"Nie uda³o siê odzyskaæ blokady systemowej! Mo¿e pracuje inny apt lub dpkg?"
-+"Nie uda³o siê odzyskaæ blokady systemowej! Mo¿e pracuje inny apt lub rpm?"
-
- #: src/pkg_info_screen.cc:82
- msgid "Essential: "
-diff -Nur aptitude-0.2.11.1.orig/src/download.cc aptitude-0.2.11.1/src/download.cc
---- aptitude-0.2.11.1.orig/src/download.cc Sun Mar 24 22:21:34 2002
-+++ aptitude-0.2.11.1/src/download.cc Sun Jan 19 17:18:52 2003
-@@ -30,7 +30,7 @@
- #include <apt-pkg/init.h>
- #include <apt-pkg/clean.h>
- #include <apt-pkg/error.h>
--#include <apt-pkg/dpkgpm.h>
-+#include <apt-pkg/rpmpm.h>
- #include <apt-pkg/packagemanager.h>
- #include <apt-pkg/sourcelist.h>
- #include <apt-pkg/acquire.h>
-@@ -267,7 +267,7 @@
- }
-
- // Make a package manager, get ready to download
-- pkgDPkgPM pm(*apt_cache_file);
-+ pkgRPMPM pm(*apt_cache_file);
- if(!pm.GetArchives(&fetcher, &list, apt_package_records) || _error->PendingError())
- {
- _error->Error(_("Internal error: couldn't generate list of packages to download"));
-@@ -371,7 +371,7 @@
-
- time_t curtime=time(NULL);
- fprintf(f, "Aptitude " VERSION ": log report\n%s\n\n", ctime(&curtime));
-- fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\ndpkg problems may not be completed.\n\n"));
-+ fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\nrpm problems may not be completed.\n\n"));
- fprintf(f, _("Will install %li packages, and remove %li packages.\n"), (*apt_cache_file)->InstCount(), (*apt_cache_file)->DelCount());
- if((*apt_cache_file)->UsrSize()>0)
- fprintf(f, _("%li bytes of disk space will be used\n"), (long int) (*apt_cache_file)->UsrSize());
-@@ -453,7 +453,7 @@
- _error->DumpErrors();
- cerr<<_("Ack! Something bad happened while installing packages. Trying to recover:")<<endl;
- // and this is really a hack:
-- system("dpkg --configure -a");
-+ // system("dpkg --configure -a");
- _error->Discard();
- ok=false;
-
-@@ -487,7 +487,7 @@
- if(!apt_cache_file->GainLock())
- // This really shouldn't happen.
- {
-- _error->Error(_("Could not regain the system lock! (Perhaps another apt or dpkg is running?"));
-+ _error->Error(_("Could not regain the system lock! (Perhaps another apt or rpm is running?"));
- ok=false;
- break;
- }
-diff -Nur aptitude-0.2.11.1.orig/src/pkg_info_screen.cc aptitude-0.2.11.1/src/pkg_info_screen.cc
---- aptitude-0.2.11.1.orig/src/pkg_info_screen.cc Sun Mar 24 19:54:44 2002
-+++ aptitude-0.2.11.1/src/pkg_info_screen.cc Sun Jan 19 17:58:47 2003
-@@ -84,7 +84,7 @@
-
- tree->add_child(new vs_staticitem(_("Priority: "),pkgCache::VerIterator(ver).PriorityType()?pkgCache::VerIterator(ver).PriorityType():"Unknown"));
- tree->add_child(new vs_staticitem(_("Section: "),pkg.Section()?pkg.Section():_("Unknown")));
-- tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
-+ //tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
- tree->add_child(new vs_staticitem(_("Compressed size: "), SizeToStr(ver->Size)));
- tree->add_child(new vs_staticitem(_("Uncompressed size: "), SizeToStr(ver->InstalledSize)));
- if(!rec.SourcePkg().empty())
projects / packages / aptitude.git / blobdiff