Merge lp:~andrewsomething/bzr-builddeb/lp876888 into lp:bzr-builddeb

[Andrew Starr-Bochicchio]

Use python-distro-info to get list of all Debain and Ubuntu releases.

I would have liked to have gotten rid of the suite_to_distribution function and just use python-distro-info directly, but it doesn't seem to understand '-proposed', '-updates', '-security', '-backports', ect.

>>> UbuntuDistroInfo().valid('natty-updates')
False
>>> UbuntuDistroInfo().valid('natty')
True

This at least makes it so new Ubuntu releases don't have to be manually added every six months.

All tests for util.py pass, but there are some seemingly unrelated failures.

[James Westby (james-w)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2011-07-26 13:11:08 +0000
+++ debian/control	2011-10-28 16:44:34 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Bazaar Maintainers <[e-mail]>
 Uploaders: Reinhard Tartler <[e-mail]>, James Westby <[e-mail]>, Jelmer Vernooij <[e-mail]>
 Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.6.6-3)
-Build-Depends-Indep: bzr (>= 2.1~), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts (>= 2.10.59), python-subunit, python-bzrlib.tests | bzr (<< 2.4.0~beta1-2), python-lzma, libalgorithm-merge-perl
+Build-Depends-Indep: bzr (>= 2.1~), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts (>= 2.10.59), python-subunit, python-bzrlib.tests | bzr (<< 2.4.0~beta1-2), python-lzma, libalgorithm-merge-perl, python-distro-info
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
 X-Python-Version: >= 2.4
@@ -12,7 +12,7 @@
 
 Package: bzr-builddeb
 Architecture: all
-Depends: bzr (>= 2.1~), python-debian (>= 0.1.11), python-apt, ${python:Depends}, dpkg-dev, fakeroot, devscripts (>= 2.10.59), patchutils, pristine-tar, ${misc:Depends}
+Depends: bzr (>= 2.1~), python-debian (>= 0.1.11), python-apt, ${python:Depends}, dpkg-dev, fakeroot, devscripts (>= 2.10.59), patchutils, pristine-tar, ${misc:Depends}, python-distro-info
 Recommends: python-launchpadlib, libalgorithm-merge-perl
 Suggests: bzr-svn (>= 0.4.10), python-lzma
 Provides: bzr-buildpackage

=== modified file 'util.py'
--- util.py	2011-10-11 23:41:58 +0000
+++ util.py	2011-10-28 16:44:34 +0000
@@ -29,6 +29,8 @@
 import os
 import re
 
+from distro_info import DebianDistroInfo, UbuntuDistroInfo
+
 from bzrlib.trace import mutter
 
 try:
@@ -75,12 +77,10 @@
     )
 
 
-DEBIAN_RELEASES = ('woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
-        'stable', 'testing', 'unstable', 'experimental', 'frozen', 'sid')
+DEBIAN_RELEASES = DebianDistroInfo().all
+DEBIAN_RELEASES.extend(['stable', 'testing', 'unstable', 'frozen'])
 DEBIAN_POCKETS = ('', '-security', '-proposed-updates', '-backports')
-UBUNTU_RELEASES = ('warty', 'hoary', 'breezy', 'dapper', 'edgy',
-        'feisty', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic',
-        'lucid', 'maverick', 'natty', "oneiric")
+UBUNTU_RELEASES = UbuntuDistroInfo().all
 UBUNTU_POCKETS = ('', '-proposed', '-updates', '-security', '-backports')