From 48818c02fdf72168f1a2d9d58e2498adcda27c27 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 20 Apr 2012 09:40:37 +0200
Subject: merge patch from Malcolm Scott for bug #985852

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

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index e4dc1d65d..6bb514f8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.8.16~exp12ubuntu10) UNRELEASEDprecise-proposed; urgency=low
+
+  [ Malcolm Scott ]
+  * apt-pkg/packagemanager.cc:
+    - Fix a regression in the pre-depend handling: where a pre-depend option
+      other than the first specified is already installed, apt-get enters an
+      infinite loop (LP: #985852)
+
+ -- Malcolm Scott <launchpad@malc.org.uk>  Thu, 19 Apr 2012 19:52:56 +0100
+
 apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low
 
   * apt-inst/contrib/extracttar.cc:
-- 
cgit v1.2.3