From 7f6464872762464d0989166e4431b1e87de5fb82 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 10 Aug 2011 06:53:15 +0200
Subject: manually merge Adam Conrads upload

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

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index 0d3573b88..b2efeae1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,13 @@ apt (0.8.16~exp5ubuntu5) UNRELEASED; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 10 Aug 2011 06:48:11 +0200
 
+apt (0.8.16~exp5ubuntu4) oneiric; urgency=low
+
+  * Merge change from Robert Collins to upgrade ubuntu-keyring recommends
+    to a hard dependency to match Debian behaviour and fix LP: #816606
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 09 Aug 2011 14:48:24 -0600
+
 apt (0.8.16~exp5ubuntu3) oneiric; urgency=low
 
   * apt-pkg/acquire.cc:
-- 
cgit v1.2.3