From 9bafec989612e0bb751e4ba1e3a81d21233ccb9b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 6 Jun 2011 16:36:28 +0200
Subject: merged lp:~brian-murray/apt/history-log

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

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index 3e21120cf..8cc9b53e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.8.14.1ubuntu6) UNRELEASEDoneiric; urgency=low
+
+  * apt-pkg/deb/dpkgpm.cc:
+    - prevent reporting of package installation failures due to inaccessible
+      local files (LP: #791102, #790040)
+    - include /var/log/apt/history.log in apport-package reports so we know
+      the context for the package management request
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 01 Jun 2011 12:32:31 -0700
+
 apt (0.8.14.1ubuntu5) oneiric; urgency=low
 
   * apt-pkg/acquire-item.cc:
-- 
cgit v1.2.3