From 84cc6f7364d31321698ab3182bcd10d575710a49 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 30 Sep 2006 14:14:04 +0200 Subject: * methods/gzip.cc: - just stop on empty files, don't call the extractor * debian/changelog: - merged the last debian upload - added entry for extractor --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 385c8ca23..a828d02c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.46.1) unstable; urgency=low + + * methods/gzip.cc: + - deal with empty files + + -- + apt (0.6.46) unstable; urgency=low * debian/control: @@ -32,7 +39,7 @@ apt (0.6.46) unstable; urgency=low - reverted MMap use in the tagfile because it does not work across pipes (closes: #383487) - -- + -- Michael Vogt Thu, 21 Sep 2006 10:25:03 +0200 apt (0.6.45) unstable; urgency=low -- cgit v1.2.3 From fa341c6aaca13173add9841ca05e473255d3923c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 30 Sep 2006 14:16:55 +0200 Subject: * debian/rules: - Daniel Schepler to make apt bin-NMU able --- debian/changelog | 4 +++- debian/rules | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a828d02c1..448f4f1ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,9 @@ apt (0.6.46.1) unstable; urgency=low * methods/gzip.cc: - deal with empty files - + * Applied patch from Daniel Schepler to make apt bin-NMU able. + (Closes: bug#359634) + -- apt (0.6.46) unstable; urgency=low diff --git a/debian/rules b/debian/rules index a8bf88762..02ee734bb 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ build: PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) -APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') +APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' -e 's/\+.*$$//') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') -- cgit v1.2.3 From 21e1008e144c50770997bc00dc1b27826a31064c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 30 Sep 2006 14:28:00 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - translate the dpkg progress strings when they are used, not in the struct (thanks to Steinar Gunderson) * debian/changelog: - updated --- debian/changelog | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 448f4f1ee..92c12b5a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,12 @@ apt (0.6.46.1) unstable; urgency=low * methods/gzip.cc: - deal with empty files * Applied patch from Daniel Schepler to make apt bin-NMU able. - (Closes: bug#359634) + (closes: bug#359634) + * rebuild against current g++ because of: + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289 + (closes: #390189) + * fix broken i18n in the dpkg progress reporting, thanks to + Frans Pop and Steinar Gunderson. (closes: #389261) -- -- cgit v1.2.3 From c407612f82f02ed97ec879e48e3cd1c187b4f5ea Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 30 Sep 2006 22:50:41 +0200 Subject: * apt-pkg/tagfile.h: - increase the buffer in tagfile.cc for now, this really needs to become a dynamic buffer --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index db84bc65a..77c7cf698 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ apt (0.6.46.1) unstable; urgency=low * fi.po: Updated to 514t. Closes: #390149 * eu.po: Updated to 514t. Closes: #389725 * vi.po: Updated to 514t. Closes: #388555 + * use a bigger buffer in tagfile for now, this needs to + become much more dynamic (closes: #388708) -- -- cgit v1.2.3 From 75c541fdeda664bdf0e48e68a2aa5dae7015587c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Oct 2006 00:58:53 +0200 Subject: * apt-pkg/tagfile.cc,h: - make the internal buffer grow dynamically if required --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 77c7cf698..6b842898c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,8 @@ apt (0.6.46.1) unstable; urgency=low * fi.po: Updated to 514t. Closes: #390149 * eu.po: Updated to 514t. Closes: #389725 * vi.po: Updated to 514t. Closes: #388555 - * use a bigger buffer in tagfile for now, this needs to - become much more dynamic (closes: #388708) + * make the internal buffer in pkgTagFile grow dynamically + (closes: #388708) -- -- cgit v1.2.3 From d21a95bf5efe85390eb9def96ceb27dbab1d72d8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Oct 2006 22:29:22 +0200 Subject: * debian/changelog: fixed date --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c0036fbd6..2fe5ad913 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,7 @@ apt (0.6.46.1) unstable; urgency=low * make the internal buffer in pkgTagFile grow dynamically (closes: #388708) - -- Michael Vogt Mon, 2 Oct 2006 20:42:20 +0200 + -- Michael Vogt Mon, 2 Oct 2006 20:42:20 +0200 apt (0.6.46) unstable; urgency=low -- cgit v1.2.3 From 18ea6d69dd43eac83f1fa1fb8ff6d3c59f3f9efb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 11 Oct 2006 09:23:01 +0200 Subject: * debian/changelog: - finalized changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fd59bed22..2aa21c399 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ apt (0.6.46.2) unstable; urgency=low - cs.po: Updated. Closes: #391064 - es.po: Updated to 514t. Closes: #391661 - da.po: Updated to 514t. Closes: #391424 - -- + -- Michael Vogt Wed, 11 Oct 2006 09:03:15 +0200 apt (0.6.46.1) unstable; urgency=low -- cgit v1.2.3 From ed94a0d6f60e7b236a3b62dd9d4d453e956cfcf9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Oct 2006 10:39:18 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - fix segfault if dpkg sends multiline error messages --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2aa21c399..887d2f254 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.6.46.3) unstable; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - make progress reporting robust against multiline error + messages + + -- + apt (0.6.46.2) unstable; urgency=low * Merged from Christian Perrier bzr branch: @@ -6,6 +14,7 @@ apt (0.6.46.2) unstable; urgency=low - cs.po: Updated. Closes: #391064 - es.po: Updated to 514t. Closes: #391661 - da.po: Updated to 514t. Closes: #391424 + -- Michael Vogt Wed, 11 Oct 2006 09:03:15 +0200 apt (0.6.46.1) unstable; urgency=low -- cgit v1.2.3 From fa2bca9de5acabcfcf782702450937a978b48c37 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Nov 2006 07:16:12 +0100 Subject: * changelog updated to match latest debian upload --- debian/changelog | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 887d2f254..5cdfc9d02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,24 @@ apt (0.6.46.3) unstable; urgency=low - make progress reporting robust against multiline error messages - -- + * Merged from Christian Perrier bzr branch: + - ca.po: Updated to 514t + - be.po: Updated to 514t + - it.po: Updated to 514t + - hu.po: Updated to 514t + - zh_TW.po: Updated to 514t + - ar.po: Updated to 293t221u. + - ru.po: Updated to 514t. Closes: #392466 + - nb.po: Updated to 514t. Closes: #392466 + - pt.po: Updated to 514t. Closes: #393199 + - fr.po: One spelling error corrected: s/accèder/accéder + - km.po: Updated to 514t. + - ko.po: Updated to 514t. + - bg.po: Updated to 514t. + - de.po: Updated to 514t. + - en_GB.po: Updated to 514t. + + -- Michael Vogt Thu, 2 Nov 2006 11:37:58 +0100 apt (0.6.46.2) unstable; urgency=low -- cgit v1.2.3 From 14127f180b86c2290abf3653cd4b4d5972a1177e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Nov 2006 08:04:38 +0100 Subject: * mention apt-secure in apt.8 and apt-apt.8 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5cdfc9d02..24e10dcd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.46.4) unstable; urgency=low + + * add apt-secure.8 to "See also" section + + -- + apt (0.6.46.3) unstable; urgency=low * apt-pkg/deb/dpkgpm.cc: -- cgit v1.2.3 From c70496f94c8a16072b0b7a7906dec4b1aa4f306e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Nov 2006 12:07:06 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - added "Dpkg::StopOnError" variable that controls if apt will abort on errors from dpkg --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 24e10dcd5..8da0d6471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ apt (0.6.46.4) unstable; urgency=low - * add apt-secure.8 to "See also" section + * added apt-secure.8 to "See also" section + * apt-pkg/deb/dpkgpm.cc: + - added "Dpkg::StopOnError" variable that controls if apt + will abort on errors from dpkg -- -- cgit v1.2.3 From 4ab24e53db1d39cd26072f03795efd0f6425a369 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Nov 2006 15:06:28 +0100 Subject: * apt-pkg/deb/debsrcrecords.{cc,h}: - make the buffer dynmaic --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8da0d6471..a3cb3028a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.6.46.4) unstable; urgency=low * apt-pkg/deb/dpkgpm.cc: - added "Dpkg::StopOnError" variable that controls if apt will abort on errors from dpkg + * apt-pkg/deb/debsrcrecords.{cc,h}: + - make the Buffer dynmaic -- -- cgit v1.2.3 From 0752f8fd5ef0bef11721f2c96211fa852aab316d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Dec 2006 14:27:02 +0100 Subject: * changelog updated --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a3cb3028a..29e64bad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ apt (0.6.46.4) unstable; urgency=low - added "Dpkg::StopOnError" variable that controls if apt will abort on errors from dpkg * apt-pkg/deb/debsrcrecords.{cc,h}: - - make the Buffer dynmaic + - make the Buffer grow dynmaically (closes: #400874) -- -- cgit v1.2.3 From f88137b8972f57c52bbadf54a80932f225562a95 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Dec 2006 14:30:19 +0100 Subject: * changelog updates --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 29e64bad7..ac13357ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ apt (0.6.46.4) unstable; urgency=low will abort on errors from dpkg * apt-pkg/deb/debsrcrecords.{cc,h}: - make the Buffer grow dynmaically (closes: #400874) + * Merged from Christian Perrier bzr branch: + - uk.po: New Ukrainian translation: 483t28f3u + - el.po: Update to 503t9f2u + - de.po: Updates and corrections. -- -- cgit v1.2.3 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