summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-09-07 13:26:35 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-09-07 13:26:35 +0200
commit6c5feb6111db81f4e7ec871275daa736a6fc793c (patch)
tree47d06e08e7236be2d700e28af0e2aad4ccb562d9 /debian
parent33bbf9482fe486aab915768fc74609d303c1e1f9 (diff)
parentb390a866fc3af9e7050148f11fb558fd52a8a703 (diff)
downloadpython-apt-6c5feb6111db81f4e7ec871275daa736a6fc793c.tar.gz
* merged patch from Samuel Lidén Borell to fix crash if there utf8
in the control file (LP: #624290) and add test * apt/cache.py: - add "sources_list" parameter to cache.update() to force updating a single sources.list entry only * debian/control: - add missing build-depends on python-debian (needed to run the tests for apt.debfile.DebPackage() * apt/debfile: - don't fail if we conflict with the pkgs we are reinstalling
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
-rw-r--r--debian/control3
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 616404e6..efc01884 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,18 @@ python-apt (0.7.97.2) UNRELEASED; urgency=low
* add "provides" property to the apt.Version objects
* apt/debfile.py:
- fix error when reading binary content and add regresion test
+ * merged patch from Samuel Lidén Borell to fix crash if there utf8
+ in the control file (LP: #624290) and add test
+ * apt/cache.py:
+ - add "sources_list" parameter to cache.update() to force updating
+ a single sources.list entry only
+ * debian/control:
+ - add missing build-depends on python-debian (needed to run the
+ tests for apt.debfile.DebPackage()
+
+ [ Kiwinote ]
+ * apt/debfile:
+ - don't fail if we conflict with the pkgs we are reinstalling
-- Michael Vogt <mvo@debian.org> Fri, 27 Aug 2010 11:22:23 +0200
diff --git a/debian/control b/debian/control
index 842f32fb..d478a30d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends: apt-utils,
python3-all-dbg (>= 3.1.2-6~),
python-central (>= 0.5),
python-distutils-extra (>= 2.0),
- python-sphinx (>= 0.5)
+ 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