From c03567c9fa221de97a9cbb3982c8d481c57848c8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 10 Jul 2013 16:32:00 +0200 Subject: update debian/changelog to match what differenences we have currently between debian/sid and ubuntu/master --- debian/changelog | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8f62e36a1..a4f14cfc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,17 @@ apt (0.9.9ubuntu1) UNRELEASEDsaucy; urgency=low - * merged from the debian/sid branch + * merged from the debian/sid branch: - debian/gbp.conf: change build branch to ubuntu/master + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - run apt-key net-update in cron.daily + - different example sources.list + - APT::pkgPackageManager::MaxLoopCount set to 5000 + - apport pkgfailure handling + - ubuntu changelog download handling + - patch for apt cross-building, see http://bugs.debian.org/666772 + - debian/apt.auto-removal.sh + + make kernels auto-removable -- Michael Vogt Tue, 02 Jul 2013 16:48:08 +0200 -- cgit v1.2.3