From 739aa5d108aaee7864cc204704341cd8258fc4f1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 20 Nov 2012 18:16:30 +0000 Subject: Fix mismerge of cross-build-dependency handling patch from 0.8.16~exp12ubuntu7. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') 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 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 -- cgit v1.2.3