Merge from trunk

buildd

@@ -72,8 +72,8 @@ if op not in ("retry", 'rescore') and options.architecture:
     print >> sys.stderr, "Operation %s does not use the --arch option." % op
     sys.exit(1)
 elif op in ("retry", "rescore") and options.architecture:
-    if options.architecture not in ("amd64", "hppa", "i386", "ia64", "lpia",
-            "powerpc", "sparc"):
+    if options.architecture not in ("armel", "amd64", "hppa", "i386", "ia64", 
+	        "lpia", "powerpc", "sparc"):
         print >> sys.stderr, "Invalid architecture specified: %s." % options.architecture
         sys.exit(1)
     else:
@@ -103,6 +103,7 @@ buildstats = {}
 page = urlopener.open('https://launchpad.net/ubuntu/+source/%s/%s' % (package, version))
 url = page.geturl()
 page = page.read()
+release = release.split('-')[0] # strip off pocket
 
 print "Current build status for this package is as follows:"
 

common.py

@@ -74,6 +74,7 @@ def checkReleaseExists(release):
         https://launchpad.net/ubuntu/releaseName page on Launchpad.
 
         If an error is returned; the release does not exist. """
+    release = release.split('-')[0] # remove pocket
     try:
         urllib2.urlopen("https://launchpad.net/ubuntu/%s" % release)
     except urllib2.HTTPError:
@@ -86,14 +87,18 @@ def checkSourceExists(package, release):
         https://launchpad.net/ubuntu/+source/package page.
         
         Return the page and version in release. """
+    if '-' in release:
+        (release, pocket) = release.split('-', 1)
+    else:
+        pocket = 'release'
     try:
         page = urllib2.urlopen('https://launchpad.net/ubuntu/+source/' + package).read()
 
-        m = re.search('"/ubuntu/%s/\+source/%s/(\d[^"]+)"' % (release,
-                package.replace('+', '\+')), page)
+        m = re.search('<td>%s</td>\s*\n.*"/ubuntu/%s/\+source/%s/(\d[^"]+)"' % (
+                pocket, release, package.replace('+', '\+')), page)
         if not m:
             print >> sys.stderr, "Unable to find source package '%s' in " \
-                "the %s release." % (package, release.capitalize())
+                "the %s-%s pocket." % (package, release.capitalize(), pocket)
             sys.exit(1)
 
     except urllib2.HTTPError, error: # Raised on 404.

dch-repeat

@@ -47,7 +47,7 @@ EOM
     exit(0);
 }
 
-my @releases = ('dapper', 'gutsy', 'hardy', 'intrepid','jaunty');
+my @releases = ('dapper', 'gutsy', 'hardy', 'intrepid', 'jaunty');
 
 #Getopt::Long::Configure("bundling", "no_ignore_case");
 our $opt_build_tree = "/scratch/ubuntu/build";

debian/changelog

@@ -1,4 +1,23 @@
-ubuntu-dev-tools (0.47) UNRELEASED; urgency=low
+ubuntu-dev-tools (0.49) jaunty; urgency=low
+
+  [ Sarah Hobbs ]
+  * Add armel as an arch to buildd
+
+  [ Adrien Cunin ]
+  * Added ${misc:Depends} to dependencies to make lintian quiet
+
+ -- Adrien Cunin <adri2000@ubuntu.com>  Sun, 30 Nov 2008 23:23:01 +0100
+
+ubuntu-dev-tools (0.48) jaunty; urgency=low
+
+  * common.py, checkReleaseExists() and checkSourceExists(): Add support for
+    specifying pockets (e. g. release name "intrepid-proposed").
+  * buildd: Strip off pocket from release name when parsing the builds page,
+    so that this script works for pockets, too.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 11 Nov 2008 10:15:25 +0100
+
+ubuntu-dev-tools (0.47) jaunty; urgency=low
 
   [ Kees Cook ]
   * dch-repeat: drop "feisty" from the list of known releases.
@@ -11,7 +30,11 @@ ubuntu-dev-tools (0.47) UNRELEASED; urgency=low
     giving the sponsorship warning, rather than appearing to hang.
 
   [ Michael Casadevall ]
-  * Fixed buildd rescore (tested by Sarah Hobbs)
+  * buildd: Fixed rescore (tested by Sarah Hobbs)
+  * submittodebian: Changed default tag to Jaunty
+  * pbuilder-dist: Added jaunty to ubuntu releases
+  * pull-lp-source: Made jaunty the default
+  * dch-repeat: Added jaunty
 
   [ Iain Lane ]
   * dch-repeat, pbuilder-dist, pull-lp-source: Add Jaunty to known releases

debian/control

@@ -15,7 +15,7 @@ Architecture: all
 Section: devel
 Depends: ${python:Depends}, binutils, devscripts, sudo, python-debian,
   python-launchpad-bugs (>= 0.2.25), dctrl-tools, lsb-release, diffstat,
-  dpkg-dev
+  dpkg-dev, ${misc:Depends}
 Recommends: bzr, pbuilder | sbuild, reportbug (>= 3.39ubuntu1),
   ca-certificates, genisoimage
 Conflicts: devscripts (<< 2.10.7ubuntu5)