* Merge from Debian 2.3 packaging branch: - New upstream release. * Return to using external python-configobj package for natty. * However for maverick and earlier, continue to drop the patching and stay with bzr's internal copy of configobj. * Add an empty python-bzrlib.tests transitional package for PPA builds. * Apply the patch 07_lazy_import_scope - ScopeReplacer exceptions are causing failure of some tests. * For lucid and earlier, loosen debhelper builddep version and remove --list-missing --fail-missing from dh_install. * For karmic and earlier, there is no python-meliae or python-lzma. * For jaunty and earlier, build-depend on quilt and use dh --with quilt. * For hardy, add preinst script to work around hardy's python-central failing to clean up after packages migrating away from python-central. * Add python-medusa, python-lzma and python-meliae as build dependencies (used by the test suite). * Remove John Ferlito from Uploaders. * Prefer cython as build dependency. * Remove generated C files during clean. * New upstream release. + Build depend on python-configobj >= 4.7.2+ds-2 which has a fix for bug #618349 which breaks the Bazaar testsuite. * Switch to dh_python2. * Switch to debhelper 7, drop cdbs.