merge from debian-sid

4 files changed, 33 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index d55c6246..b7617f90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,30 @@
-python-apt (0.7.94.1) UNRELEASED; urgency=low
+python-apt (0.7.94.3) UNRELEASED; urgency=low
+
+  * python/generic.cc:
+    - Fix a memory leak when using old attribute names.
+  * debian/control:
+    - Change priority to standard, keep -doc and -dev on optional.
+
+ -- Julian Andres Klode <jak@debian.org>  Mon, 15 Mar 2010 17:04:49 +0100
+
+python-apt (0.7.94.2) unstable; urgency=low
+
+  * Revert 0.7.93.3 and just set APT::Architecture to i386 for
+    test_aptsources; fixes FTBFS on powerpc.
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 12 Mar 2010 19:22:57 +0100
+
+python-apt (0.7.94.1) unstable; urgency=low
 
   * Pass --exclude=migrate-0.8.py to dh_pycentral; in order to not depend
-    on python2.6.
+    on python2.6; but recommend python2.6.
   * Use dh_link instead of ln for python-apt-doc (Closes: #573523).
+  * Pass --link-doc=python-apt to dh_installdocs.
+  * Install examples to python-apt-doc instead of python-apt.
+  * tests/test_all.py: Write information header to stderr, not stdout.
+  * Build documentation only when needed (when building python-apt-doc).
 
- -- Julian Andres Klode <jak@debian.org>  Thu, 11 Mar 2010 19:33:26 +0100
+ -- Julian Andres Klode <jak@debian.org>  Fri, 12 Mar 2010 14:36:48 +0100
 
 python-apt (0.7.94) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index af7aa055..a3decb78 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: python-apt
 Section: python
-Priority: optional
+Priority: standard
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.8.4
@@ -23,7 +23,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
 Package: python-apt
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Recommends: lsb-release, iso-codes
+Recommends: lsb-release, iso-codes, python2.6
 Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4)
 Provides: ${python:Provides}
 Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc
@@ -42,6 +42,7 @@ Description: Python interface to libapt-pkg
  the sources.list configuration on the repository and the distro level.
 
 Package: python-apt-doc
+Priority: optional
 Architecture: all
 Section: doc
 Depends: libjs-jquery, ${misc:Depends}
@@ -69,6 +70,7 @@ Description: Python interface to libapt-pkg (debug extension)
  This package contains the extension built for the Python debug interpreter.
 
 Package: python-apt-dev
+Priority: optional
 Architecture: all
 Depends: python-apt (>= ${source:Version}), libapt-pkg-dev (>= 0.7.10),
          ${misc:Depends}
diff --git a/debian/examples b/debian/python-apt-doc.examples
index e4a93ea1..e4a93ea1 100644
--- a/debian/examples
+++ b/debian/python-apt-doc.examples
diff --git a/debian/rules b/debian/rules
index 6d1f07bf..a65c5cfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,14 @@ export CFLAGS=-Wno-write-strings -DCOMPAT_0_7
 
 override_dh_auto_build:
 	dh_auto_build
-	python setup.py build_sphinx
 
 override_dh_installdocs:
-	dh_installdocs
-	rm -rf debian/python-apt-dbg/usr/share/doc/python-apt-dbg
-	ln -s python-apt debian/python-apt-dbg/usr/share/doc/python-apt-dbg
+	set -e; if [ -z $(filter -a,$(DH_INTERNAL_OPTIONS)) ]; then \
+		python setup.py build_sphinx; \
+		dh_installdirs -ppython-apt-doc usr/share/doc/python-apt; \
+	fi
+	dh_installdirs -ppython-apt-dev usr/share/doc/python-apt
+	dh_installdocs --link-doc=python-apt
 
 override_dh_strip:
 	dh_strip --dbg-package=python-apt-dbg