* merged from the debian/sid bzr branch

* Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512)

* python/arfile.cc:
  - use APT::Configuration::getCompressionTypes() instead of duplicating
    the supported methods here
* tests/test_debfile.py:
  - add test for raise on unknown data.tar.xxx
* tests/test_aptsources_ports.py, tests/test_aptsources.py:
  - use tmpdir during the tests to fix test failure with apt from
    experimental
* Upload to unstable
* Increase Breaks for update-notifier to 0.99.3debian9
* utils/get_debian_mirrors.py: Adjust for new Alioth SCM urls
* debian/control: Standards-Version 3.9.2
* Fix Lintian overrides
* Fix spelling errors reported by Lintian (sep[a->e]rated, overrid[d]en)
* po/urd.po: Remove, ur.po is the correct file
* debian/source/format: Add, set it to "3.0 (native)"
* Fix get_changelog in Python 3 (Closes: #626532)
* apt/package.py: fix a few typos [formated->formatted] (Closes: #597054)
* doc/source/tutorials/contributing.rst: minor improvements (Closes: #625225)
  - one typo [2to => 2to3], one broken link [pep8.py link]
* Esperanto (Closes: #626430)

5 files changed, 82 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 48ef958d..02fb2a9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+python-apt (0.8.1ubuntu1) UNRELEASED; urgency=low
+
+  * merged from the debian/sid bzr branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 01 Aug 2011 09:29:06 +0200
+
+python-apt (0.8.1) UNRELEASED; urgency=low
+
+  [ Julian Andres Klode ]
+  * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512)
+  
+  [ Michael Vogt ]
+  * python/arfile.cc:
+    - use APT::Configuration::getCompressionTypes() instead of duplicating
+      the supported methods here
+  * tests/test_debfile.py:
+    - add test for raise on unknown data.tar.xxx
+  * tests/test_aptsources_ports.py, tests/test_aptsources.py:
+    - use tmpdir during the tests to fix test failure with apt from
+      experimental
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 07 Jun 2011 14:00:22 +0200
+
+python-apt (0.8.0) unstable; urgency=low
+
+  * Upload to unstable
+
+  [ Julian Andres Klode ]
+  * Increase Breaks for update-notifier to 0.99.3debian9
+  * utils/get_debian_mirrors.py: Adjust for new Alioth SCM urls
+  * debian/control: Standards-Version 3.9.2
+  * Fix Lintian overrides
+  * Fix spelling errors reported by Lintian (sep[a->e]rated, overrid[d]en)
+  * po/urd.po: Remove, ur.po is the correct file
+  * debian/source/format: Add, set it to "3.0 (native)"
+
+  [ Tshepang Lekhonkhobe ]
+  * Fix get_changelog in Python 3 (Closes: #626532)
+  * apt/package.py: fix a few typos [formated->formatted] (Closes: #597054)
+  * doc/source/tutorials/contributing.rst: minor improvements (Closes: #625225)
+    - one typo [2to => 2to3], one broken link [pep8.py link]
+
+  [ Translation updates ]
+  * Esperanto (Closes: #626430)
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 27 May 2011 16:12:46 +0200
+
 python-apt (0.8.0~exp4ubuntu2) UNRELEASED; urgency=low
 
   * add missing bits for the xz compression support for the 
diff --git a/debian/control b/debian/control
index 8969af63..2945e1b3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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.9.1
+Standards-Version: 3.9.2
 XS-Python-Version: >= 2.6
 X-Python3-Version: >= 3.1
 Build-Depends: apt-utils,
@@ -23,8 +23,36 @@ XS-Debian-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-si
 Package: python-apt
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
-Recommends: lsb-release, iso-codes
-Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4)
+Recommends: lsb-release, iso-codes, python2.6
+Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4),
+        computer-janitor (<< 1.14.1-1+),
+        debdelta (<< 0.41+),
+        python-dogtail (<< 0.6.1-3.1+),
+        python-debian (<< 0.1.18+),
+        python-software-properties (<< 0.70.debian-1+),
+        aptdaemon (<< 0.11+bzr343-1~),
+        apt-forktracer (<< 0.3),
+        apt-listchanges (<< 2.85),
+        aptoncd (<< 0.1.98+bzr117),
+        apt-p2p (<< 0.1.6),
+        apt-xapian-index (<< 0.25),
+        bcfg2 (<< 1.0.1),
+        bzr-builddeb (<< 2.4),
+        debpartial-mirror (<< 0.2.98),
+        debsecan (<< 0.4.15),
+        gdebi (<< 0.6.1),
+        germinate (<< 1.21),
+        gnome-codec-install (<< 0.4.5),
+        mini-dinstall (<< 0.6.28),
+        python-cdd (<< 0.0.10),
+        rebuildd (<< 0.3.9),
+        software-center (<< 1.1.21debian2),
+        tla-buildpackage (<< 0.9.14),
+        ubuntu-dev-tools (<< 0.93debian1),
+        unattended-upgrades (<< 0.42debian2),
+        update-manager (<< 0.200.2-1),
+        update-notifier (<< 0.99.3debian9),
+        wajig (<< 2.0.46)
 Provides: ${python:Provides}
 Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc
 XB-Python-Version: ${python:Versions}
diff --git a/debian/python-apt-common.lintian-overrides b/debian/python-apt-common.lintian-overrides
index 3ae30560..f0eddf6b 100644
--- a/debian/python-apt-common.lintian-overrides
+++ b/debian/python-apt-common.lintian-overrides
@@ -1,2 +1,2 @@
 # package depends on python | python3
-python-script-but-no-python-dep ./usr/share/python-apt/migrate-0.8.py
+python-script-but-no-python-dep usr/share/python-apt/migrate-0.8.py
diff --git a/debian/rules b/debian/rules
index a85d1eb2..5f1132f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 # Should be include-links, but that somehow fails.
 export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+
 export CFLAGS=-Wno-write-strings -DCOMPAT_0_7
+
 export PATH := $(CURDIR)/utils:$(PATH)
 export pyversions := $(CURDIR)/utils/pyversions
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..89ae9db8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)