From: Michael Vogt Date: Tue, 10 Jan 2006 16:53:41 +0000 (+0000) Subject: * merged with apt--mvo X-Git-Tag: 0.7.24ubuntu1~275 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0e1821f3d826829fb3393c516ea3920eeccf46aa?ds=inline;hp=-c * merged with apt--mvo Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-134 Updated Basque translation * bubulle@debian.org--2005/apt--main--0--patch-135 Completed Basque translation * bubulle@debian.org--2005/apt--main--0--patch-136 French manpage of sources.list updated * bubulle@debian.org--2005/apt--main--0--patch-137 Disable Hebrew translation on trnaslator's request * bubulle@debian.org--2005/apt--main--0--patch-138 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-139 Tagalog translation update * bubulle@debian.org--2005/apt--main--0--patch-140 Fix a translation glitch in German * bubulle@debian.org--2005/apt--main--0--patch-141 Revert the German fix * bubulle@debian.org--2005/apt--main--0--patch-142 Updated Vietnamese translation * bubulle@debian.org--2005/apt--main--0--patch-143 Really add the Vietnamese translation * bubulle@debian.org--2005/apt--main--0--patch-144 Greek translation update * bubulle@debian.org--2005/apt--main--0--patch-145 Simplified Chinese completed * bubulle@debian.org--2005/apt--main--0--patch-146 Czech translation update * bubulle@debian.org--2005/apt--main--0--patch-147 British translation of apt * bubulle@debian.org--2005/apt--main--0--patch-148 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-149 Merge with Michael archive (Debian version) * bubulle@debian.org--2005/apt--main--0--patch-150 Fix typo in apt-get.cc and update PO files * bubulle@debian.org--2005/apt--main--0--patch-151 Update French translation (and document the update-po I ran previously) * bubulle@debian.org--2005/apt--main--0--patch-152 Updated Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-153 Close the right bug for Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-154 French manpages translation update * bubulle@debian.org--2005/apt--main--0--patch-155 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-156 Better makefile for more up-to-date PO and POT * bubulle@debian.org--2005/apt--main--0--patch-157 Run make uupdate-po * bubulle@debian.org--2005/apt--main--0--patch-158 Fix spaces errors in some translations * bubulle@debian.org--2005/apt--main--0--patch-159 Patch to allow "make apt-all.pot" work in the baz archive * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-109 * add " " in update-po * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-110 * make apt-get source smarter about not downloading the same sources twice * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-111 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-112 * 2006 ftp-archive signing key added * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-113 * be more clever about I-M-S hits for the Release file and gpg-failures with it, requeue it without i-m-s then * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-114 * merged with mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-115 * string fix * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-116 * changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-117 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-118 * merged from bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-119 * fix http data corruption (#280844) * mvo@debian.org--2005/apt--debian-experimental--0--patch-12 * added http data corruption fix patch (#280844) * mvo@debian.org--2005/apt--debian-sid--0--base-0 tag of michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71 * mvo@debian.org--2005/apt--debian-sid--0--patch-1 * merged with apt--mvo--0 * mvo@debian.org--2005/apt--debian-sid--0--patch-2 * merged with apt--mvo * mvo@debian.org--2005/apt--debian-sid--0--patch-3 * updated apt-all.pot * mvo@debian.org--2005/apt--debian-sid--0--patch-4 * merged with apt--mvo * mvo@debian.org--2005/apt--debian-sid--0--patch-5 * merge with apt--mvo--0 * mvo@debian.org--2005/apt--debian-sid--0--patch-6 * merge with apt--mvo * mvo@debian.org--2005/apt--debian-sid--0--patch-7 * applied patch from Petr Vandrovec to fix http download corruption * mvo@debian.org--2005/apt--debian-sid--0--patch-8 * merged with apt--mvo, regenerated the po files * mvo@debian.org--2005/apt--debian-sid--0--patch-9 * merged with apt--mvo * mvo@debian.org--2005/apt--debian-sid--0--patch-10 * merged with apt--mvo and corrected conflicts in po/ * mvo@debian.org--2005/apt--debian-sid--0--patch-11 * changelog updates * mvo@debian.org--2005/apt--debian-sid--0--patch-12 * apt--mvo merged * mvo@debian.org--2005/apt--debian-sid--0--patch-13 * merged with mvo * mvo@debian.org--2005/apt--debian-sid--0--patch-14 * merged with apt--mvo--0 * mvo@debian.org--2005/apt--debian-sid--0--patch-15 * support multiple signatures * mvo@debian.org--2005/apt--debian-sid--0--patch-16 * merged with main * philippe.batailler@free.fr--2005/apt--main--0--patch-4 Update of sources.list * philippe.batailler@free.fr--2005/apt--main--0--patch-6 Change apt.ent.fr * philippe.batailler@free.fr--2005/apt--main--0--patch-7 Update manpages --- 0e1821f3d826829fb3393c516ea3920eeccf46aa diff --combined configure.in index ea4fc6e3c,0d80e5ed9..b900cc165 --- 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.43ubuntu2") -AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.43.1ubuntu2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --combined debian/changelog index 2655e3db7,020fe9813..c83806727 --- a/debian/changelog +++ b/debian/changelog @@@ -1,23 -1,42 +1,57 @@@ - apt (0.6.43ubuntu3) added; urgency=low - -apt (0.6.43.2) unstable; urgency=low ++apt (0.6.43.1ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: + - en_GB.po, de.po: fix spaces errors in "Ign " translations + Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + * added APT::Periodic::Unattended-Upgrade (requires the package + "unattended-upgrade") - -- Michael Vogt Fri, 9 Dec 2005 16:51:32 +0100 + -- Michael Vogt Tue, 10 Jan 2006 17:09:31 +0100 + + apt (0.6.43.1) unstable; urgency=low - ++ + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: + * fr.po: Completed to 510 strings + * it.po: Completed to 510t + * en_GB.po: Completed to 510t + * cs.po: Completed to 510t + * zh_CN.po: Completed to 510t + * el.po: Updated to 510t + * vi.po: Updated to 383t93f34u + * tl.po: Completed to 510 strings (Closes: #344306) + * sv.po: Completed to 510 strings (Closes: #344056) + * LINGUAS: disabled Hebrew translation. (Closes: #313283) + * eu.po: Completed to 510 strings (Closes: #342091) + * apt-get source won't download already downloaded files again + (closes: #79277) + * share/debian-archive.gpg: new 2006 ftp-archive signing key added + (#345891) + * redownload the Release file if IMS-Hit and gpg failure + * deal with multiple signatures on a Release file + + -- Michael Vogt Fri, 6 Jan 2006 01:17:08 +0100 +apt (0.6.43ubuntu2) dapper; urgency=low + + * merged some missing bits that wheren't merged by baz in the previous + upload (*grumble*) + + -- Michael Vogt Thu, 8 Dec 2005 18:35:58 +0100 + +apt (0.6.43ubuntu1) dapper; urgency=low + + * merged with debian + + -- Michael Vogt Fri, 25 Nov 2005 11:36:29 +0100 + apt (0.6.43) unstable; urgency=medium * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: @@@ -38,22 -57,6 +72,22 @@@ -- Michael Vogt Tue, 29 Nov 2005 00:17:07 +0100 +apt (0.6.42.3ubuntu2) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: + * zh_CN.po: Completed to 507 strings(Closes: #338267) + * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) + + -- Michael Vogt Mon, 14 Nov 2005 15:30:12 +0100 + +apt (0.6.42.3ubuntu1) dapper; urgency=low + + * synced with debian + + -- Michael Vogt Thu, 10 Nov 2005 05:05:56 +0100 + apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: @@@ -101,13 -104,13 +135,13 @@@ apt (0.6.42) unstable; urgency=lo - 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 + * better error text when dpkg-source fails * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115: - patch-99: Added Galician translation - patch-100: Completed Danish translation (Closes: #325686) - patch-104: French translation completed - patch-109: Italian translation completed - - patch-112: Swedish translation update + - patch-112: Swedish translation update - patch-115: Basque translation completed (Closes: #333299) * applied french man-page update (thanks to Philippe Batailler) (closes: #316638, #327456) @@@ -121,12 -124,12 +155,12 @@@ * apt-pkg/contrib/md5.cc: - fix a alignment problem on sparc64 that gives random bus errors (thanks to Fabbione for providing a test-case) - * init the default ScreenWidth to 79 columns by default + * init the default ScreenWidth to 79 columns by default (Closes: #324921) - * cmdline/apt-cdrom.cc: + * cmdline/apt-cdrom.cc: - fix some missing gettext() calls (closes: #334539) * doc/apt-cache.8.xml: fix typo (closes: #334714) - + -- Michael Vogt Wed, 19 Oct 2005 22:02:09 +0200 apt (0.6.41) unstable; urgency=low @@@ -134,8 -137,8 +168,8 @@@ * improved the support for "error" and "conffile" reporting from dpkg, added the format to README.progress-reporting * added README.progress-reporting to the apt-doc package - * improved the network timeout handling, if a index file from a - sources.list times out or EAI_AGAIN is returned from getaddrinfo, + * improved the network timeout handling, if a index file from a + sources.list times out or EAI_AGAIN is returned from getaddrinfo, don't try to get the other files from that entry * Support architecture-specific extra overrides (closes: #225947). Thanks to Anthony Towns for idea and @@@ -143,10 -146,10 +177,10 @@@ * Javier Fernandez-Sanguino Pen~a: - Added a first version of an apt-secure.8 manpage, and modified apt-key and apt.end accordingly. Also added the 'update' - argument to apt-key which was previously not documented + argument to apt-key which was previously not documented (Closes: #322120) * Andreas Pakulat: - - added example apt-ftparchive.conf file to doc/examples + - added example apt-ftparchive.conf file to doc/examples (closes: #322483) * Fix a incorrect example in the man-page (closes: #282918) * Fix a bug for very long lines in the apt-cdrom code (closes: #280356) @@@ -155,84 -158,10 +189,84 @@@ * Change pkgPolicy::Pin from private to protected to let subclasses access it too (closes: #321799) * add default constructor for PrvIterator (closes: #322267) - * Reread status configuration on debSystem::Initialize() + * Reread status configuration on debSystem::Initialize() (needed for apt-proxy, thanks to Otavio for this patch) - + -- Michael Vogt Mon, 5 Sep 2005 22:59:03 +0200 + +apt (0.6.40.1ubuntu8) breezy; urgency=low + + * 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, po/fr.po: + - updated the translations + * po/makefile: + - create a single pot file in each domain dir to make rosetta happy + + -- 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 + + -- 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.40.1ubuntu2) breezy; urgency=low + + * improved the support for "error" and "conffile" reporting from + dpkg, added the format to README.progress-reporting + * added README.progress-reporting to the apt-doc package + * Do md5sum checking for file and cdrom method (closes: #319142) + * Change pkgPolicy::Pin from private to protected to let subclasses + access it too (closes: #321799) + * methods/connect.cc: + - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item + * apt-pkg/acquire-item.cc: + - fail early if a FailReason is TmpResolveFailure (avoids hangs during + the install when no network is available) + * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0 + + -- Michael Vogt Tue, 23 Aug 2005 19:44:55 +0200 + +apt (0.6.40.1ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 apt (0.6.40.1) unstable; urgency=low @@@ -243,12 -172,6 +277,12 @@@ -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 +apt (0.6.40ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 + apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation @@@ -264,39 -187,6 +298,39 @@@ -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 +apt (0.6.39ubuntu4) breezy; urgency=low + + * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this + before...) + + -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 + +apt (0.6.39ubuntu3) breezy; urgency=low + + * Fix keyring locations for Ubuntu in apt-key too. + + -- Colin Watson Wed, 29 Jun 2005 14:45:36 +0100 + +apt (0.6.39ubuntu2) breezy; urgency=low + + * Install ubuntu-archive.gpg rather than debian-archive.gpg as + /etc/apt/trusted.gpg. + + -- Colin Watson Wed, 29 Jun 2005 11:53:34 +0100 + +apt (0.6.39ubuntu1) breezy; urgency=low + + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line + + -- Matt Zimmerman Tue, 28 Jun 2005 11:52:24 -0700 + apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@@ -307,14 -197,7 +341,14 @@@ * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 + -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 + +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 apt (0.6.38) unstable; urgency=low diff --combined po/makefile index 28890e079,45e5b1e5a..07dc51c07 --- a/po/makefile +++ b/po/makefile @@@ -40,9 -40,6 +40,9 @@@ $(POTFILES) : $(PO)/%.pot --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot rm -f $(PO)/POTFILES_$*.in $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@ + # copy into the domain dirs to make rosetta happy + rm -f $(PO)/domains/$*/*.pot + cp $@ $(PO)/domains/$* $(PACKAGE)-all.pot: $(POTFILES) $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@ @@@ -65,11 -62,11 +65,11 @@@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_ stats: for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done - binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES) update-po + binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES) .PHONY: update-po update-po: $(PACKAGE)-all.pot - for lang in ${LINGUAS}; do\ + for lang in ${LINGUAS}; do \ echo "Updating $$lang.po"; \ $(MSGMERGE) $$lang.po $(PACKAGE)-all.pot -o $$lang.new.po; \ cmp $$lang.new.po $$lang.po || cp $$lang.new.po $$lang.po; \ @@@ -77,7 -74,7 +77,7 @@@ done clean: clean/local - clean/local: + clean/local: update-po rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d # Include the dependencies that are available