summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-07-10 16:32:00 +0200
committerMichael Vogt <mvo@debian.org>2013-07-10 16:32:00 +0200
commitc03567c9fa221de97a9cbb3982c8d481c57848c8 (patch)
tree11732098c62f5e7f4a36e899f1ae308b9b705f64 /debian/changelog
parent18310a30a91bdd8db9370425347023fbf76abab4 (diff)
update debian/changelog to match what differenences we have currently between debian/sid and ubuntu/master
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog12
1 files changed, 11 insertions, 1 deletions
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 <michael.vogt@ubuntu.com> Tue, 02 Jul 2013 16:48:08 +0200