merged from lp:~vorlon/python-apt/pre-release-py3

4 files changed, 138 insertions, 7 deletions

diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index 3a9562f4..2aba269e 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -1,5 +1,123 @@
 _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
+Suite: quantal
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 12.04 'Precise Pangolin'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: quantal
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 12.04 'Precise Pangolin'
+
+Suite: quantal
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*12.04
+MatchURI: cdrom:\[Ubuntu.*12.04
+_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: quantal
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: quantal
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: quantal-security
+ParentSuite: quantal
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: quantal-security
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: quantal-updates
+ParentSuite: quantal
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: quantal-updates
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: quantal-proposed
+ParentSuite: quantal
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: quantal-proposed
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: quantal-backports
+ParentSuite: quantal
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: quantal-backports
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
 Suite: precise
 RepositoryType: deb
 BaseURI: http://ports.ubuntu.com/ubuntu-ports/
diff --git a/debian/changelog b/debian/changelog
index 8d8be6a6..1466ad7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,21 @@
 python-apt (0.8.5) UNRELEASED; urgency=low
 
+  [ Michael Vogt ]
   * python/cache.cc:
     - ensure that pkgApplyStatus is called when the cache is opened
       (thanks to Sebastian Heinlein for finding this bug), LP: #659438
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 17 Apr 2012 14:09:24 +0200
+  [ Stéphane Graber ]
+  * data/templates/Ubuntu.info.in:
+    - add quantal
+  
+  [ Steve Langasek ]
+  * utils/get_ubuntu_mirrors_from_lp.py: move this script to python3
+  * pre-build.sh: call dpkg-checkbuilddeps with the list of our 
+    source-build-dependencies; this may save someone else an hour down the
+    line scratching their head over gratuitous test-suite failures...
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 17 Apr 2012 14:09:24 +0200
 
 python-apt (0.8.4) unstable; urgency=low
 
diff --git a/pre-build.sh b/pre-build.sh
index 026a491e..08c0bef6 100755
--- a/pre-build.sh
+++ b/pre-build.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+set -e
+
+dpkg-checkbuilddeps -d 'python-debian, python3-feedparser'
 
 echo "updating Ubuntu mirror list from launchpad"
 if [ -n "$https_proxy" ]; then
diff --git a/utils/get_ubuntu_mirrors_from_lp.py b/utils/get_ubuntu_mirrors_from_lp.py
index ed0ee936..7c4d3831 100755
--- a/utils/get_ubuntu_mirrors_from_lp.py
+++ b/utils/get_ubuntu_mirrors_from_lp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #  get_ubuntu_lp_mirrors.py
 #
@@ -40,9 +40,8 @@ for entry in d.entries:
         countries[countrycode].add(link.href)
 
 
-keys = countries.keys()
-keys.sort()
-print "mirror://mirrors.ubuntu.com/mirrors.txt"
+keys = sorted(countries)
+print("mirror://mirrors.ubuntu.com/mirrors.txt")
 for country in keys:
-    print "#LOC:%s" % country
-    print "\n".join(sorted(countries[country]))
+    print("#LOC:%s" % country)
+    print("\n".join(sorted(countries[country])))