Fix conflicts with Ubuntu branch

3 files changed, 17 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 6117d1aa..03472eae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-apt (0.8.3ubuntu9) UNRELEASED; urgency=low
+
+  * 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...
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 11 Jun 2012 13:48:06 -0700
+
 python-apt (0.8.3ubuntu8) quantal; urgency=low
 
   * data/templates/Ubuntu.info.in:
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..5f9325e4 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.keys())
+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])))