diff options
| author | Julian Andres Klode <jak@debian.org> | 2009-08-03 15:59:35 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2009-08-03 15:59:35 +0200 |
| commit | 008812a3e9d4f786b83a78f72c115aae2faf65d4 (patch) | |
| tree | 5476b378569f3fa8809fe7228b5022af96d47af8 | |
| parent | 08674e660118758f32d220a26b4a525459317293 (diff) | |
| parent | b901e22c3b747dd463bc13be10826bf90934c223 (diff) | |
| download | python-apt-008812a3e9d4f786b83a78f72c115aae2faf65d4.tar.gz | |
Merge 0.7.12.1
| -rw-r--r-- | apt/debfile.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/apt/debfile.py b/apt/debfile.py index fd6c1532..421129c8 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -78,7 +78,7 @@ class DebPackage(object): member) break except SystemError: - return [_("List of files for '%s'could not be read" % + return [_("List of files for '%s' could not be read" % self.filename)] return files diff --git a/debian/changelog b/debian/changelog index 5f1f2967..1d735656 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,7 @@ python-apt (0.7.92) UNRELEASED; urgency=low instead of segfaulting. * Other stuff: - - Merge releases 0.7.10.4 - 0.7.12.0 from unstable. + - Merge releases 0.7.10.4 - 0.7.12.1 from unstable. - Merge Configuration,ConfigurationPtr,ConfigurationSub into one type. - Simplify the whole build process by using a single setup.py. - The documentation has been restructured and enhanced with tutorials. @@ -75,6 +75,19 @@ python-apt (0.7.90) experimental; urgency=low -- Julian Andres Klode <jak@debian.org> Wed, 15 Apr 2009 13:47:42 +0200 +python-apt (0.7.12.1) unstable; urgency=low + + * apt/debfile.py: + - Fix missing space in message (Closes: #539704) + * apt/package.py: + - Add missing argument to Version.__le__() and Version.__ge__() + * debian/control: + - Do not build-depend on python-gtk2 and python-vte on kfreebsd-*. + * setup.py: + - Always build documentation, even if python-gtk2 is not installed. + + -- Julian Andres Klode <jak@debian.org> Mon, 03 Aug 2009 15:17:43 +0200 + python-apt (0.7.12.0) unstable; urgency=low [ Julian Andres Klode ] diff --git a/debian/control b/debian/control index 6b96a6be..cc5d1e56 100644 --- a/debian/control +++ b/debian/control @@ -16,9 +16,9 @@ Build-Depends: apt-utils, python3.1-dbg, python-central (>= 0.5), python-distutils-extra (>= 2.0), - python-gtk2, + python-gtk2 [!kfreebsd-amd64 !kfreebsd-i386], python-sphinx (>= 0.5), - python-vte + python-vte [!kfreebsd-amd64 !kfreebsd-i386] Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes |