From 285feb3cedca3cccff971155099adef8d902223d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 16 Jul 2011 14:21:51 +0200 Subject: * cmdline/apt-key: - use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596) * debian/apt.postinst: - remove /etc/apt/secring.gpg if it is an empty file --- debian/apt.postinst | 5 +++++ debian/changelog | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index cc0d8b1fe..4d87c4e25 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,6 +15,11 @@ 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 + fi apt-key update ;; diff --git a/debian/changelog b/debian/changelog index 2e22e64d8..914c53801 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,12 @@ apt (0.8.15.3) UNRELEASED; urgency=low - use CndSet in pkgInitConfig (Closes: #629617) * apt-pkg/depcache.cc: - change default of APT::AutoRemove::SuggestsImportant to true + * cmdline/apt-key: + - use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596) + * debian/apt.postinst: + - remove /etc/apt/secring.gpg if it is an empty file - -- David Kalnischkies Fri, 15 Jul 2011 09:29:37 +0200 + -- David Kalnischkies Sat, 16 Jul 2011 14:19:51 +0200 apt (0.8.15.2) unstable; urgency=high -- cgit v1.2.3 From 22eeef1809dae0594eca961783b1f809f4d539f7 Mon Sep 17 00:00:00 2001 From: John Feuerstein Date: Sat, 16 Jul 2011 14:37:52 +0200 Subject: * doc/apt-cache.8.xml: - apply madison typofix from John Feuerstein, thanks! (Closes: #633455) --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 914c53801..a51a90b90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,10 @@ apt (0.8.15.3) UNRELEASED; urgency=low - use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596) * debian/apt.postinst: - remove /etc/apt/secring.gpg if it is an empty file + * doc/apt-cache.8.xml: + - apply madison typofix from John Feuerstein, thanks! (Closes: #633455) - -- David Kalnischkies Sat, 16 Jul 2011 14:19:51 +0200 + -- David Kalnischkies Sat, 16 Jul 2011 14:28:53 +0200 apt (0.8.15.2) unstable; urgency=high -- cgit v1.2.3 From 4a53151acad0c4ccfbcf4ce11c5c2d7cffd05de3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 16 Jul 2011 14:57:37 +0200 Subject: do not require unused partial dirs in 'source' (Closes: #633510) --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a51a90b90..a834bca91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ apt (0.8.15.3) UNRELEASED; urgency=low - document APT::Architectures list (Closes: #612102) * cmdline/apt-get.cc: - restore all important dependencies for garbage packages (LP: #806274) + - do not require unused partial dirs in 'source' (Closes: #633510) * apt-pkg/init.cc: - use CndSet in pkgInitConfig (Closes: #629617) * apt-pkg/depcache.cc: @@ -28,7 +29,7 @@ apt (0.8.15.3) UNRELEASED; urgency=low * doc/apt-cache.8.xml: - apply madison typofix from John Feuerstein, thanks! (Closes: #633455) - -- David Kalnischkies Sat, 16 Jul 2011 14:28:53 +0200 + -- David Kalnischkies Sat, 16 Jul 2011 14:55:03 +0200 apt (0.8.15.2) unstable; urgency=high -- cgit v1.2.3 From a3bbbab7ca5f94391b2158cfe9deb85eb335e29a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 16 Jul 2011 16:48:03 +0200 Subject: * apt-pkg/policy.cc: - emit an error on unknown APT::Default-Release value (Closes: #407511) --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a834bca91..607f7c64a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,8 +28,10 @@ apt (0.8.15.3) UNRELEASED; urgency=low - remove /etc/apt/secring.gpg if it is an empty file * doc/apt-cache.8.xml: - apply madison typofix from John Feuerstein, thanks! (Closes: #633455) + * apt-pkg/policy.cc: + - emit an error on unknown APT::Default-Release value (Closes: #407511) - -- David Kalnischkies Sat, 16 Jul 2011 14:55:03 +0200 + -- David Kalnischkies Sat, 16 Jul 2011 16:43:37 +0200 apt (0.8.15.2) unstable; urgency=high -- cgit v1.2.3