merged from lp:~mvo/python-apt/mvo

12 files changed, 431 insertions, 43 deletions

diff --git a/debian/changelog b/debian/changelog
index 38aba67f..c01286f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,296 @@
+python-apt (0.7.94.3) UNRELEASED; urgency=low
+
+  [ Julian Andres Klode ]
+  * python/generic.cc:
+    - Fix a memory leak when using old attribute names.
+  * debian/control:
+    - Change priority to standard, keep -doc and -dev on optional.
+
+  [ Michael Vogt ]
+  * apt/cache.py:
+    - make cache open silent by default (use apt.progress.base.OpProgress)
+  
+ -- 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; 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>  Fri, 12 Mar 2010 14:36:48 +0100
+
+python-apt (0.7.94) unstable; urgency=low
+
+  * Move documentation into python-apt-doc (Closes: #572617)
+  * Build documentation only once on the default Python version.
+  * python/acquire-item.cc:
+    - Add AcquireItem.partialsize member.
+  * python/apt_pkgmodule.cc:
+    - Treat '>>' and '>', '<<' and '<' as identical in check_dep (LP: #535667).
+  * python/generic.cc:
+    - Map UntranslatedDepType to dep_type_untranslated.
+  * python/tag.cc:
+    - Hack the TagFile iterator to not use shared storage (Closes: #572596):
+      Scan once, duplicate the section data, and scan again.
+  * apt/package.py:
+    - Create a string class BaseDependency.__dstr which makes '>' equal to
+      '>>' and '<' equal to '<<' (compatibility).
+    - Use the binary package version in Version.fetch_source() if the
+      source version is not specified (i.e. in the normal case).
+    - Always return unicode strings in Package.get_changelog (Closes: #572998).
+  * apt/progress/text.py:
+    - Drop InstallProgress, it's useless to keep this alias around.
+  * apt/progress/old.py:
+    - Let the new method call the old one; e.g. status_update() now calls
+      self.statusUpdate(). This improves compatibility for sub classes.
+  * Merge with Ubuntu:
+    - util/get_ubuntu_mirrors_from_lp.py:
+      + rewritten to use +archivemirrors-rss and feedburner
+    - pre-build.sh: update ubuntu mirrors on bzr-buildpackage (and also do this
+      for Debian mirrors)
+    - add break for packagekit-backend-apt (<= 0.4.8-0ubuntu4)
+  * tests:
+    - test_deps: Add tests for apt_pkg.CheckDep, apt_pkg.check_dep,
+      apt_pkg.parse_depends and apt_pkg.parse_src_depends.
+  * tests/data/aptsources/sources.list.testDistribution:
+    - change one mirror which is not on the mirror list anymore.
+  * utils/get_debian_mirrors.py:
+    - Parse Mirrors.masterlist instead of the HTML web page.
+  * utils/get_ubuntu_mirrors_from_lp.py:
+    - Sort the mirror list of each country.
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 10 Mar 2010 16:10:27 +0100
+
+python-apt (0.7.93.3) unstable; urgency=low
+
+  * data/templates/Ubuntu.info.in:
+    - Use generic MirrorsFile key instead of per-architecture ones in
+      order to fix FTBFS on !amd64 !i386 (Closes: #571752)
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 27 Feb 2010 23:26:45 +0100
+
+python-apt (0.7.93.2) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * Fix some places where the old API was still used:
+    - apt/utils.py: Completely ported, previous one was old-API from Ubuntu.
+    - apt/cache.py: Use the new progress classes instead of the old ones.
+    - apt/package.py: Various smaller issues fixed, probably caused by merge.
+  * utils/migrate-0.8.py:
+    - Improve C++ parsing and add apt.progress.old to the modules, reduces
+      false positives.
+    - Ship the list of deprecated things in the apt_pkg and apt_inst modules
+      inside the script itself, so we don't have to parse the source code
+      anymore.
+  * python:
+    - Handle deprecated attributes and methods in the tp_gettattro slot, this
+      allows us to easily warn if a deprecated function is used.
+  * python/tagfile.cc:
+    - Implement the iterator protocol in TagFile.
+  * python/cache.cc:
+    - Implement Cache.__len__() and Cache.__contains__() (Closes: #571443).
+  * data/templates/Debian.info.in:
+    - Replace the MatchURI with one that really matches something.
+  * aptsources/distro.py:
+    - Call lsb_release with -idrc instead of --all.
+  * tests:
+    - Fix aptsources tests to use local data files if available.
+    - test_all.py: Use local modules instead of system ones if possible.
+  * data/templates/*.in: Switch MirrorsFile to relative filenames.
+    - setup.py: Copy the mirror lists to the build directory
+    - aptsources/distinfo.py: Support relative filenames for MirrorsFile.
+  * debian/rules:
+    - Run tests during build time.
+  * debian/python-apt.install:
+    - Install utils/migrate-0.8.py to /usr/share/python-apt/.
+  
+  [ Michael Vogt ]
+  * apt/cache.py:
+    - call install_progress.startUpdate()/finishUpdate() to keep
+      compatibility with older code
+  * apt/progress/base.py:
+    - restore "self.statusfd, self.writefd" type, provide additional
+      self.status_stream and self.write_stream file like objects
+  * python/progress.cc:
+    - try to call compatibility functions first, then new functions
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 27 Feb 2010 18:33:11 +0100
+
+python-apt (0.7.93.1) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * Fix reference counting for old progress classes (Closes: #566370).
+  * apt/cache.py:
+    - Fix Cache.update() to not raise errors on successful updates.
+  * python/progress.cc:
+    - Fix some threading issues (add some missing PyCbObj_BEGIN_ALLOW_THREADS)
+  * python/acquire-item.cc:
+    - Support items without an owner set.
+  * python/tarfile.cc:
+    - When extracting, only allocate a new buffer if the old one was too small.
+    - Do not segfault if TarFile.go() is called without a member name.
+    - Clone all pkgDirStream::Item's so apt_pkg.TarMember object can be used
+      outside of the callback function passed to go().
+    - If only one member is requested, extract just that one.
+  * Drop the segfault prevention measures from the Acquire code, as they fail
+    to work. A replacement will be added once destruction callbacks are added
+    in APT.
+  * Merge the CppOwnedPyObject C++ class into CppPyObject.
+  * Remove inline functions from the C++ API, export them instead.
+  * Localization
+    - de.po: Update against new template
+  * python/arfile.cc:
+    - Handle the case where ararchive_new returns NULL in debfile_new.
+  * apt/progress/base.py:
+    - select.error objects do not have an errno attribute (Closes: #568005)
+  * doc/client-example.cc: Update against the new API.
+  * Fix typos of separated in multiple files (reported by lintian).
+  * debian/control:
+    - Make python-apt-dev depend on ${misc:Depends} and recommend python-dev.
+    - Set Standards-Version to 3.8.4.
+
+  [ Michael Vogt ]
+  * apt/utils.py:
+    - add some misc utils like get_release_filename_for_pkg()
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 05 Feb 2010 17:45:39 +0100
+
+python-apt (0.7.93) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * Merge debian-sid and debian-experimental.
+  * Add a tutorial on how to do things which are possible with apt-get,
+    like apt-get --print-uris update (cf. #551164).
+  * Build for Python 2.5, 2.6 and 3.1; 2.6 and 3.1 hit unstable on Jan 16.
+    - Use DH_PYCENTRAL=nomove for now because include-links seems broken
+  * Merge lp:~forest-bond/python-apt/cache-is-virtual-package-catch-key-error
+    - Return False in Cache.is_virtual_package if the package does not exist.
+  * Make all class-level constants have uppercase names.
+  * Rewrite apt.progress.gtk2 documentation by hand and drop python-gtk2
+    build-time dependency.
+  * aptsources:
+    - Make all classes subclasses of object.
+    - distro.py: Support Python 3, decode lsb_release results using utf-8.
+  * apt/progress/base.py:
+    - Fix some parsing of dpkg status fd.
+  * apt/progress/text.py:
+    - Replace one print statement with a .write() call.
+  * Rename apt_pkg.PackageIndexFile to apt_pkg.IndexFile.
+
+  [ Colin Watson ]
+  * apt/progress/__init__.py:
+    - Fix InstallProgress.updateInterface() to cope with read() returning 0
+      on non-blocking file descriptors (LP: #491027).
+  
+  [ Michael Vogt ]
+  * apt/cache.py: 
+    - improved docstring for the cache
+    - add "enhances" property
+  * data/templates/Ubuntu.info.in:
+    - add lucid
+  * python/cache.cc:
+    - add UntranslatedDepType attribute to DependencyType
+    - add DepTypeEnum that returns a value from 
+      {DepDepends, DepPreDepends, ...}
+  * python/apt_pkgmodule.cc:
+    - add DepDpkgBreaks, DepEnhances constants
+  * doc/source/apt_pkg/{cache.rst, index.rst}:
+    - update documentation as well
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 20 Jan 2010 17:06:20 +0100
+
+python-apt (0.7.92) experimental; urgency=low
+
+  * New features:
+    - Provide a C++ API in the package python-apt-dev (Closes: #334923).
+    - Add apt_pkg.HashString and apt_pkg.IndexRecords (Closes: #456141).
+    - Add apt_pkg.Policy class (Closes: #382725).
+    - Add apt_pkg.Hashes class.
+    - Allow types providing __new__() to be subclassed.
+    - Add apt_pkg.DepCache.mark_auto() and apt.Package.mark_auto() methods to
+      mark a package as automatically installed.
+    - Make AcquireFile a subclass of AcquireItem, thus inheriting attributes.
+    - New progress handling in apt.progress.base and apt.progress.text. Still
+      missing Qt4 progress handlers.
+    - Classes in apt_inst (Closes: #536096)
+      + You can now use apt_inst.DebFile.data to access the data.tar.* member
+        regardless of its compression (LP: #44493)
+
+  * Unification of dependency handling:
+    - apt_pkg.parse_[src_]depends() now use CompType instead of CompTypeDeb
+      (i.e. < instead of <<) to match the interface of Version.depends_list_str
+    - apt_pkg.SourceRecords.build_depends matches exactly the interface of
+      Version.depends_list_str just with different keys (e.g. Build-Depends).
+      + Closes: #468123 - there is no need anymore for binding CompType or
+        CompTypeDeb, because we don't return integer values for CompType
+        anymore.
+
+  * Bugfixes:
+    - Delete pointers correctly, fixing memory leaks (LP: #370149).
+    - Drop open() and close() in apt_pkg.Cache as they cause segfaults.
+    - Raise ValueError in AcquireItem if the Acquire process is shut down
+      instead of segfaulting.
+
+  * Other stuff:
+    - 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.
+    - Only recommend lsb-release instead of depending on it. Default to
+      Debian unstable if lsb_release is not available.
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 18 Aug 2009 16:42:56 +0200
+
+python-apt (0.7.91) experimental; urgency=low
+
+  [ Julian Andres Klode ]
+  * Rename where needed according to PEP 8 conventions (Closes: #481061)
+  * Where possible, derive apt.package.Record from collections.Mapping.
+  * ActionGroups can be used as a context manager for the 'with' statement.
+  * utils/migrate-0.8.py: Helper to check Python code for deprecated functions,
+    attributes,etc. Has to be run from the python-apt source tree, but can be
+    used for all Python code using python-apt.
+  * debian/control: Only recommend libjs-jquery (Closes: #527543).
+
+  [ Stefano Zacchiroli ]
+  * debian/python-apt.doc-base: register the documentation with the
+    doc-base system (Closes: #525134)
+
+  [ Sebastian Heinlein ]
+  * apt/package.py: Add Package.get_version() which returns a Version instance
+    for the given version string or None (Closes: #523998)
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 05 Jun 2009 19:36:45 +0200
+
+python-apt (0.7.90) experimental; urgency=low
+
+  * Introduce support for Python 3 (Closes: #523645)
+
+  * Support the 'in' operator (e.g. "k in d") in Configuration{,Ptr,Sub}
+    objects (e.g. apt_pkg.Config) and in TagSections (apt_pkg.ParseSection())
+  * Replace support for file objects with a more generic support for any object
+    providing a fileno() method and for file descriptors (integers).
+  * Add support for the Breaks fields
+  * Only create Package objects when they are requested, do not keep them in
+    a dict. Saves 10MB for 25,000 packages on my machine.
+  * apt/package.py: Allow to set the candidate of a package (Closes: #523997)
+    - Support assignments to the 'candidate' property of Package objects.
+    - Initial patch by Sebastian Heinlein
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 15 Apr 2009 13:47:42 +0200
+
 python-apt (0.7.13.4ubuntu5) lucid; urgency=low
 
   [ Michael Vogt ]
@@ -386,6 +679,17 @@ python-apt (0.7.10.2) unstable; urgency=low
 
  -- Julian Andres Klode <jak@debian.org>  Sun, 12 Apr 2009 19:00:07 +0200
 
+python-apt (0.7.10.1) unstable; urgency=low
+
+  * Fix FTBFS with python-debian (>= 0.1.13) on Python 2.4 by not using it to
+    get a version number in setup.py (Closes: #523473)
+  * apt/package.py:
+    - (Package.candidateRecord): Fix missing 'd' in 'record'
+    - (DeprecatedProperty.__get__): Only warn when used on objects, this
+      makes it easier to use e.g. pydoc,sphinx,pychecker.
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 10 Apr 2009 17:51:07 +0200
+
 python-apt (0.7.10) unstable; urgency=low
 
   * Build-Depend on python-debian, use it to get version number from changelog
@@ -589,6 +893,41 @@ python-apt (0.7.9~exp2) experimental; urgency=low
 
  -- Julian Andres Klode <jak@debian.org>  Sun, 11 Jan 2009 20:01:59 +0100
 
+python-apt (0.7.9~exp1) experimental; urgency=low
+
+  * Merged python-apt consolidation branch by Sebastian
+    Heinlein (many thanks)
+  * apt/cache.py:
+    - new method "isVirtualPackage()"
+    - new method "getProvidingPackages()"
+    - new method "getRequiredDownload()"
+    - new method "additionalRequiredSpace()"
+  * apt/debfile.py:
+    - move a lot of the gdebi code into this file, this
+      provides interfaces for querrying and installing
+      .deb files and .dsc files
+  * apt/package.py:
+    - better description parsing
+    - new method "installedFiles()"
+    - new method "getChangelog()"
+  * apt/gtk/widgets.py:
+    - new gobject GOpProgress
+    - new gobject GFetchProgress
+    - new gobject GInstallProgress
+    - new gobject GDpkgInstallProgress
+    - new widget GtkAptProgress
+  * doc/examples/gui-inst.py:
+    - updated to use the new widgets
+  * debian/control:
+    - add suggests for python-gtk2 and python-vte
+  * setup.py:
+    - build html/ help of the apt and aptsources modules
+      into /usr/share/doc/python-apt/html
+  * apt/__init__.py:
+    - remove the future warning
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 15 Dec 2008 14:29:47 +0100
+
 python-apt (0.7.8ubuntu1) jaunty; urgency=low
 
   * Merged python-apt consolidation branch by Sebastian
@@ -688,6 +1027,14 @@ python-apt (0.7.8~ubuntu1) jaunty; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 03 Nov 2008 11:46:54 +0100
 
+python-apt (0.7.7.1+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * data/templates/Debian.info.in: Set the BaseURI to security.debian.org for
+    lenny/updates, etch/updates and sarge/updates. (Closes: #503237)
+
+ -- Jonny Lamb <jonny@debian.org>  Fri, 24 Oct 2008 12:44:33 +0100
+
 python-apt (0.7.7.1ubuntu4) intrepid; urgency=low
 
   * apt/package.py:
@@ -728,6 +1075,15 @@ python-apt (0.7.7.1ubuntu1) intrepid; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 30 Jul 2008 10:26:53 +0200
 
+python-apt (0.7.7.1) unstable; urgency=low
+
+  * data/templates/Debian.info.in:
+    - add 'lenny' template info (closes: #476364)
+  * aptsources/distinfo.py:
+    - fix template matching for arch specific code (LP: #244093)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Jul 2008 18:34:28 +0200
+
 python-apt (0.7.7ubuntu2) intrepid; urgency=low
 
   * python/metaindex.cc
@@ -745,23 +1101,6 @@ python-apt (0.7.7ubuntu2) intrepid; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Mon, 24 Nov 2008 10:24:30 +0200
 
-python-apt (0.7.7.1+nmu1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * data/templates/Debian.info.in: Set the BaseURI to security.debian.org for
-    lenny/updates, etch/updates and sarge/updates. (Closes: #503237)
-
- -- Jonny Lamb <jonny@debian.org>  Fri, 24 Oct 2008 12:44:33 +0100
-
-python-apt (0.7.7.1) unstable; urgency=low
-
-  * data/templates/Debian.info.in:
-    - add 'lenny' template info (closes: #476364)
-  * aptsources/distinfo.py:
-    - fix template matching for arch specific code (LP: #244093)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Jul 2008 18:34:28 +0200
-
 python-apt (0.7.7ubuntu1) intrepid; urgency=low
 
   * merged from debian-sid
diff --git a/debian/control b/debian/control
index 1bd55d2a..904dff0a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,29 @@
 Source: python-apt
 Section: python
-Priority: optional
+Priority: standard
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.8.3
-XS-Python-Version: all
+Standards-Version: 3.8.4
+XS-Python-Version: 2.5, 2.6, 3.1
 Build-Depends: apt-utils,
                debhelper (>= 7.3.5),
-               libapt-pkg-dev (>= 0.7.21),
+               libapt-pkg-dev (>= 0.7.22~),
                python-all-dbg,
                python-all-dev,
                python-central (>= 0.5),
-               python-debian,
-               python-distutils-extra (>= 1.9.0),
-               python-gtk2 [!kfreebsd-amd64 !kfreebsd-i386],
-               python-sphinx (>= 0.5),
-               python-vte [!kfreebsd-amd64 !kfreebsd-i386]
+               python-distutils-extra (>= 2.0),
+               python-sphinx (>= 0.5)
 Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
 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}, lsb-release
-Recommends: iso-codes, libjs-jquery
+Recommends: iso-codes
 Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4)
 Provides: ${python:Provides}
-Suggests: python-apt-dbg, python-gtk2, python-vte
+Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc
 XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
  The apt_pkg Python interface will provide full access to the internal
@@ -41,15 +38,44 @@ Description: Python interface to libapt-pkg
  The included 'aptsources' Python interface provides an abstraction of
  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}
+Enhances: python-apt
+Replaces: python-apt (<< 0.7.94)
+Description: Python interface to libapt-pkg (API documentation)
+ The apt_pkg Python interface will provide full access to the internal
+ libapt-pkg structures allowing Python programs to easily perform a
+ variety of functions.
+ .
+ This package contains the API documentation of python-apt.
+
 Package: python-apt-dbg
 Priority: extra
 Architecture: any
 Section: debug
 Depends: python-dbg, python-apt (= ${binary:Version}), ${shlibs:Depends},
          ${misc:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg (debug extension)
  The apt_pkg Python interface will provide full access to the internal
  libapt-pkg structures allowing Python programs to easily perform a
  variety of functions.
  .
  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}
+Recommends: python-dev
+Description: Python interface to libapt-pkg (development files)
+ The apt_pkg Python interface will provide full access to the internal
+ libapt-pkg structures allowing Python programs to easily perform a
+ variety of functions.
+ .
+ This package contains the header files needed to use python-apt objects from
+ C++ applications.
diff --git a/debian/copyright b/debian/copyright
index 8599328a..2df6807a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,17 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=443
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=59
 
 Files: *
 Copyright: © 2004-2009 Canonical Ltd.
+           © 2009 Julian Andres Klode <jak@debian.org>
 License: GPL-2+
 
+Files: tests/test_all.py, tests/test_hashes.py, utils/doclint.py
+Copyright: © 2009 Julian Andres Klode <jak@debian.org>
+License:
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved.
+
 Files: aptsources/*.py
 Copyright: © 2004-2009 Canonical Ltd.
 Copyright: © 2005 Gustavo Noronha Silva
diff --git a/debian/python-apt-dev.examples b/debian/python-apt-dev.examples
new file mode 100644
index 00000000..39f7bf97
--- /dev/null
+++ b/debian/python-apt-dev.examples
@@ -0,0 +1 @@
+doc/client-example.cc
diff --git a/debian/python-apt-dev.install b/debian/python-apt-dev.install
new file mode 100644
index 00000000..2a1405fd
--- /dev/null
+++ b/debian/python-apt-dev.install
@@ -0,0 +1,2 @@
+python/python-apt.h usr/include/python-apt/
+python/generic.h usr/include/python-apt/
diff --git a/debian/python-apt.doc-base b/debian/python-apt-doc.doc-base
index d25926b7..4f3c4d31 100644
--- a/debian/python-apt.doc-base
+++ b/debian/python-apt-doc.doc-base
@@ -4,8 +4,5 @@ Abstract: API reference manual for Python bindings to libapt-pkg
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-apt/html/index.html
-Files: /usr/share/doc/python-apt/html/*
-
-Format: Text
-Files: /usr/share/doc/python-apt/text/*
+Index: /usr/share/doc/python-apt-doc/html/index.html
+Files: /usr/share/doc/python-apt-doc/html/*
diff --git a/debian/python-apt-doc.docs b/debian/python-apt-doc.docs
new file mode 100644
index 00000000..f85adafd
--- /dev/null
+++ b/debian/python-apt-doc.docs
@@ -0,0 +1 @@
+build/sphinx/html/
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/python-apt-doc.links b/debian/python-apt-doc.links
new file mode 100644
index 00000000..40f834f2
--- /dev/null
+++ b/debian/python-apt-doc.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python-apt-doc/html/_static/jquery.js
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index 177b5837..a53a1ccc 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -3,5 +3,3 @@ AUTHORS
 TODO
 apt/README.apt
 data/templates/README.templates
-build/doc/html/
-build/doc/text/
diff --git a/debian/python-apt.install b/debian/python-apt.install
index ca86ed11..29028531 100644
--- a/debian/python-apt.install
+++ b/debian/python-apt.install
@@ -4,3 +4,5 @@ usr/lib/python*/*/*/
 usr/lib/python*/*/*.egg-info
 usr/share/locale
 usr/share/python-apt
+# Install the migration helper
+utils/migrate-0.8.py usr/share/python-apt
diff --git a/debian/rules b/debian/rules
index 08705a86..cc1cabee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,33 @@
 #!/usr/bin/make -f
-export DH_PYCENTRAL=include-links
+# Should be include-links, but that somehow fails.
+export DH_PYCENTRAL=nomove
 export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-export CFLAGS=-Wno-write-strings
+export CFLAGS=-Wno-write-strings -DCOMPAT_0_7
 
 %:
 	dh --with python-central $@
 
+override_dh_auto_build:
+	dh_auto_build
+
 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
+	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
 
 override_dh_compress:
 	dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv
+
+override_dh_auto_test:
+	set -e; for python in $(shell pyversions -r); do \
+		$$python tests/test_all.py -q; \
+	done;
+
+override_dh_pycentral:
+	dh_pycentral --exclude=migrate-0.8.py