From 1c62ab240a76122afb95c6df7de19ec5ba5cee1a Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 20 Apr 2007 17:42:06 +0200
Subject: * apt-pkg/policy.cc:   - allow multiple packages (thanks to David
 Foerster)

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 8b566e5c4..bcdeac310 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ apt (0.6.47) UNRELEASED; urgency=low
   * [ABI] apt-pkg/acquire.{cc,h}:
     - deal better with duplicated sources.list entries (avoid
       double queuing of  URLs) - this fixes hangs in bzip/gzip
+  * apt-pkg/policy.cc:
+    - allow multiple packages (thanks to David Foerster)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 
-- 
cgit v1.2.3-70-g09d2


From 3036f1e491ec1c71fb8fe9ff35954cebb2574320 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 25 Apr 2007 00:49:41 +0200
Subject: * NMU * Fix broken use of awk in apt-key that caused removal of the
 wrong keys   from the keyring. Closes: #412572

---
 cmdline/apt-key  | 4 ++--
 debian/changelog | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'debian')

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7460a24be..90ecae2cf 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -24,9 +24,9 @@ update() {
     $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import
 
     # remove no-longer used keys
-    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`
+    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
     for key in $keys; do
-	if $GPG --list-keys --with-colons | awk '/^pub/{FS=":";print $5}'|grep -q $key; then
+	if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
 	    $GPG --quiet --batch --delete-key --yes ${key}
 	fi
     done
diff --git a/debian/changelog b/debian/changelog
index 77f0224d1..8294c45d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,14 @@ apt (0.6.47) UNRELEASED; urgency=low
   
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 
+apt (0.6.46.4-0.1) unstable; urgency=emergency
+  
+  * NMU
+  * Fix broken use of awk in apt-key that caused removal of the wrong keys
+    from the keyring. Closes: #412572
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 26 Feb 2007 16:00:22 -0500
+
 apt (0.6.46.4) unstable; urgency=high
 
   * ack NMU (closes: #401017)
-- 
cgit v1.2.3-70-g09d2