From 772d40b9396b535d0e6147cf9885e6d052d67046 Mon Sep 17 00:00:00 2001
From: Jonathan Patrick Davies <jpds@ubuntu.com>
Date: Mon, 1 Sep 2008 11:41:19 +0100
Subject: [PATCH] * debian/control:    - Improved description.    - Wrapped
 Depends line and bumped debhelper build-dependency version to 6. *
 debian/compat: Changed to 6. * Moved https_proxy dropping code to common.py.

---
 buildd           |  9 +--------
 common.py        |  6 ++++++
 debian/changelog |  8 ++++++++
 debian/compat    |  2 +-
 debian/control   | 14 +++++++++-----
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/buildd b/buildd
index e670764..c98edfe 100755
--- a/buildd
+++ b/buildd
@@ -29,7 +29,7 @@ from optparse import OptionGroup
 from optparse import OptionParser
 from urllib import urlencode
 
-sys.path.append('/usr/share/ubuntu-dev-tools/')
+sys.path.append("/usr/share/ubuntu-dev-tools/")
 import common
 
 # Usage.
@@ -81,18 +81,11 @@ elif op in ("retry", "rescore") and options.architecture:
 else:
     oneArch = False
 
-# Clear https_proxy env var as it's not supported in urllib/urllib2; see
-# LP #122551
-if os.environ.has_key('https_proxy'):
-    print >> sys.stderr, "Ignoring https_proxy (no support in urllib/urllib2; see LP #122551)"
-    del os.environ['https_proxy']
-
 # Prepare Launchpad cookie.
 launchpadCookie = common.prepareLaunchpadCookie()
 urlopener = common.setupLaunchpadUrlOpener(launchpadCookie)
 
 # Check the release exists.
-# Check release by checking if Launchpad page exists
 common.checkReleaseExists(release)
 
 # Find out the version in given release.
diff --git a/common.py b/common.py
index 5f0b6ec..732c919 100644
--- a/common.py
+++ b/common.py
@@ -32,6 +32,12 @@ import subprocess
 import sys
 import urllib2
 
+# Clear https_proxy env var as it's not supported in urllib/urllib2; see
+# LP #122551
+if os.environ.has_key('https_proxy'):
+    print >> sys.stderr, "Ignoring https_proxy (no support in urllib/urllib2; see LP #122551)"
+    del os.environ['https_proxy']
+
 def mkdir(directory):
     """ Create the given directory and all its parents recursively, but don't
         raise an exception if it already exists. """
diff --git a/debian/changelog b/debian/changelog
index f6518fc..f9d9e93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
 ubuntu-dev-tools (0.43ubuntu2) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Fix a number of minor glitches in manual pages.
 
+  [ Jonathan Patrick Davies ]
+  * debian/control:
+    - Improved description.
+    - Wrapped Depends line and bumped debhelper build-dependency version to 6.
+  * debian/compat: Changed to 6.
+  * Moved https_proxy dropping code to common.py.
+
  -- Colin Watson <cjwatson@ubuntu.com>  Mon, 01 Sep 2008 09:48:38 +0100
 
 ubuntu-dev-tools (0.43ubuntu1) intrepid; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+6
diff --git a/debian/control b/debian/control
index 0512eb3..79469fb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-dev/ubuntu-dev-tools/trunk
 Vcs-Browser: http://codebrowse.launchpad.net/~ubuntu-dev/ubuntu-dev-tools/trunk/changes
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5), python-all-dev (>= 2.4)
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), python-all-dev (>= 2.4)
 Build-Depends-Indep: python-central (>= 0.5)
 XS-Python-Version: >= 2.5
 Homepage: https://launchpad.net/ubuntu-dev-tools/
@@ -13,13 +13,17 @@ Standards-Version: 3.8.0
 Package: ubuntu-dev-tools
 Architecture: all
 Section: devel
-Depends: ${python:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.25), python-debian, dctrl-tools, lsb-release, diffstat, dpkg-dev
+Depends: ${python:Depends}, binutils, devscripts, sudo, python-debian,
+  python-launchpad-bugs (>= 0.2.25), dctrl-tools, lsb-release, diffstat,
+  dpkg-dev
 Recommends: bzr, pbuilder | sbuild, reportbug (>= 3.39ubuntu1),
   ca-certificates
 Conflicts: devscripts (<< 2.10.7ubuntu5)
 Replaces: devscripts (<< 2.10.7ubuntu5)
 XB-Python-Version: ${python:Versions}
 Description: useful tools for Ubuntu developers
- This is a collection of useful tools that Ubuntu developers use to
- make their packaging work a lot easier. Such tools can include bug
- filing, packaging preparation, package analysis, etc.
+ This is a collection of useful tools that Ubuntu developers use to make their
+ packaging work a lot easier.
+ .
+ Such tools can include bug filing, build rebuilding, packaging preparation,
+ package analysis, among other things.