summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-04-06 17:20:16 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-04-06 17:20:16 +0200
commitbf950bc2b0a1f247714aee3e3096ed6872166d91 (patch)
tree9ca1faba5349f4658ebea1234e4ac6f4ad83b721
parentd00bb4ccfcb4042f88a9bb8327a5ce4f4a02e057 (diff)
downloadpython-apt-bf950bc2b0a1f247714aee3e3096ed6872166d91.tar.gz
merged upload from loic
-rw-r--r--debian/changelog10
-rw-r--r--debian/control4
2 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 6f22ad9f..6086ef61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-apt (0.7.100.3ubuntu2) UNRELEASED; urgency=low
+python-apt (0.7.100.3ubuntu3) UNRELEASED; urgency=low
[ Michael Vogt ]
* cherry pick multiarch support for aptsources from debian
@@ -9,6 +9,14 @@ python-apt (0.7.100.3ubuntu2) UNRELEASED; urgency=low
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 06 Apr 2011 16:59:07 +0200
+python-apt (0.7.100.3ubuntu2) natty; urgency=low
+
+ * Rename Vcs-* to XS-Debian-Vcs-*.
+ * No other changes upload to build against latest apt and hopefully fix
+ LP #733741.
+
+ -- Loïc Minier <loic.minier@linaro.org> Tue, 05 Apr 2011 18:11:40 +0200
+
python-apt (0.7.100.3ubuntu1) natty; urgency=low
* merge fixes from debian-sid, most notably the fixes
diff --git a/debian/control b/debian/control
index 7b052bfc..8969af63 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends: apt-utils,
python-distutils-extra (>= 2.0),
python-sphinx (>= 0.5),
python-debian
-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
+XS-Debian-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
+XS-Debian-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
Package: python-apt
Architecture: any