summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorColin Watson <cjwatson@canonical.com>2012-11-20 18:16:30 +0000
committerColin Watson <cjwatson@canonical.com>2012-11-20 18:16:30 +0000
commit739aa5d108aaee7864cc204704341cd8258fc4f1 (patch)
tree9a276f919575ab71369ec572e6a3e71415d2fc00 /debian/changelog
parent4a53b1eb164f05984812052b85c07e223e311aa2 (diff)
Fix mismerge of cross-build-dependency handling patch from
0.8.16~exp12ubuntu7.
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1dad02a02..da6ffc3a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.9.7.6ubuntu4) UNRELEASED; urgency=low
+
+ * Fix mismerge of cross-build-dependency handling patch from
+ 0.8.16~exp12ubuntu7.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 20 Nov 2012 18:14:25 +0000
+
apt (0.9.7.6ubuntu3) raring; urgency=low
* Fix comment char in /etc/apt/apt.conf.d/01autoremove-kernels to