From: Michael Vogt Date: Wed, 28 Sep 2005 08:47:47 +0000 (+0000) Subject: * prepare a new ubuntu upload X-Git-Tag: 0.7.24ubuntu1~292 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/dd9ebe3bbbe3ab48d73d03da498bfa74cc78b415?ds=inline;hp=--cc * prepare a new ubuntu upload Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62 * leak fix for debian #250583 --- dd9ebe3bbbe3ab48d73d03da498bfa74cc78b415 diff --cc configure.in index 458e0730b,87dac8e47..445f837f0 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.6.40.1ubuntu7") -AC_DEFINE_UNQUOTED(VERSION,"0.6.41.1") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.40.1ubuntu8") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index 75aaaa6d6,ac1e0e663..852029360 --- a/debian/changelog +++ b/debian/changelog @@@ -1,44 -1,19 +1,53 @@@ -apt (0.6.41.1) unstable; urgency=low ++apt (0.6.40.1ubuntu8) breezy; urgency=low + - * apt-pkg/cdrom.cc: ++ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62: ++ - fix for a bad memory/file leak in the mmap code (ubuntu #15603) ++ * po/de.po: ++ - updated the translation ++ ++ -- Michael Vogt Wed, 28 Sep 2005 10:16:06 +0200 ++ +apt (0.6.40.1ubuntu7) breezy; urgency=low + + * updated the pot/po files , no code changes + + -- Michael Vogt Tue, 27 Sep 2005 18:38:16 +0200 + +apt (0.6.40.1ubuntu6) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56: + - make it possible for apt to handle a failed MediaChange event and + fall back to other sources (ubuntu #13713) + + -- Michael Vogt Tue, 13 Sep 2005 22:09:50 +0200 + +apt (0.6.40.1ubuntu5) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. + This adds media-change reporting to the apt status-fd (ubuntu #15213) + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: + apt-pkg/cdrom.cc: - unmount the cdrom when apt failed to locate any package files - * allow cdrom failures and fallback to other sources in that case - (closes: #44135) - * better error text when dpkg-source fails - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104: - - patch-99: Added Galician translation - - patch-100: Completed Danish translation (Closes: #325686) - - patch-104: French translation completed - * applied frensh man-page update (thanks to Philippe Batailler) + + -- Michael Vogt Mon, 12 Sep 2005 15:44:26 +0200 + +apt (0.6.40.1ubuntu4) breezy; urgency=low + + * debian/apt.cron.daily: + - fix a embarrassing typo - -- + -- Michael Vogt Wed, 7 Sep 2005 10:10:37 +0200 + +apt (0.6.40.1ubuntu3) breezy; urgency=low + + * debian/apt.cron.daily: + - use the ctime as well when figuring what packages need to + be removed. This fixes the problem that packages copied with + "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) + + -- Michael Vogt Tue, 6 Sep 2005 18:30:46 +0200 -apt (0.6.41) unstable; urgency=low +apt (0.6.40.1ubuntu2) breezy; urgency=low * improved the support for "error" and "conffile" reporting from dpkg, added the format to README.progress-reporting diff --cc po/de.po index ae494a2da,2327f8a44..ed2aec09c --- a/po/de.po +++ b/po/de.po @@@ -1,19 -1,19 +1,15 @@@ --# German messages for the apt suite. --# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. --# Michael Piefel , 2001, 2002, 2003, 2004. --# Rüdiger Kuhlmann , 2002. --# ++# German messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. # Michael Piefel , 2001, 2002, 2003, 2004. # Rüdiger Kuhlmann , 2002. # msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-22 23:07+0200\n" -"PO-Revision-Date: 2005-06-15 18:22+0200\n" -"Last-Translator: Michael Piefel \n" +"POT-Creation-Date: 2005-09-13 15:16+0200\n" - "PO-Revision-Date: 2005-06-15 18:22+0200\n" - "Last-Translator: Michael Piefel \n" ++"PO-Revision-Date: 2005-09-28 10:46+0200\n" ++"Last-Translator: Michael Vogt \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --"Content-Transfer-Encoding: 8bit\n" ++"Content-Transfer-Encoding: 8bit" #: cmdline/apt-cache.cc:135 #, c-format @@@ -700,13 -700,13 +696,12 @@@ msgid "%s (due to %s) msgstr "%s (wegen %s) " #: cmdline/apt-get.cc:544 --#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" --"Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!" ++"Dies sollten Sie NICHT tun, wenn Sie nicht genau wissen, was Sie tun!" #: cmdline/apt-get.cc:575 #, c-format @@@ -769,7 -769,7 +764,7 @@@ msgstr "WARNUNG: Die folgenden Pakete k #: cmdline/apt-get.cc:691 msgid "Authentication warning overridden.\n" --msgstr "" ++msgstr "Authentifizierungswarung wurde überschrieben \n" #: cmdline/apt-get.cc:698 msgid "Install these packages without verification [y/N]? " @@@ -849,7 -849,7 +844,7 @@@ msgid "Yes, do as I say! msgstr "Ja, tu was ich sage!" #: cmdline/apt-get.cc:866 --#, fuzzy, c-format ++#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -1554,8 -1559,8 +1549,7 @@@ msgstr "Kann nicht ins Administrationsv msgid "Internal error getting a package name" msgstr "Interner Fehler beim Holen des Paket-Namens" --# --#: apt-inst/deb/dpkgdb.cc:205 ++# #: apt-inst/deb/dpkgdb.cc:205 msgid "Reading file listing" msgstr "Paketlisten werden gelesen" @@@ -1673,16 -1678,16 +1667,14 @@@ msgstr " "verwendet." #: methods/cdrom.cc:169 --#, fuzzy msgid "Disk not found." --msgstr "Datei nicht gefunden" ++msgstr "Datenträger nicht gefunden" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datei nicht gefunden" --# looks like someone hardcoded English grammar --#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 ++# looks like someone hardcoded English grammar #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kann nicht zugreifen." @@@ -1912,13 -1917,13 +1904,12 @@@ msgstr " #: methods/gpgv.cc:196 msgid "At least one invalid signature was encountered." --msgstr "" ++msgstr "Mindestens eine ungültige Signatur wurde entdeckt." #. FIXME String concatenation considered harmful. #: methods/gpgv.cc:201 --#, fuzzy msgid "Could not execute " --msgstr "Konnte Lock %s nicht bekommen" ++msgstr "Konnte nicht ausführen" #: methods/gpgv.cc:202 msgid " to verify signature (is gnupg installed?)" @@@ -1926,18 -1931,18 +1917,17 @@@ msgstr " #: methods/gpgv.cc:206 msgid "Unknown error executing gpgv" --msgstr "" ++msgstr "Unbekannter Fehler beim ausführen von gpgv" #: methods/gpgv.cc:237 --#, fuzzy msgid "The following signatures were invalid:\n" --msgstr "Die folgenden zusätzlichen Pakete werden installiert:" ++msgstr "Die folgenden Signaturen sind ungültig:\n" #: methods/gpgv.cc:244 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" --msgstr "" ++msgstr "Die folgenden Signaturen konnten nicht überprüft werden weil ihre öffentlichen Schlüssel nicht verfügbar sind:\n" #: methods/gzip.cc:57 #, c-format @@@ -2422,7 -2427,7 +2412,7 @@@ msgstr "Archivverzeichnis %spartial feh #: apt-pkg/acquire.cc:817 #, c-format msgid "Downloading file %li of %li (%s remaining)" --msgstr "" ++msgstr "Lade Datei %li von %li herunter (%s verbleibend)" #: apt-pkg/acquire-worker.cc:113 #, c-format @@@ -2435,12 -2440,12 +2425,10 @@@ msgid "Method %s did not start correctl msgstr "Methode %s hat nicht korrekt gestartet" #: apt-pkg/acquire-worker.cc:377 --#, fuzzy, c-format ++#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" --"Medienwechsel: Bitte legen Sie Medium mit den Name\n" --" »%s«\n" --"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" ++"Bitte legen Sie Medium mit den Name »%s« in Laufwerk »%s« und drücken Sie die Eingabetaste." #: apt-pkg/init.cc:119 #, c-format @@@ -2711,54 -2716,54 +2699,54 @@@ msgstr " "geschrieben.\n" #: apt-pkg/deb/dpkgpm.cc:358 --#, fuzzy, c-format ++#, c-format msgid "Preparing %s" --msgstr "%s wird geöffnet" ++msgstr "Bereite %s vor" #: apt-pkg/deb/dpkgpm.cc:359 --#, fuzzy, c-format ++#, c-format msgid "Unpacking %s" --msgstr "%s wird geöffnet" ++msgstr "%s wird ausgepackt" #: apt-pkg/deb/dpkgpm.cc:364 --#, fuzzy, c-format ++#, c-format msgid "Preparing to configure %s" --msgstr "Öffne Konfigurationsdatei %s" ++msgstr "Bereite %s auf das Konfigurieren vor" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" - msgstr "" -msgstr "Verbinde mit %s" ++msgstr "Konfiguriere %s" #: apt-pkg/deb/dpkgpm.cc:366 --#, fuzzy, c-format ++#, c-format msgid "Installed %s" --msgstr " Installiert:" ++msgstr "Installiert %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" --msgstr "" ++msgstr "Bereits %s auf das Entfernen vor" #: apt-pkg/deb/dpkgpm.cc:372 --#, fuzzy, c-format ++#, c-format msgid "Removing %s" --msgstr "%s wird geöffnet" ++msgstr "Entferne %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" - msgstr "" -msgstr "Empfiehlt" ++msgstr "%s wurde entfernt" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Preparing for remove with config %s" --msgstr "" ++msgstr "Bereite %s auf das Entfernen mit Konfiguration vor" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format msgid "Removed with config %s" --msgstr "" ++msgstr "Habe %s mit Konfiguration entfernt" #: methods/rsh.cc:330 msgid "Connection closed prematurely" @@@ -2798,8 -2803,8 +2786,7 @@@ msgstr "Verbindung zu früh beendet #~ msgid " to " #~ msgstr " nach " --# --#~ msgid "Extract " ++# #~ msgid "Extract " #~ msgstr "Extrahiert " #~ msgid "Aborted, backing out"