summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
1 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f6feca700..b8395ca64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,15 @@
apt (1.0.2ubuntu1) UNRELEASED; urgency=low
- * merged with debian/sid
+ * merged with debian/sid, remaining changes:
+ - ignore .distUpgrade files
+ - patch for apt cross-building, see http://bugs.debian.org/666772
+ - ubuntu changelog download handling
+ - add linux-tools to "VersionedKernelPackages"
+ - ubuntu changelog server
+ - apt-key net-update/apt-xapian-index
+ - git-buildpackage config adjustments
+ - ubuntu keyring
+ - enable apport
-- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Apr 2014 13:50:20 +0200