From fbf8c5ea5fed408c728b02d99d22551206975e9e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Dec 2006 10:45:44 +0100 Subject: * merged NMU from aba --- debian/apt.postinst | 2 ++ debian/changelog | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index ae1801198..88fb932df 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -20,6 +20,8 @@ case "$1" in cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi + apt-key update + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index ac13357ff..d75be3565 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -apt (0.6.46.4) unstable; urgency=low +apt (0.6.46.4) unstable; urgency=high + * ack NMU (closes: #401017) * added apt-secure.8 to "See also" section * apt-pkg/deb/dpkgpm.cc: - added "Dpkg::StopOnError" variable that controls if apt @@ -13,6 +14,23 @@ apt (0.6.46.4) unstable; urgency=low -- +apt (0.6.46.3-0.2) unstable; urgency=high + + * Non-maintainer upload with permission of Michael Vogt. + * Fix FTBFS on most arches (regression from the fix of #400874) + + -- Andreas Barth Tue, 5 Dec 2006 15:51:22 +0000 + +apt (0.6.46.3-0.1) unstable; urgency=high + + * Non-maintainer upload with permission of Michael Vogt. + * Fix segfault at apt-get source. Closes: #400874 + * Add apt-key update in postinst, so that debian-archive-keyring doesn't + need to depend on apt >= 0.6. Closes: #401114 + * Don't double-queue pdiff files. Closes: #401017 + + -- Andreas Barth Tue, 5 Dec 2006 10:34:56 +0000 + apt (0.6.46.3) unstable; urgency=low * apt-pkg/deb/dpkgpm.cc: -- cgit v1.2.3 From 61ec27797e00a89dcde22877360686513d7e7a56 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Dec 2006 11:28:00 +0100 Subject: * apt-pkg/contrib/progress.cc - only check time on precent boundaries (seems to make a real difference on ARM, see debian #398381) * apt-pkg/contrib/sha256.cc: - added #pragma interface * apt-pkg/contrib/sha256.h: - remove unneeded stdint.h include * apt-pkg/vendorlist.cc: - fix qualifier to make it build with -O0 * po/: - make update-po --- debian/changelog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d75be3565..fc17d2f56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,15 +11,20 @@ apt (0.6.46.4) unstable; urgency=high - uk.po: New Ukrainian translation: 483t28f3u - el.po: Update to 503t9f2u - de.po: Updates and corrections. + * apt-pkg/contrib/progress.cc: + - OpProgress::CheckChange optimized, thanks to Paul Brook + (closes: #398381) + * apt-pkg/contrib/sha256.cc: + - fix building with noopt - -- + -- Michael Vogt Thu, 7 Dec 2006 10:49:50 +0100 apt (0.6.46.3-0.2) unstable; urgency=high * Non-maintainer upload with permission of Michael Vogt. * Fix FTBFS on most arches (regression from the fix of #400874) - -- Andreas Barth Tue, 5 Dec 2006 15:51:22 +0000 + -- Andreas Barth Tue, 5 Dec 2006 15:51:22 +0000 apt (0.6.46.3-0.1) unstable; urgency=high -- cgit v1.2.3 From 82b1691e27956cad53d65e0e93f1aa39d407b3d9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Dec 2006 12:28:25 +0100 Subject: * debian/changelog: - fix incorrect --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fc17d2f56..89654fe03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ apt (0.6.46.4) unstable; urgency=high -- Michael Vogt Thu, 7 Dec 2006 10:49:50 +0100 -apt (0.6.46.3-0.2) unstable; urgency=high +apt (0.6.46.3-0.2) unstable; urgency=high * Non-maintainer upload with permission of Michael Vogt. * Fix FTBFS on most arches (regression from the fix of #400874) -- cgit v1.2.3 From d2de5a7619a77343e1dd1fc255a84dfcca2807be Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Dec 2006 19:19:11 +0100 Subject: * apt-pkg/algorithms.cc: - use clog instead of cout in debug --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 89654fe03..127c5fd83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.46.5) unstable; urgency=low + + * apt-pkg/algorithm.cc: + - use clog for all debugging + + -- + apt (0.6.46.4) unstable; urgency=high * ack NMU (closes: #401017) -- cgit v1.2.3 From 06ce8ac63b1cc476aba2687a4a742cbe59023096 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 14 Dec 2006 10:48:37 +0100 Subject: * finalized changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c83d5e350..9547be05e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ apt (0.6.46.4) unstable; urgency=low - el.po: Update to 503t9f2u - de.po: Updates and corrections. - -- + -- Michael Vogt Fri, 1 Dec 2006 14:36:30 +0100 apt (0.6.46.3) unstable; urgency=low -- cgit v1.2.3