summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog5
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fc638b2f1..e1b855a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
apt (0.9.6ubuntu1) UNRELEASED; urgency=low
+ [ Michael Vogt ]
* merged from Debian, remaining changes:
- use ubuntu keyring and ubuntu archive keyring in apt-key
- run update-apt-xapian-index in apt.cron
@@ -11,6 +12,10 @@ apt (0.9.6ubuntu1) UNRELEASED; urgency=low
- ubuntu changelog download handling
- patch for apt cross-building, see http://bugs.debian.org/666772
+ [ Steve Langasek ]
+ * Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu,
+ removed in previous LTS.
+
-- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 May 2012 15:57:26 +0200
apt (0.9.6) unstable; urgency=low