From f150fe4a913663f841472b644717b829724386a9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Apr 2013 17:30:18 +0200 Subject: releasing version 0.9.7.9~exp3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2910501b8..242cd9303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.7.9~exp3) UNRELEASED; urgency=low +apt (0.9.7.9~exp3) experimental; urgency=low [ Michael Vogt ] * apt-pkg/sourcelist.cc: @@ -30,7 +30,7 @@ apt (0.9.7.9~exp3) UNRELEASED; urgency=low [ Marc Deslauriers ] * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) - -- Michael Vogt Mon, 08 Apr 2013 08:43:21 +0200 + -- Michael Vogt Mon, 08 Apr 2013 17:09:00 +0200 apt (0.9.7.9~exp2) experimental; urgency=low -- cgit v1.2.3 From a2457f0ec8f0af82305cd6cf09837b73009d96ae Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 9 Apr 2013 07:59:33 +0200 Subject: Changelog entry for translation fixes --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 242cd9303..bf32cf624 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,12 @@ apt (0.9.7.9~exp3) experimental; urgency=low [ Marc Deslauriers ] * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + [ Programs translations ] + * French translation completed (Christian Perrier) + + [ Manpages translations ] + * French translation completed (Christian Perrier) + -- Michael Vogt Mon, 08 Apr 2013 17:09:00 +0200 apt (0.9.7.9~exp2) experimental; urgency=low -- cgit v1.2.3 From b5595da902e62af7c295f1603ae5b43ba4cef281 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 10 Apr 2013 11:28:11 +0200 Subject: Fix English spelling error in a message ('A error'). Unfuzzy translations. Closes: #705087 --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bf32cf624..7944d76ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,10 @@ apt (0.9.7.9~exp3) experimental; urgency=low [ Marc Deslauriers ] * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + + [ Yaroslav Halchenko ] + * Fix English spelling error in a message ('A error'). Unfuzzy + translations. Closes: #705087 [ Programs translations ] * French translation completed (Christian Perrier) -- cgit v1.2.3 From 1dea08eb2e1115b8da14cc3da02d53f8e069ba14 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 May 2013 17:45:17 +0200 Subject: properly handle if-modfied-since with libcurl/https (closes: #705648) --- debian/changelog | 8 ++++++++ debian/control | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9ed9b4d61..db7a8ffda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.7.9) UNRELEASED; urgency=low + + [ Ludovico Cavedon ] + * properly handle if-modfied-since with libcurl/https + (closes: #705648) + + -- Michael Vogt Wed, 08 May 2013 16:20:13 +0200 + apt (0.9.7.8) unstable; urgency=criticial * SECURITY UPDATE: InRelease verification bypass diff --git a/debian/control b/debian/control index 50b3599fc..4a73239f7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Julian Andres Klode Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, - gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), + gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml -- cgit v1.2.3 From dec5b117052b77e4366efd8234e0cec09989b700 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 May 2013 17:46:31 +0200 Subject: * apt-pkg/algorithms.cc: - Do not propagate negative scores from rdepends. Propagating the absolute value of a negative score may boost obsolete packages and keep them installed instead of installing their successors. (Closes: #699759) --- debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index db7a8ffda..7775c1b79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,13 @@ apt (0.9.7.9) UNRELEASED; urgency=low * properly handle if-modfied-since with libcurl/https (closes: #705648) - -- Michael Vogt Wed, 08 May 2013 16:20:13 +0200 + [ Andreas Beckman ] + * apt-pkg/algorithms.cc: + - Do not propagate negative scores from rdepends. Propagating the absolute + value of a negative score may boost obsolete packages and keep them + installed instead of installing their successors. (Closes: #699759) + + -- Michael Vogt Wed, 08 May 2013 17:46:10 +0200 apt (0.9.7.8) unstable; urgency=criticial -- cgit v1.2.3 From 5b63d2a9a2e088bb7df7c703e9452af7efc88210 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 May 2013 17:50:15 +0200 Subject: merged patch from Daniel Hartwig to fix URI and proxy releated issues --- debian/changelog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 182596b62..d5ae8448b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,23 @@ apt (0.9.8) UNRELEASED; urgency=low [ Manpages translations ] * French translation completed (Christian Perrier) + [ Daniel Hartwig ] + * apt-pkg/contrib/strutl.cc: + - include port in shortened URIs (e.g. with apt-cache policy, progress + display) thanks to James McCoy (Closes: #154868, #322074) + - percent-encode username and password when writing URIs + * methods/http.cc: + - properly escape IP-literals (e.g. IPv6 address) when building + Host headers and URIs (Closes: #620344) + * methods/https.cc: + - use https_proxy environment variable if present, falling back to + http_proxy otherwise + - use authentication credentials from proxy URI + (Closes: #651640, LP: #1087512) + - environment variables do not override an explicit no proxy + directive ("DIRECT") in apt.conf + - disregard all_proxy environment variable, like other methods + -- Michael Vogt Mon, 08 Apr 2013 08:43:21 +0200 apt (0.9.7.9~exp2) experimental; urgency=low -- cgit v1.2.3 From 3bd93b6f774db001674da74bc6e316927da20262 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 May 2013 18:58:29 +0200 Subject: releasing version 0.9.8 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d5ae8448b..6eb44a47c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.8) UNRELEASED; urgency=low +apt (0.9.8) unstable; urgency=low [ Ludovico Cavedon ] * properly handle if-modfied-since with libcurl/https @@ -67,7 +67,7 @@ apt (0.9.8) UNRELEASED; urgency=low directive ("DIRECT") in apt.conf - disregard all_proxy environment variable, like other methods - -- Michael Vogt Mon, 08 Apr 2013 08:43:21 +0200 + -- Michael Vogt Wed, 08 May 2013 18:43:28 +0200 apt (0.9.7.9~exp2) experimental; urgency=low -- cgit v1.2.3 From e7baf3065de20cc6d0ca661443b575f35144b225 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 May 2013 11:34:38 +0200 Subject: add .gitignore and gbp.conf --- debian/gbp.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 debian/gbp.conf (limited to 'debian') diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 000000000..1df123ac5 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +prebuild = ./prepare-release pre-export +postbuild = ./prepare-release post-build -- cgit v1.2.3 From 27cc55ee824913aa3687cc3adf91d96e89bd27d0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 11 May 2013 10:10:07 +0200 Subject: non-inline RunGPGV methods to restore ABI compatibility with previous versions to fix partial upgrades (Closes: #707771) The rename in 0.9.7.9~exp2 moved the method body to the class definition which means it became inline, which isn't ABI compatibile. The reverse of moving inline to non-inline is safe though. --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d5ae8448b..6ccbd37c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.9.8.1) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/indexcopy.cc: + - non-inline RunGPGV methods to restore ABI compatibility with previous + versions to fix partial upgrades (Closes: #707771) + + -- David Kalnischkies Sat, 11 May 2013 09:53:59 +0200 + apt (0.9.8) UNRELEASED; urgency=low [ Ludovico Cavedon ] -- cgit v1.2.3 From 1af6a591aeadb837b76d89dace9badf2d4fe5a0d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 May 2013 14:22:12 +0200 Subject: moved to git, updated gbp.conf to match the bzr version --- debian/changelog | 3 +++ debian/control | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6ccbd37c4..f6ff44578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ apt (0.9.8.1) UNRELEASED; urgency=low * apt-pkg/indexcopy.cc: - non-inline RunGPGV methods to restore ABI compatibility with previous versions to fix partial upgrades (Closes: #707771) + + [ Michael Vogt ] + * moved to git, updated gbp.conf to match the bzr version -- David Kalnischkies Sat, 11 May 2013 09:53:59 +0200 diff --git a/debian/control b/debian/control index 6507f6d6d..1c32783ab 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ +Vcs-Bzr: http://git.debian.org/apt/apt.git +Vcs-Browser: http://git.debian.org/apt/apt.git Package: apt Architecture: any -- cgit v1.2.3 From 614e65dfc6b29b465eef749d7827f85ea39608a0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 May 2013 14:58:56 +0200 Subject: prepare upload --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 625519fff..1aaa0794a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.8.1) UNRELEASED; urgency=low +apt (0.9.8.1) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/indexcopy.cc: @@ -6,9 +6,11 @@ apt (0.9.8.1) UNRELEASED; urgency=low versions to fix partial upgrades (Closes: #707771) [ Michael Vogt ] - * moved to git, updated gbp.conf to match the bzr version + * moved source to http://git.debian.org/apt/apt.git + * updated gbp.conf to match what bzr-buildpackage is doing + * remove .bzr-buildpackage/default.conf (superseeded by gbp.conf) - -- David Kalnischkies Sat, 11 May 2013 09:53:59 +0200 + -- Michael Vogt Thu, 16 May 2013 14:50:43 +0200 apt (0.9.8) unstable; urgency=low -- cgit v1.2.3 From 26751d22f2043531fd4c7291b6f391cd27a25942 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 May 2013 15:30:23 +0200 Subject: add export-dir and debian-branch --- debian/gbp.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/gbp.conf b/debian/gbp.conf index 1df123ac5..0d48f8317 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,3 +1,5 @@ [DEFAULT] prebuild = ./prepare-release pre-export postbuild = ./prepare-release post-build +export-dir = ../build-area +debian-branch = debian/sid -- cgit v1.2.3 From 572bad27ab2bbd8d643c81049f6596ed2b423166 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 16 May 2013 19:45:25 +0200 Subject: Update Vcs fields Use the canonical URLs. Rename Vcs-Bzr to Vcs-Git and use the more efficient git protocol instead of http. Point Vcs-Browser to the gitweb interface. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 1c32783ab..7730c2491 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://git.debian.org/apt/apt.git -Vcs-Browser: http://git.debian.org/apt/apt.git +Vcs-Git: git://anonscm.debian.org/apt/apt.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git Package: apt Architecture: any -- cgit v1.2.3 From e62050a7d0c5f835bf44a0560180d763e7662f68 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Thu, 16 May 2013 22:28:52 +0200 Subject: French translation : typo fix. Closes: #677272 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1aaa0794a..ad0f75883 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.8.2) UNRELEASED; urgency=low + + [ Programs translations ] + * French translation : typo fix. Closes: #677272 + + -- Christian Perrier Thu, 16 May 2013 22:28:22 +0200 + apt (0.9.8.1) unstable; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From 81199bf040c2070f421ca5f0664700eaad2857d3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 16 May 2013 22:34:04 +0200 Subject: Update changelog to include Vcs-* changes --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ad0f75883..9aa4db7e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low [ Programs translations ] * French translation : typo fix. Closes: #677272 + [ Guillem Jover ] + * Update Vcs fields (Closes: #708562) + -- Christian Perrier Thu, 16 May 2013 22:28:22 +0200 apt (0.9.8.1) unstable; urgency=low -- cgit v1.2.3 From 7bcb849733d67f60b3a10d423d558ff35bbcd7dc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 May 2013 22:38:21 +0200 Subject: debian/gbp.conf: add debian-tag key to ensure git-dch works --- debian/gbp.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/gbp.conf b/debian/gbp.conf index 0d48f8317..db22e3e1e 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,3 +3,4 @@ prebuild = ./prepare-release pre-export postbuild = ./prepare-release post-build export-dir = ../build-area debian-branch = debian/sid +debian-tag = %(version)s -- cgit v1.2.3 From f431dc624a04b9280ddd5a6a839adc25ad621847 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 May 2013 23:12:37 +0200 Subject: * buildlib/apti18n.h.in: - fix build failure when building without NLS (closes: #671587) --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9aa4db7e3..f5be97bd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ apt (0.9.8.2) UNRELEASED; urgency=low [ Guillem Jover ] * Update Vcs fields (Closes: #708562) + + [ Michael Vogt ] + * buildlib/apti18n.h.in: + - fix build failure when building without NLS (closes: #671587) -- Christian Perrier Thu, 16 May 2013 22:28:22 +0200 -- cgit v1.2.3 From 5de346684f6777eb9e2ac1a38d687c1bc50f35b0 Mon Sep 17 00:00:00 2001 From: Johan Kiviniemi Date: Wed, 22 May 2013 21:06:26 +0300 Subject: cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600 --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f5be97bd3..89da46ed1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low * buildlib/apti18n.h.in: - fix build failure when building without NLS (closes: #671587) + [ Johan Kiviniemi ] + * cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600. + -- Christian Perrier Thu, 16 May 2013 22:28:22 +0200 apt (0.9.8.1) unstable; urgency=low -- cgit v1.2.3 From ecc46c1c42bb1aa59a0c8f0fb3eb12a5938da6ca Mon Sep 17 00:00:00 2001 From: Johan Kiviniemi Date: Wed, 22 May 2013 21:14:33 +0300 Subject: cmdline/apt-key: Accept nonexistent --keyring file with adv as well --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 89da46ed1..b3800fc42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low - fix build failure when building without NLS (closes: #671587) [ Johan Kiviniemi ] - * cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600. + * cmdline/apt-key: + - Create new keyrings with mode 0644 instead of 0600. + - Accept a nonexistent --keyring file with the adv subcommand as well. -- Christian Perrier Thu, 16 May 2013 22:28:22 +0200 -- cgit v1.2.3 From e3b402f40373365e169f30d276e467f708074ffc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 6 Jun 2013 18:17:14 +0200 Subject: fix double free (closes: #711045) --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f5be97bd3..f0eb0421d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low [ Michael Vogt ] * buildlib/apti18n.h.in: - fix build failure when building without NLS (closes: #671587) + + [ Gregoire Menuel ] + * fix double free (closes: #711045) -- Christian Perrier Thu, 16 May 2013 22:28:22 +0200 -- cgit v1.2.3 From 245ba2c306e663fb311b7796fdf13a7ae7073a4d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 6 Jun 2013 18:20:35 +0200 Subject: Fix double free (closes: #711045) * Fix double free (closes: #711045) * Fix crash when the "mirror" method does not find any entry (closes: #699303) --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f0eb0421d..e31070aec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,11 @@ apt (0.9.8.2) UNRELEASED; urgency=low - fix build failure when building without NLS (closes: #671587) [ Gregoire Menuel ] - * fix double free (closes: #711045) + * Fix double free (closes: #711045) + + [ Raphael Geissert ] + * Fix crash when the "mirror" method does not find any entry + (closes: #699303) -- Christian Perrier Thu, 16 May 2013 22:28:22 +0200 -- cgit v1.2.3 From 064235a63e4ef761ade3921bbf2d8c1f3718b980 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 6 Jun 2013 19:15:52 +0200 Subject: prepare release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e31070aec..450a9c382 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.8.2) UNRELEASED; urgency=low +apt (0.9.8.2) unstable; urgency=low [ Programs translations ] * French translation : typo fix. Closes: #677272 @@ -17,7 +17,7 @@ apt (0.9.8.2) UNRELEASED; urgency=low * Fix crash when the "mirror" method does not find any entry (closes: #699303) - -- Christian Perrier Thu, 16 May 2013 22:28:22 +0200 + -- Michael Vogt Thu, 06 Jun 2013 19:15:14 +0200 apt (0.9.8.1) unstable; urgency=low -- cgit v1.2.3 From ac62eb38b0bca7a45835903eb421c19f4f78aca3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 19 May 2013 15:49:24 +0200 Subject: build the en manpages in subdirectory doc/en Building manpages becames more consistent this way and it is simpler to ignore build artefacts, too. --- debian/changelog | 7 +++++++ debian/rules | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aa8553251..1a8604e09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.8.3) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * build the en manpages in subdirectory doc/en + + -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 + apt (0.9.8.2) unstable; urgency=low [ Programs translations ] diff --git a/debian/rules b/debian/rules index 5051dab4f..79a6dbe0c 100755 --- a/debian/rules +++ b/debian/rules @@ -203,7 +203,7 @@ apt: build build-manpages dh_bugfiles -p$@ dh_lintian -p$@ dh_installexamples -p$@ $(BLD)/docs/examples/* - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) dh_installcron -p$@ dh_installdocs -p$@ dh_installchangelogs -p$@ @@ -253,7 +253,7 @@ apt-utils: build build-manpages dh_installexamples -p$@ # Install the man pages.. - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) dh_installchangelogs -p$@ dh_strip -p$@ -- cgit v1.2.3 From 3a61adbba8bfc9ba76d1262e0e8118f78920f9fe Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 19 May 2013 18:53:19 +0200 Subject: remove -ldl from cdrom and -lutil from apt-get linkage Building src:apt shows: dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/apt/usr/lib/apt/methods/cdrom was not linked against libdl.so.2 (it uses none of the library's symbols) dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/apt/usr/bin/apt-get was not linked against libutil.so.1 (it uses none of the library's symbols) --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1a8604e09..662289fba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low [ David Kalnischkies ] * build the en manpages in subdirectory doc/en + * remove -ldl from cdrom and -lutil from apt-get linkage -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 @@ -24,7 +25,6 @@ apt (0.9.8.2) unstable; urgency=low * Fix crash when the "mirror" method does not find any entry (closes: #699303) - [ Johan Kiviniemi ] * cmdline/apt-key: - Create new keyrings with mode 0644 instead of 0600. -- cgit v1.2.3 From 2de7157775551185beb3d7cb56e9f9f353e57ab4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 21 May 2013 00:05:14 +0200 Subject: rewrite pkgOrderList::DepRemove to stop incorrect immediate setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some squeeze → wheezy upgrades indicate that DepRemove runs amok in complicated setups as it wasn't correctly working with or-groups. Completely rewritten the check is now moving from or-group to or-group instead. The behavior should be the same as the code before, but (hopefully) with less bugs and more comments. Closes: 645713 --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 662289fba..d7c3494ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.9.8.3) UNRELEASED; urgency=low [ David Kalnischkies ] * build the en manpages in subdirectory doc/en * remove -ldl from cdrom and -lutil from apt-get linkage + * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting + (Closes: 645713) -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 978844db25deb7cd88b053bc2f4685caf2c61a75 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 21 May 2013 17:10:21 +0200 Subject: prefer Essentials over Removals in ordering score Doing Removes early is good to have them out of the way, so they don't break 'Inst' or 'Conf' chains, but scoring them above Essentials means that we end up upgrading (many) less important packages before we handle big stuff like libc6 or debconf which not only fails if those less important packages have unannounced (strict) dependencies, but also leads to having these packages unconfigured for a long time triggering bugs in maintainer scripts for no good reason (#708831). So this commits sets the default value for remove scores to 100, which is below the one for essentials (200) and a lot lower than the previous default value (500). --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d7c3494ce..f57a8334f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * remove -ldl from cdrom and -lutil from apt-get linkage * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting (Closes: 645713) + * prefer Essentials over Removals in ordering score -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 69335858269845904635c592268cf9519e75c1a9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 21 May 2013 18:06:17 +0200 Subject: fix priority sorting by prefering higher in MarkInstall Used to work until a certain (here unnamed) person came along and used the wrong operator causing low-priority packages to be sorted above high-priority packages while choosing a provider in commit 2b5c35c7bb915dbd46fefd7c79f05364ba22f93b from Nov 2011 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f57a8334f..af606453d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting (Closes: 645713) * prefer Essentials over Removals in ordering score + * fix priority sorting by prefering higher in MarkInstall -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 66706285737a895d0baf64c2387c58d5211be4f9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 21 May 2013 21:50:30 +0200 Subject: try all providers in order if uninstallable in MarkInstall --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index af606453d..b64a57bef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low (Closes: 645713) * prefer Essentials over Removals in ordering score * fix priority sorting by prefering higher in MarkInstall + * try all providers in order if uninstallable in MarkInstall -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 42d51f333e8ef522fed02cdfc48663488d56c3a3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 23 May 2013 12:14:56 +0200 Subject: do unpacks before configures in SmartConfigure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Splits the big loop over dependencies in SmartConfigure which unpacks and configures dependencies into two loops and reverse their order, so that all dependencies which need to be unpacked are handled first and only after that configures are issued for dependencies. This is needed as otherwise the unpack of a (new) dependency will be issued in between a configure call for two (or more) packages which form a loop, which means the configure calls aren't part of the same dpkg call and therefore dpkg bails out. Such tight loops should really be avoided as they are usually wrong – and in reality the dependencies in libreoffice were greatly simplified thanks to Rene Engelhard so the problem is gone for the benefit of all. Closes: 707578 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b64a57bef..8a1194b1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * prefer Essentials over Removals in ordering score * fix priority sorting by prefering higher in MarkInstall * try all providers in order if uninstallable in MarkInstall + * do unpacks before configures in SmartConfigure (Closes: #707578) -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 8ba17539a3ec33abc283ca382cca6e59876a0f07 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 25 May 2013 19:57:48 +0200 Subject: fix support for multiple patterns in apt-cache search Patterns can appear in the name as well as in the description, they don't have to match all in the name/description only. Closes: 691453 --- debian/changelog | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8a1194b1b..9f35441f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * fix priority sorting by prefering higher in MarkInstall * try all providers in order if uninstallable in MarkInstall * do unpacks before configures in SmartConfigure (Closes: #707578) + * fix support for multiple patterns in apt-cache search (Closes: #691453) -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 @@ -31,11 +32,6 @@ apt (0.9.8.2) unstable; urgency=low * Fix crash when the "mirror" method does not find any entry (closes: #699303) - [ Johan Kiviniemi ] - * cmdline/apt-key: - - Create new keyrings with mode 0644 instead of 0600. - - Accept a nonexistent --keyring file with the adv subcommand as well. - -- Michael Vogt Thu, 06 Jun 2013 19:15:14 +0200 apt (0.9.8.1) unstable; urgency=low -- cgit v1.2.3 From ae635e3cf7559f3455b88a2499e7521d2094c416 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 25 May 2013 20:22:06 +0200 Subject: set Fail flag in FileFd on all errors consistently Previously some errors would set the Fail flag while some didn't without a clear reason as all errors leave a bad FileFd behind, so we use a helper now to ensure that all errors set the flag. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9f35441f9..056025509 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * try all providers in order if uninstallable in MarkInstall * do unpacks before configures in SmartConfigure (Closes: #707578) * fix support for multiple patterns in apt-cache search (Closes: #691453) + * set Fail flag in FileFd on all errors consistently -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From bf35c19b817cc1474b3deabce0b0953c248bad42 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 25 May 2013 20:27:33 +0200 Subject: don't explicitly init ExtractTar InFd with invalid fd The default constructor of the FileFd will kick in anyway, which will know that the Fd is invalid while with this explicit call it must be assumed that the fd is in fact valid, which might generate errors in the future --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 056025509..a80bac3d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * do unpacks before configures in SmartConfigure (Closes: #707578) * fix support for multiple patterns in apt-cache search (Closes: #691453) * set Fail flag in FileFd on all errors consistently + * don't explicitly init ExtractTar InFd with invalid fd -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From f97bb5237489134cb971ce38b93c5d6220341ea8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 25 May 2013 20:33:15 +0200 Subject: OpenDescriptor should autoclose fd always on error OpenInternDescriptor failures would cause additional errors to be generated by double-closing an fd. Other errors (although these are generated if the method is used incorrectly, so unlikely) didn't close the fd aswell. Closes: 704608 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a80bac3d7..42a8e540e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * fix support for multiple patterns in apt-cache search (Closes: #691453) * set Fail flag in FileFd on all errors consistently * don't explicitly init ExtractTar InFd with invalid fd + * OpenDescriptor should autoclose fd always on error (Closes: #704608) -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 2128d3fce44da34ecb1f0d784b703807f66b20f9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Jun 2013 18:33:48 +0200 Subject: fail in CopyFile if the FileFds have error flag set Testing for global PendingErrors in users of CopyFile is incorrect in so far as unrelated errors will prevent us from copying perfectly fine files and checking for the validity of the files is just better in CopyFiles as it already checks if files are at least opened. Add also a higher-level error message to the error stack if it fails. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 42a8e540e..cde0aba2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * set Fail flag in FileFd on all errors consistently * don't explicitly init ExtractTar InFd with invalid fd * OpenDescriptor should autoclose fd always on error (Closes: #704608) + * fail in CopyFile if the FileFds have error flag set -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From b2ea1a47531266377abe4f12c6f21417ea96eea0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Jun 2013 18:58:34 +0200 Subject: ensure state-dir exists before coyping cdrom files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We do the same in the acquire system which handles the 'normal' downloads, so do it here as well even though its unlikely anyone will ever notice (beside testcases of course …) --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cde0aba2f..7582b4f35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * don't explicitly init ExtractTar InFd with invalid fd * OpenDescriptor should autoclose fd always on error (Closes: #704608) * fail in CopyFile if the FileFds have error flag set + * ensure state-dir exists before coyping cdrom files -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 00612a8c55aab3560966533fe77e4940f902b3b6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 13 Jun 2013 13:52:18 +0200 Subject: fix file location for configure-index.gz in apt.conf(5) Closes: #711921 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7582b4f35..23e0a065a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * OpenDescriptor should autoclose fd always on error (Closes: #704608) * fail in CopyFile if the FileFds have error flag set * ensure state-dir exists before coyping cdrom files + * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921) -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 99359751efb1ad84e877219639030feb47fb28f7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 16 Jun 2013 15:42:31 +0200 Subject: handle missing "Description" in apt-cache show do not blindly assume that all packages stanzas have a "Description:" field in 'apt-cache show' as well as in the cache creation itself. We instead assume now that if the stanza has a Description, it will not be the first field as we look out for "\nDescription" to take care of MD5sum as well as (maybe ignored) translated Descriptions embedded in the package stanza. Closes: #712435 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 23e0a065a..9cf85c9ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * fail in CopyFile if the FileFds have error flag set * ensure state-dir exists before coyping cdrom files * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921) + * handle missing "Description" in apt-cache show (Closes: #712435) -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 2ecf54d8704f93f086df7def08e80f49892ac075 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 16 Jun 2013 18:28:45 +0200 Subject: try defaults if auto-detection failed in apt-cdrom The default is to ask udev for location and mountpoints of CD-ROMs, but the old way of specifying the mountpoint is still available and is tried now in case udev doesn't find any CD-ROM. It probably fails, too, but we get a bunch of error messages this way and the user can get an idea of how to make his setup work even if udev can't be convienced to return something useful. Closes: #712433 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9cf85c9ea..8fef47d14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * ensure state-dir exists before coyping cdrom files * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921) * handle missing "Description" in apt-cache show (Closes: #712435) + * try defaults if auto-detection failed in apt-cdrom (Closes: #712433) -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 709038652854b71895e06caed2b028b389acefd6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 15 Jun 2013 10:35:04 +0200 Subject: support \n and \r\n line endings in ReadMessages --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8fef47d14..dfff872a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921) * handle missing "Description" in apt-cache show (Closes: #712435) * try defaults if auto-detection failed in apt-cdrom (Closes: #712433) + * support \n and \r\n line endings in ReadMessages -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 0aec7d5c2f6fd55301bd1e1ed35ab7a23fd2357e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 15 Jun 2013 23:47:07 +0200 Subject: do not redownload unchanged InRelease files Before we download the 'new' InRelease file the old file will be moved out of the way with the name 'foobar_InRelease.reverify', so if no partial file for the 'new' file exists take the modification time from this reverify file, so that if we get an IMS hit for the InRelease file we can move back the reverify file as new file rather than downloading the 'new' file even though we already have it. We do the same for Release files and this happened to work until the reverify renaming was corrected for InRelease files. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dfff872a7..91d4ae536 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * handle missing "Description" in apt-cache show (Closes: #712435) * try defaults if auto-detection failed in apt-cdrom (Closes: #712433) * support \n and \r\n line endings in ReadMessages + * do not redownload unchanged InRelease files -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From ae99ce2e3cadb07c80b89ab2afc804875b1026c5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 17 Jun 2013 11:23:13 +0200 Subject: trigger NODATA error for invalid InRelease files With the selfgrown splitting we got the problem of not recovering from networks which just reply with invalid data like those sending us login pages to authenticate with the network (e.g. hotels) back. The good thing about the InRelease file is that we know that it must be clearsigned (a Release file might or might not have a detached sig) so if we get a file but are unable to split it something is seriously wrong, so there is not much point in trying further. The Acquire system already looks out for a NODATA error from gpgv, so this adds a new error message sent to the acquire system in case the splitting we do now ourselves failed including this magic word. Closes: #712486 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 91d4ae536..bd25df1e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ apt (0.9.8.3) UNRELEASED; urgency=low * try defaults if auto-detection failed in apt-cdrom (Closes: #712433) * support \n and \r\n line endings in ReadMessages * do not redownload unchanged InRelease files + * trigger NODATA error for invalid InRelease files (Closes: #712486) -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 -- cgit v1.2.3 From 25a4d2049fb79bc2c86cd45e977b4a071e5300ac Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Jul 2013 08:27:56 +0200 Subject: update changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aa8553251..70046aa65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.9) unstable; urgency=low + + [ Michael Vogt ] + * improve debug output for the Debug::pkgProblemResolver and + Debug::pkgDepCache::AutoInstall + + -- Michael Vogt Tue, 02 Jul 2013 08:26:17 +0200 + apt (0.9.8.2) unstable; urgency=low [ Programs translations ] -- cgit v1.2.3 From 0abed86eb392990a5a4995fcf7ca70601d40efd1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Jul 2013 08:34:34 +0200 Subject: update changelog --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4baa4d18d..ea599988d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -apt (0.9.9) unstable; urgency=low +apt (0.9.9) UNRELEASEDunstable; urgency=low [ Michael Vogt ] * improve debug output for the Debug::pkgProblemResolver and Debug::pkgDepCache::AutoInstall + * improve apt-cdrom output when no CD-ROM can be auto-detected + * document --no-auto-detect in apt-cdrom [ David Kalnischkies ] * build the en manpages in subdirectory doc/en @@ -26,7 +28,7 @@ apt (0.9.9) unstable; urgency=low * do not redownload unchanged InRelease files * trigger NODATA error for invalid InRelease files (Closes: #712486) - -- David Kalnischkies Sun, 09 Jun 2013 15:06:24 +0200 + -- Michael Vogt Tue, 02 Jul 2013 08:34:12 +0200 apt (0.9.8.2) unstable; urgency=low -- cgit v1.2.3 From 4b8528bd5749f759e924534709a620da67cd40f8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Jul 2013 08:58:43 +0200 Subject: releasing version 0.9.9 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ea599988d..b20bc1f60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.9) UNRELEASEDunstable; urgency=low +apt (0.9.9) unstable; urgency=low [ Michael Vogt ] * improve debug output for the Debug::pkgProblemResolver and @@ -28,7 +28,7 @@ apt (0.9.9) UNRELEASEDunstable; urgency=low * do not redownload unchanged InRelease files * trigger NODATA error for invalid InRelease files (Closes: #712486) - -- Michael Vogt Tue, 02 Jul 2013 08:34:12 +0200 + -- Michael Vogt Tue, 02 Jul 2013 08:58:33 +0200 apt (0.9.8.2) unstable; urgency=low -- cgit v1.2.3 From 8bb62daf9b1bbeec8a40cfed239a8e9ac115353a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 5 Jul 2013 16:41:06 +0200 Subject: debian/rules: * debian/rules: - call dh_clean in clean (closes: #714980) --- debian/changelog | 7 +++++++ debian/rules | 1 + 2 files changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b20bc1f60..295142165 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.9.1) UNRELEASED; urgency=low + + * debian/rules: + - call dh_clean in clean (closes: #714980) + + -- Michael Vogt Fri, 05 Jul 2013 16:39:34 +0200 + apt (0.9.9) unstable; urgency=low [ Michael Vogt ] diff --git a/debian/rules b/debian/rules index 79a6dbe0c..02fed44d5 100755 --- a/debian/rules +++ b/debian/rules @@ -110,6 +110,7 @@ build/build-manpages-stamp: build/configure-stamp clean: dh_testdir + dh_clean [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build -- cgit v1.2.3 From 9c5104cf35c6bca91247a8a31c1748be80ab7d68 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 10 Jul 2013 16:41:14 +0200 Subject: apt-pkg/packagemanager.cc: * apt-pkg/packagemanager.cc: - increate APT::pkgPackageManager::MaxLoopCount to 5000 --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 295142165..cb47dd456 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ apt (0.9.9.1) UNRELEASED; urgency=low + [ Michael Vogt ] * debian/rules: - call dh_clean in clean (closes: #714980) + * apt-pkg/packagemanager.cc: + - increate APT::pkgPackageManager::MaxLoopCount to 5000 -- Michael Vogt Fri, 05 Jul 2013 16:39:34 +0200 -- cgit v1.2.3 From a86f851619f720b8c4a74d01274c5e2bf012d451 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 3 Nov 2012 00:39:19 +0100 Subject: cherry pick 39a07ec8f2c612a5af234c7713571362f7ca90b4 --- debian/apt.auto-removal.sh | 67 ++++++++++++++++++++++++++++++++++++++++++++++ debian/apt.conf.autoremove | 3 --- debian/apt.dirs | 1 + debian/changelog | 10 +++++++ debian/rules | 2 ++ 5 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 debian/apt.auto-removal.sh (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh new file mode 100644 index 000000000..8f6fc2efc --- /dev/null +++ b/debian/apt.auto-removal.sh @@ -0,0 +1,67 @@ +#!/bin/sh + +set -e + +# Author: Steve Langasek +# +# Mark as not-for-autoremoval those kernel packages that are: +# - the currently booted version +# - the kernel version we've been called for +# - the latest kernel version (determined using rules copied from the grub +# package for deciding which kernel to boot) +# In the common case, this results in exactly two kernels saved, but it can +# result in three kernels being saved. It's better to err on the side of +# saving too many kernels than saving too few. +# +# We generate this list and save it to /etc/apt/apt.conf.d instead of marking +# packages in the database because this runs from a postinst script, and apt +# will overwrite the db when it exits. + +config_file=/etc/apt/apt.conf.d/01autoremove-kernels + +installed_version="$1" +running_version="$(uname -r)" + + +version_test_gt () +{ + local version_test_gt_sedexp="s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" + local version_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`" + local version_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`" + dpkg --compare-versions "$version_a" gt "$version_b" + return "$?" +} + +list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') + +latest_version="" +for i in $list; do + if version_test_gt "$i" "$latest_version"; then + latest_version="$i" + fi +done + +kernels=$(sort -u < "$config_file".dpkg-new <> "$config_file".dpkg-new + echo " \"^linux-image-extra-$kernel.*\";" >> "$config_file".dpkg-new + echo " \"^linux-signed-image-$kernel.*\";" >> "$config_file".dpkg-new +done +cat >> "$config_file".dpkg-new < Fri, 05 Jul 2013 16:39:34 +0200 apt (0.9.9) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 02fed44d5..3979bd810 100755 --- a/debian/rules +++ b/debian/rules @@ -183,6 +183,8 @@ apt: build build-manpages # apt install # cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove + cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal + chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir -- cgit v1.2.3 From bac1fd143d91e1595ef412195f44cfedae42b472 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 3 Nov 2012 08:28:54 +0100 Subject: Make sure we always have at least two kernels marked not for removal --- debian/apt.auto-removal.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 8f6fc2efc..598aee1a3 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -9,6 +9,10 @@ set -e # - the kernel version we've been called for # - the latest kernel version (determined using rules copied from the grub # package for deciding which kernel to boot) +# - the second-latest kernel version, if the booted kernel version is +# already the latest and this script is called for that same version, +# to ensure a fallback remains available in the event the newly-installed +# kernel at this ABI fails to boot # In the common case, this results in exactly two kernels saved, but it can # result in three kernels being saved. It's better to err on the side of # saving too many kernels than saving too few. @@ -35,16 +39,30 @@ version_test_gt () list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') latest_version="" +previous_version="" for i in $list; do if version_test_gt "$i" "$latest_version"; then + previous_version="$latest_version" latest_version="$i" + elif version_test_gt "$i" "$previous_version"; then + previous_version="$i" fi done +if [ "$latest_version" != "$installed_version" ] \ + || [ "$latest_version" != "$running_version" ] \ + || [ "$installed_version" != "$running_version" ] +then + # We have at least two kernels that we have reason to think the + # user wants, so don't save the second-newest version. + previous_version= +fi + kernels=$(sort -u < Date: Mon, 5 Nov 2012 10:27:17 +0100 Subject: get dpkg from apt-config as well and add robustness against missing/failing apt-config (for paranoia) Conflicts: debian/apt.auto-removal.sh --- debian/apt.auto-removal.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 598aee1a3..17becd30e 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -21,7 +21,14 @@ set -e # packages in the database because this runs from a postinst script, and apt # will overwrite the db when it exits. -config_file=/etc/apt/apt.conf.d/01autoremove-kernels + +# +eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d) +test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d" +config_file=${APT_CONF_D}/01autoremove-kernels + +eval $(apt-config shell DPKG Dir::bin::dpkg/f) +test -n "$DPKG" || DPKG="/usr/bin/dpkg" installed_version="$1" running_version="$(uname -r)" @@ -32,11 +39,11 @@ version_test_gt () local version_test_gt_sedexp="s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" local version_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`" local version_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`" - dpkg --compare-versions "$version_a" gt "$version_b" + $DPKG --compare-versions "$version_a" gt "$version_b" return "$?" } -list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') +list=$($DPKG -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') latest_version="" previous_version="" -- cgit v1.2.3 From 50dba2a9ad755f2ce476576f54698128df9ba327 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Tue, 6 Nov 2012 15:54:31 -0700 Subject: * Fix up two things in debian/apt.auto-removal.sh: - Use exact matches with $-terminated regexes, so we don't get confusion between similarly-named kernel flavours. - Keep linux-backports-modules in sync with installed kernels. Conflicts: configure.in debian/changelog doc/apt-verbatim.ent --- debian/apt.auto-removal.sh | 7 ++++--- debian/changelog | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 17becd30e..8b0f1cf69 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -81,9 +81,10 @@ APT { EOF for kernel in $kernels; do - echo " \"^linux-image-$kernel.*\";" >> "$config_file".dpkg-new - echo " \"^linux-image-extra-$kernel.*\";" >> "$config_file".dpkg-new - echo " \"^linux-signed-image-$kernel.*\";" >> "$config_file".dpkg-new + echo " \"^linux-image-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-image-extra-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new done cat >> "$config_file".dpkg-new < Fri, 05 Jul 2013 16:39:34 +0200 apt (0.9.9) unstable; urgency=low -- cgit v1.2.3 From 90b9659c9a959601d5ed1cc77f7c8b9e0d5b8939 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 11 Jul 2013 07:52:34 +0200 Subject: debian/apt.auto-removal.sh: merge the remaining bits --- debian/apt.auto-removal.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 8b0f1cf69..4ada56556 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -22,7 +22,6 @@ set -e # will overwrite the db when it exits. -# eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d) test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d" config_file=${APT_CONF_D}/01autoremove-kernels @@ -43,7 +42,7 @@ version_test_gt () return "$?" } -list=$($DPKG -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') +list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') latest_version="" previous_version="" @@ -74,7 +73,7 @@ EOF ) cat > "$config_file".dpkg-new <> "$config_file".dpkg-new echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-headers-${kernel}$\";" >> "$config_file".dpkg-new done cat >> "$config_file".dpkg-new < Date: Thu, 11 Jul 2013 20:44:52 +0200 Subject: update changelog --- debian/changelog | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 185322bb6..49dee8800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -apt (0.9.9.1) UNRELEASED; urgency=low +apt (0.9.9.1) unstable; urgency=low [ Michael Vogt ] * debian/rules: - call dh_clean in clean (closes: #714980) * apt-pkg/packagemanager.cc: - increate APT::pkgPackageManager::MaxLoopCount to 5000 + * cherry pick debian/apt.auto-removal.sh feature from the + ubuntu/master branch [ Steve Langasek ] * debian/apt.conf.autoremove: don't include linux-image*, @@ -22,7 +24,12 @@ apt (0.9.9.1) UNRELEASED; urgency=low confusion between similarly-named kernel flavours. - Keep linux-backports-modules in sync with installed kernels. - -- Michael Vogt Fri, 05 Jul 2013 16:39:34 +0200 + [ David Kalnischkies ] + * Version 3 for DPkg::Pre-Install-Pkgs with MultiArch info (Closes: #712116) + * implement arch+= and arch-= for sources.list + * prevent MarkInstall of unsynced Multi-Arch:same siblings + + -- Michael Vogt Thu, 11 Jul 2013 20:44:31 +0200 apt (0.9.9) unstable; urgency=low -- cgit v1.2.3 From cd32d098b22a3aaf900e4f400ef92922ebecd6a1 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Tue, 16 Jul 2013 07:14:05 +0200 Subject: Vietnamese updated by Tran Ngoc Quan. Closes: #717016 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 49dee8800..8473d5820 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.9.2) UNRELEASED; urgency=low + + [ Programs translations ] + * Vietnamese updated by Tran Ngoc Quan. Closes: #717016 + + -- Christian Perrier Tue, 16 Jul 2013 07:13:08 +0200 + apt (0.9.9.1) unstable; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 209a7f82159e67aa32f6b3e6052245b707f27979 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Jul 2013 14:56:47 +0200 Subject: fix if-clause to generate hook-info for 'rc' packages (Closes: 717006) --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8473d5820..f7c8f8a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -apt (0.9.9.2) UNRELEASED; urgency=low +apt (0.9.9.2) unstable; urgency=low [ Programs translations ] * Vietnamese updated by Tran Ngoc Quan. Closes: #717016 - -- Christian Perrier Tue, 16 Jul 2013 07:13:08 +0200 + [ David Kalnischkies ] + * fix if-clause to generate hook-info for 'rc' packages (Closes: 717006) + + -- Michael Vogt Wed, 17 Jul 2013 14:56:34 +0200 apt (0.9.9.1) unstable; urgency=low -- cgit v1.2.3 From c1f8f8c0b070b52e7d85ed932418bc3497cc7990 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Jul 2013 19:55:14 +0200 Subject: debian/apt.auto-removal.sh: * debian/apt.auto-removal.sh: - do not include debug symbol packages for the kernel in the blacklist (closes: #717616) --- debian/apt.auto-removal.sh | 2 +- debian/changelog | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 4ada56556..d105f440a 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -42,7 +42,7 @@ version_test_gt () return "$?" } -list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') +list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ && $2 !~ /-dbg$/ { print $2 }' | sed -e's/linux-image-//') latest_version="" previous_version="" diff --git a/debian/changelog b/debian/changelog index f7c8f8a5a..acb27293f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.9.9.3) UNRELEASED; urgency=low + + [ Ben Hutchings ] + * debian/apt.auto-removal.sh: + - do not include debug symbol packages for the kernel in the + blacklist (closes: #717616) + + -- Michael Vogt Tue, 23 Jul 2013 19:54:31 +0200 + apt (0.9.9.2) unstable; urgency=low [ Programs translations ] -- cgit v1.2.3 From d3213963281a4f910b78679dad35bf59ddbd721c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Jul 2013 20:09:05 +0200 Subject: debian/apt.postinst: * debian/apt.postinst: - run /etc/kernel/postinst.d/apt-auto-removal once on upgrade to ensure that the correct auto-removal list is generated (closes: #717615) --- debian/apt.postinst | 4 ++++ debian/changelog | 6 ++++++ 2 files changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index bd814e1af..9ff1e031c 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -28,6 +28,10 @@ case "$1" in chmod -f 0640 /var/log/apt/term.log* || true fi + # create kernel autoremoval blacklist on update + if dpkg --compare-versions "$2" lt-nl 0.9.9.3; then + /etc/kernel/postinst.d/apt-auto-removal + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index acb27293f..119f09ec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ apt (0.9.9.3) UNRELEASED; urgency=low * debian/apt.auto-removal.sh: - do not include debug symbol packages for the kernel in the blacklist (closes: #717616) + + [ Michael Vogt ] + * debian/apt.postinst: + - run /etc/kernel/postinst.d/apt-auto-removal once on upgrade + to ensure that the correct auto-removal list is generated + (closes: #717615) -- Michael Vogt Tue, 23 Jul 2013 19:54:31 +0200 -- cgit v1.2.3 From 462cfb71b8ebfa4da6b5681cee96931c927ae232 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Jul 2013 17:15:18 +0200 Subject: skip all Description fields in apt-cache, not just first (Closes: 717254) * skip all Description fields in apt-cache, not just first (Closes: 717254) * fix 'apt-cache search' crash with missing description (Closes: 647590) --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 119f09ec3..745cf7930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.9.3) UNRELEASED; urgency=low +apt (0.9.9.3) unstable; urgency=low [ Ben Hutchings ] * debian/apt.auto-removal.sh: @@ -11,7 +11,11 @@ apt (0.9.9.3) UNRELEASED; urgency=low to ensure that the correct auto-removal list is generated (closes: #717615) - -- Michael Vogt Tue, 23 Jul 2013 19:54:31 +0200 + [ David Kalnischkies ] + * skip all Description fields in apt-cache, not just first (Closes: 717254) + * fix 'apt-cache search' crash with missing description (Closes: 647590) + + -- Michael Vogt Thu, 25 Jul 2013 17:14:58 +0200 apt (0.9.9.2) unstable; urgency=low -- cgit v1.2.3 From 8b620f4b490a973bfaeaf4de30b72a270a2ef9f2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Jul 2013 09:58:55 +0200 Subject: update changelog for upload --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 745cf7930..5159e5b17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.9.9.4) unstable; urgency=low + + [ David Kalnischkies ] + * pick up Translation-* even if only compressed available (Closes: 717665) + * request absolute URIs from proxies again (0.9.9.3 regession) + (Closes: 717891) + + [ Michael vogt ] + * fix missing changelog entry for 0.9.9.3 (git-dch issue) + + -- Michael Vogt Fri, 26 Jul 2013 09:58:17 +0200 + apt (0.9.9.3) unstable; urgency=low [ Ben Hutchings ] @@ -15,6 +27,9 @@ apt (0.9.9.3) unstable; urgency=low * skip all Description fields in apt-cache, not just first (Closes: 717254) * fix 'apt-cache search' crash with missing description (Closes: 647590) + [ Raphael Geissert ] + * Do not send a connection: keep-alive, at all + -- Michael Vogt Thu, 25 Jul 2013 17:14:58 +0200 apt (0.9.9.2) unstable; urgency=low -- cgit v1.2.3 From ed9ba607b47feae1a435126c5fa05ac2a3690099 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 14:12:29 +0200 Subject: make autoconf happy by "mv configure.{in,ac}" Git-Dch: Ignore --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 3979bd810..05dcf813c 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ build-manpages: build/build-manpages-stamp build/environment.mak: build/configure-stamp @true -configure: configure.in +configure: configure.ac build/configure-stamp: configure dh_testdir -mkdir build -- cgit v1.2.3 From 0571cdfc967d0876dab332aaf04fab21077496e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 18:36:50 +0200 Subject: correct management-typo in description found by lintian --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 7730c2491..29d67d765 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: apt (<< 0.9.4~) Section: libs -Description: package managment runtime library +Description: package management runtime library This library provides the common functionality for searching and managing packages as well as information about packages. Higher-level package managers can depend upon this library. @@ -107,9 +107,9 @@ Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: xz-utils -Description: package managment related utility programs +Description: package management related utility programs This package contains some less used commandline utilities related - to package managment with APT. + to package management with APT. . * apt-extracttemplates is used by debconf to prompt for configuration questions before installation. -- cgit v1.2.3 From ee7ddf1294fca70088f8dcc15bf87323870bd417 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 19:13:55 +0200 Subject: implement debian/rules build-{arch,indep} as required by policy 3.9.4 --- debian/control | 2 +- debian/rules | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 29d67d765..ca18ff01f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Julian Andres Klode -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, diff --git a/debian/rules b/debian/rules index 05dcf813c..4686f569d 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 -build: build/build-stamp +build-binary: build/build-binary-stamp build-debiandoc: build/build-debiandoc-stamp build-manpages: build/build-manpages-stamp @@ -84,7 +84,7 @@ build/configure-stamp: configure cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags) touch $@ -build/build-stamp: build/configure-stamp +build/build-binary-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary # compat symlink for the locale split @@ -120,7 +120,6 @@ clean: debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ -binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. libapt-pkg-doc: build-debiandoc dh_testdir -p$@ @@ -172,9 +171,8 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. -binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build build-manpages +apt: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -220,7 +218,7 @@ apt: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -libapt-pkg-dev: build debian/libapt-pkg-dev.install +libapt-pkg-dev: build-binary debian/libapt-pkg-dev.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -240,7 +238,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_builddeb -p$@ apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates -apt-utils: build build-manpages +apt-utils: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -269,7 +267,7 @@ apt-utils: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install +$(LIBAPT_PKG): build-binary debian/$(LIBAPT_PKG).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -288,7 +286,7 @@ $(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_INST): build debian/$(LIBAPT_INST).install +$(LIBAPT_INST): build-binary debian/$(LIBAPT_INST).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -307,7 +305,7 @@ $(LIBAPT_INST): build debian/$(LIBAPT_INST).install dh_md5sums -p$@ dh_builddeb -p$@ -apt-transport-https: build libapt-pkg-dev +apt-transport-https: build-binary libapt-pkg-dev dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -333,10 +331,12 @@ apt-transport-https: build libapt-pkg-dev configure: $(MAKE) configure -really-clean: clean - -find . -name Makefile.in -print0 | xargs --null --no-run-if-empty -- rm -f - find -name ChangeLog | xargs rm -f - rm -f l33ch-stamp - +# translate targets to targets required by debian-policy +binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https +binary-indep: apt-doc libapt-pkg-doc binary: binary-indep binary-arch +build-arch: build-binary +build-indep: build-manpages build-debiandoc +build: build-indep build-arch + .PHONY: build clean binary-indep binary-arch binary -- cgit v1.2.3 From e941cc69cf3e90ab799dec24587bb339db07038f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 22:37:43 +0200 Subject: exclude config.{sub,guess} from source package Lintian complains about these links in the source package as they leave the source directory and as they are autogenerated there isn't that much sense in shipping them, we can just recreate them before calling configure. --- debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 4686f569d..fc44d5a68 100755 --- a/debian/rules +++ b/debian/rules @@ -77,7 +77,7 @@ build/environment.mak: build/configure-stamp @true configure: configure.ac -build/configure-stamp: configure +build/configure-stamp: configure buildlib/config.sub buildlib/config.guess dh_testdir -mkdir build cp COPYING debian/copyright @@ -116,6 +116,8 @@ clean: rm -rf build rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \ debian/libapt-pkg-dev.install + test ! -L buildlib/config.guess || rm -f buildlib/config.guess + test ! -L buildlib/config.sub || rm -f buildlib/config.sub debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ @@ -328,6 +330,9 @@ apt-transport-https: build-binary libapt-pkg-dev dh_md5sums -p$@ dh_builddeb -p$@ +buildlib/config.guess buildlib/config.sub: + $(MAKE) "$@" + configure: $(MAKE) configure -- cgit v1.2.3 From ed0e7e312b90b62c9de89b82d48cbe52762e74b0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 23:56:28 +0200 Subject: update the symbol files to reflect current state --- debian/libapt-inst1.5.symbols | 6 +-- debian/libapt-pkg4.12.symbols | 121 ++++++++++++++++++------------------------ 2 files changed, 53 insertions(+), 74 deletions(-) (limited to 'debian') diff --git a/debian/libapt-inst1.5.symbols b/debian/libapt-inst1.5.symbols index 8fcd29a3e..030795382 100644 --- a/debian/libapt-inst1.5.symbols +++ b/debian/libapt-inst1.5.symbols @@ -81,12 +81,8 @@ libapt-inst.so.1.5 libapt-inst1.5 #MINVER# (c++|optional)"vtable for pkgCache::VerIterator@Base" 0.8.0 (c++|optional)"vtable for pkgCache::Iterator@Base" 0.8.0 (c++|optional)"vtable for pkgCache::Iterator@Base" 0.8.0 -### gcc-4.4 specific -# (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0 -# (c++|optional=std)"std::basic_string, std::allocator >& std::basic_string, std::allocator >::append(unsigned char*, unsigned char*)@Base" 0.8.0 -### gcc-4.6 specific +### gcc artefacts (c++|optional=std)"std::vector >::~vector()@Base" 0.8.12 - (c++|optional=std)"std::basic_string, std::allocator >& std::basic_string, std::allocator >::_M_replace_dispatch(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, unsigned char*, unsigned char*, std::__false_type)@Base" 0.8.0 ### try to ignore std:: template instances (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index bf42e8b10..2b86c9676 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -36,6 +36,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"safe_snprintf(char*, char*, char const*, ...)@Base" 0.8.0 (c++)"stringcasecmp(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, char const*, char const*)@Base" 0.8.0 (c++)"stringcasecmp(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >)@Base" 0.8.0 + (c++)"stringcasecmp(std::basic_string, std::allocator > const&, char const*)@Base" 0.8.0 (c++)"stringcasecmp(char const*, char const*, char const*, char const*)@Base" 0.8.0 (c++)"tolower_ascii(int)@Base" 0.8.0 (c++)"ParseQuoteWord(char const*&, std::basic_string, std::allocator >&)@Base" 0.8.0 @@ -90,6 +91,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 (c++)"HashString::SupportedHashes()@Base" 0.8.0 (c++)"HashString::_SupportedHashes@Base" 0.8.0 + (c++)"HashString::HashString(HashString const&)@Base" 0.8.0 (c++)"HashString::HashString(std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"HashString::HashString(std::basic_string, std::allocator >, std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"HashString::HashString()@Base" 0.8.0 @@ -517,7 +519,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0 (c++)"pkgCacheGenerator::NewFileVer(pkgCache::VerIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewPackage(pkgCache::PkgIterator&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 - (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, unsigned long)@Base" 0.8.0 (c++)"pkgCacheGenerator::SelectFile(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, pkgIndexFile const&, unsigned long)@Base" 0.8.0 (c++)"pkgCacheGenerator::FinishCache(OpProgress*)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0 @@ -1124,32 +1125,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# debVS@Base 0.8.0 pkgLibVersion@Base 0.8.0 pkgVersion@Base 0.8.0 -### demangle strangeness - buildd report it as MISSING and as new… - (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 -### gcc-4.4 specific -# (c++|optional=inherent)"APT::PackageSet::PackageSet(APT::PackageSet const&)@Base" 0.8.0 -# (c++|optional=inline)"stringcasecmp(char const*, char const*, char const*)@Base" 0.8.0 -# (arch=armel|c++|optional=inline)"stringcasecmp(std::basic_string, std::allocator > const&, char const*)@Base" 0.8.0 -# (c++|optional=inherent)"APT::VersionSet::insert(pkgCache::VerIterator const&)@Base" 0.8.0 -# (c++|optional=inline)"APT::VersionSet::insert(APT::VersionSet const&)@Base" 0.8.0 -# (c++|optional=private)"debTranslationsIndex::IndexFile(char const*) const@Base" 0.8.0 -# (c++|optional=inline)"pkgCache::Iterator::end() const@Base" 0.8.0 -# (c++|optional=inherent)"HashString::operator=(HashString const&)@Base" 0.8.0 -# (c++|regex|optional=std)"^std::less<[^ ]+>::operator\(\)\(.+\) const@Base$" 0.8.0 -# (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 -# (c++|regex|optional=std)"^pkgCache::(Dep|Pkg|Ver|Grp|Prv|Desc|PkgFile)Iterator\*\* std::_.+@Base$" 0.8.0 -### gcc-4.5 specific -# (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0 -# (c++|optional=inline)"FileFd::FileFd(std::basic_string, std::allocator >, FileFd::OpenMode, unsigned long)@Base" 0.8.0 -# (c++|regex|optional=template)"^SPtrArray<[^ ]+>::~SPtrArray\(\)@Base$" 0.8.0 -# (c++|optional=template)"SPtrArray::~SPtrArray()@Base" 0.8.0 -### gcc-4.6 specific -# (c++|optional=template)"SPtrArray::~SPtrArray()@Base" 0.8.0 -# (c++|optional=inline)"IndexTarget::~IndexTarget()@Base" 0.8.11 - (c++|regex|optional=std)"^std::basic_string, std::allocator >::basic_string\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::vector::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 - (c++|optional=template)"HashSumValue<160>::operator std::basic_string, std::allocator >() const@Base" 0.8.16~exp14 ### architecture specific: va_list (arch=armel armhf|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, std::__va_list&) const@Base" 0.8.15~exp1 (arch=i386 hurd-i386 kfreebsd-i386|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1 @@ -1177,16 +1152,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# ### architecture specific: size_t (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0 (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0 -### try to ignore std:: template instances - (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0 - (c++|regex|optional=std)"^(void |DiffInfo\* |)std::_.*@Base$" 0.8.0 - (c++|regex|optional=std)"^(bool|void) std::(operator|sort_heap|make_heap)[^ ]+<.+ >\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^std::reverse_iterator<.+ > std::__.+@Base$" 0.8.0 - (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 - (c++|regex|optional=std)"^__gnu_cxx::__[^ ]+<.*@Base$" 0.8.0 - (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 - (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 ### (c++)"Configuration::MatchAgainstConfig::clearPatterns()@Base" 0.8.1 (c++)"CreateAPTDirectoryIfNeeded(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.2 @@ -1368,7 +1333,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"FileFd::Skip(unsigned long long)@Base" 0.8.16~exp6 (c++)"FileFd::Write(void const*, unsigned long long)@Base" 0.8.16~exp6 (c++)"FileFd::Truncate(unsigned long long)@Base" 0.8.16~exp6 - (c++)"pkgCache::PkgIterator::PkgIterator(pkgCache&, pkgCache::Package*)@Base" 0.8.16~exp6 (c++)"pkgPolicy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6 (c++)"OptionalIndexTarget::IsOptional() const@Base" 0.8.16~exp6 (c++)"typeinfo for pkgTagFile@Base" 0.8.16~exp6 @@ -1404,16 +1368,11 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=internal|regex)"^SHA384_.*@Base$" 0.8.16~exp2 (c++|optional=internal|regex)"^SHA512_.*@Base$" 0.8.16~exp2 ### orderlist rework: the touched methods are protected -# (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator)@Base" 0.8.0 -# (c++)"pkgPackageManager::DepAdd(pkgOrderList&, pkgCache::PkgIterator, int)@Base" 0.8.0 -# (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1 (c++)"SigINT(int)@Base" 0.8.16~exp14 (c++)"pkgPackageManager::SigINTStop@Base" 0.8.16~exp14 (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool, int)@Base" 0.8.16~exp14 (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator, int)@Base" 0.8.16~exp14 ### FileFd rework: supporting different on-the-fly (de)compressing needs more parameter (abi), but the api is stable -# (c++)"FileFd::OpenDescriptor(int, FileFd::OpenMode, bool)@Base" 0.8.0 -# (c++)"FileFd::Open(std::basic_string, std::allocator >, FileFd::OpenMode, unsigned long)@Base" 0.8.0 (c++)"FileFd::OpenDescriptor(int, unsigned int, FileFd::CompressMode, bool)@Base" 0.8.16~exp9 (c++)"FileFd::OpenDescriptor(int, unsigned int, APT::Configuration::Compressor const&, bool)@Base" 0.8.16~exp9 (c++)"FileFd::ModificationTime()@Base" 0.8.16~exp9 @@ -1425,31 +1384,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=deprecated,previous-inline)"FileFd::gzFd()@Base" 0.8.0 (c++|optional=private)"FileFd::OpenInternDescriptor(unsigned int, APT::Configuration::Compressor const&)@Base" 0.8.16~exp9 ### CacheSet rework: making them real containers breaks bigtime the API (for the CacheSetHelper) -# (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageSet const&, OpProgress*)@Base" 0.8.16~exp2 -# (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageSet const&)@Base" 0.8.16~exp2 -# (c++)"APT::PackageSet::FromString(pkgCacheFile&, std::basic_string, std::allocator > const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromCommandLine(pkgCacheFile&, char const**, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromName(pkgCacheFile&, std::basic_string, std::allocator > const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromTask(pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::FromRegEx(pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::PackageSet::~PackageSet()@Base" 0.8.0 -# (c++)"APT::VersionSet::FromString(pkgCacheFile&, std::basic_string, std::allocator >, APT::VersionSet::Version const&, APT::CacheSetHelper&, bool const&)@Base" 0.8.0 -# (c++)"APT::VersionSet::FromPackage(pkgCacheFile&, pkgCache::PkgIterator const&, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::FromCommandLine(pkgCacheFile&, char const**, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0 -# (c++)"APT::VersionSet::~VersionSet()@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::showTaskSelection(APT::PackageSet const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::showRegExSelection(APT::PackageSet const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindTask(pkgCacheFile&, std::basic_string, std::allocator >)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindRegEx(pkgCacheFile&, std::basic_string, std::allocator >)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindAllVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindPackage(pkgCacheFile&, std::basic_string, std::allocator > const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const&, pkgCache::VerIterator, std::basic_string, std::allocator > const&, bool const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindCandInstVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0 -# (c++)"APT::CacheSetHelper::canNotFindInstCandVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0 (c++)"APT::PackageContainer, std::allocator > >::const_iterator::getPkg() const@Base" 0.8.16~exp9 (c++)"APT::PackageContainer, std::allocator > >::getConstructor() const@Base" 0.8.16~exp9 (c++)"APT::PackageContainer, std::allocator > >::empty() const@Base" 0.8.16~exp9 @@ -1489,7 +1423,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::VersionContainerInterface::FromModifierCommandLine(unsigned short&, APT::VersionContainerInterface*, pkgCacheFile&, char const*, std::list > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9 (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer, std::allocator > > const&, OpProgress*)@Base" 0.8.16~exp9 (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer, std::allocator > > const&)@Base" 0.8.16~exp9 - (c++)"APT::VersionContainer > >::iterator std::max_element > >::iterator, CompareProviders>(APT::VersionContainer > >::iterator, APT::VersionContainer > >::iterator, CompareProviders)@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer, std::allocator > >::const_iterator@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer, std::allocator > >@Base" 0.8.16~exp9 (c++)"typeinfo for APT::PackageContainer > >::const_iterator@Base" 0.8.16~exp9 @@ -1530,3 +1463,53 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++|optional=private)"pkgCacheGenerator::MergeListVersion(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&, std::basic_string, std::allocator > const&, pkgCache::VerIterator*&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator&, pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp7 (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7 + (c++)"pkgTagSection::Exists(char const*)@Base" 0.9.7.9~exp1 + (c++)"_strrstrip(char*)@Base" 0.9.7.9~exp2 + (c++)"SplitClearSignedFile(std::basic_string, std::allocator > const&, FileFd*, std::vector, std::allocator >, std::allocator, std::allocator > > >*, FileFd*)@Base" 0.9.7.9~exp2 + (c++)"OpenMaybeClearSignedFile(std::basic_string, std::allocator > const&, FileFd&)@Base" 0.9.7.9~exp2 + (c++)"ExecGPGV(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, int const&, int*)@Base" 0.9.7.9~exp2 + (c++)"SigVerify::RunGPGV(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, int const&)@Base" 0.9.7.9~exp2 + (c++)"Configuration::Dump(std::basic_ostream >&, char const*, char const*, bool)@Base" 0.9.3 + (c++)"AcquireUpdate(pkgAcquire&, int, bool, bool)@Base" 0.9.3 + (c++|optional=private)"pkgAcqMethod::Dequeue()@Base" 0.9.4 + (c++)"pkgCache::DepIterator::IsMultiArchImplicit() const@Base" 0.9.6 + (c++)"pkgCache::PrvIterator::IsMultiArchImplicit() const@Base" 0.9.6 + (c++)"APT::PackageContainerInterface::FromGroup(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::PackageArchitectureMatchesSpecification(std::basic_string, std::allocator > const&, bool)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::~PackageArchitectureMatchesSpecification()@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(pkgCache::PkgIterator const&)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(pkgCache::VerIterator const&)@Base" 0.9.7 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(char const* const&)@Base" 0.9.7 + (c++)"APT::Configuration::checkLanguage(std::basic_string, std::allocator >, bool)@Base" 0.9.7.5 + (c++)"pkgCdrom::DropTranslation(std::vector, std::allocator >, std::allocator, std::allocator > > >&)@Base" 0.9.7.5 + (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::PrvIterator const&) const@Base" 0.9.8 + (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::VerIterator const&) const@Base" 0.9.8 + (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, unsigned int, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.9.8 + (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, unsigned int, unsigned long, unsigned long)@Base" 0.9.8 + (c++)"FileFd::FileFdErrno(char const*, char const*, ...)@Base" 0.9.9 + (c++)"FileFd::FileFdError(char const*, ...)@Base" 0.9.9 + (c++)"operator<<(std::basic_ostream >&, GlobalError::Item)@Base" 0.9.9 + (c++)"pkgDepCache::IsDeleteOkProtectInstallRequests(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 + (c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 + (c++)"pkgDPkgPM::SendPkgsInfo(_IO_FILE*, unsigned int const&)@Base" 0.9.9.1 + (c++)"pkgCache::VerIterator::MultiArchType() const@Base" 0.9.9.1 +### demangle strangeness - buildd report it as MISSING and as new… + (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 +### gcc artefacts + (c++|regex|optional=std)"^std::vector::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 + (c++|optional=std)"std::ctype::widen(char) const@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct(char const*, char const*, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 + (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct(char*, char*, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 +### try to ignore std:: template instances + (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0 + (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0 + (c++|regex|optional=std)"^(void |DiffInfo\* |)std::_.*@Base$" 0.8.0 + (c++|regex|optional=std)"^(bool|void) std::(operator|sort_heap|make_heap)[^ ]+<.+ >\(.+\)@Base$" 0.8.0 + (c++|regex|optional=std)"^std::reverse_iterator<.+ > std::__.+@Base$" 0.8.0 + (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 + (c++|regex|optional=std)"^__gnu_cxx::__[^ ]+<.*@Base$" 0.8.0 + (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 + (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 -- cgit v1.2.3 From 64876cf7963f897efa70c3e424527e2e8651aa29 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sat, 3 Aug 2013 16:07:13 +0200 Subject: Vietnamese translation update. Closes: #718615 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5159e5b17..e2bb9c471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.9.9.5) UNRELEASED; urgency=low + + * Vietnamese translation update. Closes: #718615 + + -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 + apt (0.9.9.4) unstable; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From de81d69704bc5103ca55032a8f009820f30624c7 Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sat, 10 Aug 2013 12:51:40 +0200 Subject: Japanese translation update. Closes: #719279 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e2bb9c471..d1ecbff1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.9.9.5) UNRELEASED; urgency=low * Vietnamese translation update. Closes: #718615 + * Japanese translation update. Closes: #719279 -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 -- cgit v1.2.3 From f9e64e7bb0c125b54f0699d9e08956a88b467a7f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 00:19:10 +0200 Subject: use a tmpfile for trustdb.gpg in apt-key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for some "interesting" reason gpg decides that it needs to update its trustdb.gpg file in a --list-keys command even if right before gpg is asked to --check-trustdb. That wouldn't be as bad if it wouldn't modify the keyring being listed at that moment as well, which generates not only warnings which are not a problem for us, but as the keyring modified can be in /usr it modified files which aren't allowed to be modified. The suggested solution in the bugreport is running --check-trustdb unconditionally in an 'apt-key update' call, but this command will not be used in the future and this could still potentially bite us in net-update or adv calls. All of this just to keep a file around, which we do not need… The commit therefore switches to the use of a temporary created trusted.gpg file for everyone and asks gpg to not try to update the trustdb after its intial creation, which seems to avoid the problem altogether. It is using your also faked secring btw as calling the check-trustdb without a keyring is a lot slower … Closes: #687611 Thanks: Andreas Beckmann for the initial patch! --- debian/apt.postinst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index 9ff1e031c..caa05ccdf 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,10 +15,15 @@ set -e case "$1" in configure) - SECRING='/etc/apt/secring.gpg' - # test if secring is an empty normal file - if test -f $SECRING -a ! -s $SECRING; then - rm -f $SECRING + if dpkg --compare-versions "$2" lt-nl 0.9.9.5; then + # we are using tmpfiles for both + rm -f /etc/apt/trustdb.gpg + # this removal was done unconditional since 0.8.15.3 + SECRING='/etc/apt/secring.gpg' + # test if secring is an empty normal file + if test -f $SECRING -a ! -s $SECRING; then + rm -f $SECRING + fi fi apt-key update -- cgit v1.2.3 From ec9272975f454d3911e61e5cc3b29fe90fe2ee54 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 12 Aug 2013 17:26:54 +0200 Subject: do not call 'apt-key update' in apt.postinst The debian-archive-keyring package ships trusted.gpg.d fragment files for a while now and dropped their call to 'apt-key update', so there is no need for use to call it as the keys will always be available. This also finally allows a user to remove key(ring)s without APT to overriding this decision by readding them with this step. The functionality is kept around in the odd case that an old debian-archive-keyring package is used which still calls 'apt-key update' and depends on the import (hence, we also do not enforce a newer version of the debian-archive-keyring via our dependencies) --- debian/apt.postinst | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index caa05ccdf..70de237d0 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -25,7 +25,6 @@ case "$1" in rm -f $SECRING fi fi - apt-key update # ensure tighter permissons on the logs, see LP: #975199 if dpkg --compare-versions "$2" lt-nl 0.9.7.7; then -- cgit v1.2.3 From 713a2de01cc1a0b8dcd71a4137f8a099d22783b7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 21:45:59 +0200 Subject: update changelog for upload --- debian/changelog | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d1ecbff1f..8e4def2b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,48 @@ -apt (0.9.9.5) UNRELEASED; urgency=low +apt (0.9.10) unstable; urgency=low + The "Hello to Debconf" upload + + [ Christian Perrier ] * Vietnamese translation update. Closes: #718615 * Japanese translation update. Closes: #719279 - -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 + [ Michael Vogt ] + * work on fixing coverity scan results: + - fix some off-by-one errors + - fix some resource leaks + - fixes in chroot() handling + - fix some missing va_end() + * make the code -Wall clean again + * remove duplicated #include + * add .travis.yml + * use the 'abi-complicance-checker' package and remove the buildin + copy for the abi checks + + [ David Kalnischkies ] + * ensure that FileFd::Size returns 0 in error cases + * add missing Turkish (tr) to po/LINGUAS + * correct management-typo in description found by lintian + * implement debian/rules build-{arch,indep} as required by policy 3.9.4 + * reenable automatic parallel build of APT + * exclude config.{sub,guess} from source package + * update the symbol files to reflect current state + * unset LANGUAGE for showing [Y/n] answer hints + * fix some unitialized data members + * specific pins below 1000 cause downgrades (Closes: 543966) + * use pkgTagFile to parse "header" of Release files + * fix: --print-uris removes authentication (Closes: 719263) + * always use our own trustdb.gpg in apt-key + * use a tmpfile for trustdb.gpg in apt-key. + Thanks to Andreas Beckmann for the initial patch! (Closes: #687611) + * do not double-slash paths in apt-key (Closes: 665411) + * make the keyring locations in apt-key configurable + * let apt-key del work better with softlink and single key keyrings + * do not call 'apt-key update' in apt.postinst + + [ Colin Watson ] + * prefer native arch over higher priority for providers (Closes: #718482) + + -- Michael Vogt Mon, 12 Aug 2013 21:45:07 +0200 apt (0.9.9.4) unstable; urgency=low -- cgit v1.2.3