summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-04-06 16:59:49 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-04-06 16:59:49 +0200
commitd00bb4ccfcb4042f88a9bb8327a5ce4f4a02e057 (patch)
tree60b03a295d0c07edbfb576ca21816fa13beb4c4e /debian
parent52475d3ddc835c3b543d98ee1c16df4989a4112d (diff)
parentb2a0eb7ca6d8db6c8e4ac1875fa41f9466c78384 (diff)
downloadpython-apt-d00bb4ccfcb4042f88a9bb8327a5ce4f4a02e057.tar.gz
* cherry pick multiarch support for aptsources from debian
* aptsources: Parse multi-arch sources.list files correctly * aptsources: Allow insertion of new multi-arch entries
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 235a38da..6f22ad9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+python-apt (0.7.100.3ubuntu2) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * cherry pick multiarch support for aptsources from debian
+
+ [ Julian Andres Klode ]
+ * aptsources: Parse multi-arch sources.list files correctly
+ * aptsources: Allow insertion of new multi-arch entries
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 06 Apr 2011 16:59:07 +0200
+
python-apt (0.7.100.3ubuntu1) natty; urgency=low
* merge fixes from debian-sid, most notably the fixes