merge from debian

7 files changed, 69 insertions, 56 deletions

diff --git a/debian/changelog b/debian/changelog
index d63f01a0..6ef1fff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,37 @@
-python-apt (0.7.11.2ubuntu1) UNRELEASED; urgency=low
+python-apt (0.7.12.1ubuntu1) karmic; urgency=low
+
+  [ Michael Vogt ]
+  * apt/package.py:
+    - add "recommends" property
+  * debian/control:
+    - change build-dep for libapt-pkg-dev to >= 0.7.21
+  * merged with debian/unstable
 
   [ Loïc Minier ]
   * Revert addition of gcc and gcc_s to python-apt libs as the toolchain has
     been fixed; LP: #375334.
-  
-  [ Michael Vogt ]
-  * merged with debian/unstable
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jul 2009 15:51:27 +0200
+  [ Julian Andres Klode ]
+  * apt/package.py:
+   - Introduce Version.get_dependencies() which takes one or more types
+     of dependencies and returns a list of Dependency objects.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 19 Aug 2009 11:33:59 +0200
 
-python-apt (0.7.11.2) unstable; urgency=low
+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 ]
   * python/cache.cc:
@@ -29,6 +51,14 @@ python-apt (0.7.11.2) unstable; urgency=low
     - Allow to set the candidate of a package (Closes: #523997)
       + Support assignments to the 'candidate' property of Package objects.
       + Initial patch by Sebastian Heinlein
+    - Make comparisons of Version object more robust.
+    - Return VersionList objects in Package.versions, which are sequences
+      and also provide features of mappings. (partial API BREAK)
+      + Allows to get a specific version (Closes: #523998)
+  * apt/progress/__init__.py:
+    - Do not break out of InstallProgress.waitChild()'s loop just because it
+      is hitting EINTR, but only on child exit or on ECHILD.
+  * Use debhelper 7 instead of CDBS
 
   [ Stefano Zacchiroli ]
   * debian/python-apt.doc-base: register the documentation with the
@@ -36,7 +66,7 @@ python-apt (0.7.11.2) unstable; urgency=low
 
   [ Sebastian Heinlein ]
   * apt/progress.py: Extract the package name from the status message
-    (Closes: #532660) 
+    (Closes: #532660)
 
  -- Julian Andres Klode <jak@debian.org>  Thu, 30 Jul 2009 14:08:30 +0200
 
@@ -45,7 +75,7 @@ python-apt (0.7.11.1) unstable; urgency=low
   [ Stephan Peijnik ]
   * apt/progress/__init__.py:
     - Exception handling fixes in InstallProgress class.
-  
+
   [ Michael Vogt ]
   * python/tag.cc:
     - merge patch from John Wright that adds FindRaw method
@@ -60,15 +90,15 @@ python-apt (0.7.11.0) unstable; urgency=low
 
   [ Stephan Peijnik ]
   * apt/progress/__init__.py:
-    - add update_status_full() that takes file_size/partial_size as 
+    - add update_status_full() that takes file_size/partial_size as
       additional callback arguments
-    - add pulse_items() that takes a addtional "items" tuple that 
+    - add pulse_items() that takes a addtional "items" tuple that
       gives the user full access to the individual items that are
       fetched
   * python/progress.cc:
     - low level code for update_status_full and pulse_items()
     - better threading support
-  
+
   [ Michael Vogt ]
   * aptsources/distro.py:
     - fix indent error that causes incorrect sources.list additons
diff --git a/debian/compat b/debian/compat
index 7ed6ff82..7f8f011e 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 99f77927..180cc995 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,8 @@ Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.8.2
 XS-Python-Version: all
 Build-Depends: apt-utils,
-               cdbs,
-               debhelper (>= 5.0.37.1),
-               libapt-pkg-dev (>= 0.7.22~),
+               debhelper (>= 7.3.5),
+               libapt-pkg-dev (>= 0.7.21),
                python-all-dbg,
                python-all-dev,
 	       python2.4-dev,
@@ -17,9 +16,9 @@ Build-Depends: apt-utils,
                python-central (>= 0.5),
                python-debian,
                python-distutils-extra (>= 1.9.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
 
diff --git a/debian/python-apt-dbg.install b/debian/python-apt-dbg.install
new file mode 100644
index 00000000..1bbba721
--- /dev/null
+++ b/debian/python-apt-dbg.install
@@ -0,0 +1 @@
+usr/lib/python*/*/*_d.so
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index 6ba083f5..177b5837 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -1,4 +1,6 @@
 README
+AUTHORS
+TODO
 apt/README.apt
 data/templates/README.templates
 build/doc/html/
diff --git a/debian/python-apt.install b/debian/python-apt.install
index 4910e8ed..ca86ed11 100644
--- a/debian/python-apt.install
+++ b/debian/python-apt.install
@@ -1,3 +1,6 @@
-debian/tmp/usr/lib/python*
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/python-apt
+usr/lib/python*/*/apt_pkg.so
+usr/lib/python*/*/apt_inst.so
+usr/lib/python*/*/*/
+usr/lib/python*/*/*.egg-info
+usr/share/locale
+usr/share/python-apt
diff --git a/debian/rules b/debian/rules
index e9917843..4fcdc0c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,42 +1,20 @@
 #!/usr/bin/make -f
+export DH_PYCENTRAL=nomove
+export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+export CFLAGS=-Wno-write-strings
 
-DEB_AUTO_CLEANUP_RCS := yes
-DEB_PYTHON_SYSTEM=pycentral
+%:
+	dh --with python-central $@
 
-export DH_PYCENTRAL=include-links
-
-DEB_PYTHON_PACKAGES_EXCLUDE=python-apt-dbg
-
-# Add here any variable or target overrides you need
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-PKG=python-apt
-DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
-DEB_COMPRESS_EXCLUDE:=.html .js _static/* _sources/* _sources/*/* .inv
-DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
-export DEBVER
-
-build/python-apt-dbg::
-	set -e; \
-	for i in $(cdbs_python_build_versions); do \
-	  python$$i-dbg ./setup.py build; \
-	done
-
-install/python-apt-dbg::
-	for i in $(cdbs_python_build_versions); do \
-	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg --install-layout=deb; \
-	done
-	find debian/python-apt-dbg \
-		! -type d ! -name '*_d.so' | xargs rm -f
-	find debian/python-apt-dbg -depth -empty -exec rmdir {} \;
-
-binary-predeb/python-apt::
-	ln -sf ../../../../javascript/jquery/jquery.js debian/python-apt/usr/share/doc/python-apt/html/_static/jquery.js
-
-binary-predeb/python-apt-dbg::
+override_dh_installdocs:
+	dh_installdocs
+	ln -sf ../../../../javascript/jquery/jquery.js \
+	       debian/python-apt/usr/share/doc/python-apt/html/_static/jquery.js
 	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
 
-clean::
-	rm -rf build/lib* build/temp*
+override_dh_strip:
+	dh_strip --dbg-package=python-apt-dbg
+
+override_dh_compress:
+	dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv