Attached patch updates the changelog as well and removes the conflict
with older versions of apt.
=== modified file 'debian/changelog'
--- debian/changelog	2010-07-25 09:13:26 +0000
+++ debian/changelog	2010-07-30 10:43:52 +0000
@@ -10,7 +10,11 @@
       useful for files containing multiple deb822 paragraphs with mixed
       encodings, like etch's Sources file. (Closes: #586021)
 
- -- John Wright <j...@debian.org>  Sun, 25 Jul 2010 02:07:11 -0700
+  [ Jelmer Vernooij ]
+  * Support installation together with older versions of python-apt.
+    Closes: #590805
+
+ -- Jelmer Vernooij <jel...@debian.org>  Fri, 30 Jul 2010 12:43:52 +0200
 
 python-debian (0.1.16) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-07-25 08:46:02 +0000
+++ debian/control	2010-07-30 10:42:35 +0000
@@ -20,10 +20,10 @@
 Recommends: python-apt
 Suggests: gpgv
 Provides: python-deb822
-Conflicts: python-deb822, python-apt (<< 0.7.94~)
+Conflicts: python-deb822
 Replaces: python-deb822
 Description: Python modules to work with Debian-related data formats
- This package provides Python modules that abstract many formats of Debian 
+ This package provides Python modules that abstract many formats of Debian
  related files. Currently handled are:
   * Debtags information (debian.debtags module)
   * debian/changelog (debian.changelog module)

=== modified file 'lib/debian/deb822.py'
--- lib/debian/deb822.py	2010-07-25 08:46:02 +0000
+++ lib/debian/deb822.py	2010-07-30 10:43:14 +0000
@@ -297,7 +297,8 @@
             necessary in order to properly interpret the strings.)
         """
 
-        if _have_apt_pkg and use_apt_pkg and isinstance(sequence, file):
+        if (_have_apt_pkg and use_apt_pkg and isinstance(sequence, file) and
+            getattr(apt_pkg, "TagFile", None) is not None):
             parser = apt_pkg.TagFile(sequence)
             for section in parser:
                 yield cls(fields=fields, _parsed=TagSectionWrapper(section),

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to