* 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.
This commit is contained in:
Jonathan Patrick Davies 2008-09-01 11:41:19 +01:00
parent 83d71696d7
commit 772d40b939
5 changed files with 25 additions and 14 deletions

9
buildd
View File

@ -29,7 +29,7 @@ from optparse import OptionGroup
from optparse import OptionParser from optparse import OptionParser
from urllib import urlencode from urllib import urlencode
sys.path.append('/usr/share/ubuntu-dev-tools/') sys.path.append("/usr/share/ubuntu-dev-tools/")
import common import common
# Usage. # Usage.
@ -81,18 +81,11 @@ elif op in ("retry", "rescore") and options.architecture:
else: else:
oneArch = False 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. # Prepare Launchpad cookie.
launchpadCookie = common.prepareLaunchpadCookie() launchpadCookie = common.prepareLaunchpadCookie()
urlopener = common.setupLaunchpadUrlOpener(launchpadCookie) urlopener = common.setupLaunchpadUrlOpener(launchpadCookie)
# Check the release exists. # Check the release exists.
# Check release by checking if Launchpad page exists
common.checkReleaseExists(release) common.checkReleaseExists(release)
# Find out the version in given release. # Find out the version in given release.

View File

@ -32,6 +32,12 @@ import subprocess
import sys import sys
import urllib2 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): def mkdir(directory):
""" Create the given directory and all its parents recursively, but don't """ Create the given directory and all its parents recursively, but don't
raise an exception if it already exists. """ raise an exception if it already exists. """

8
debian/changelog vendored
View File

@ -1,7 +1,15 @@
ubuntu-dev-tools (0.43ubuntu2) UNRELEASED; urgency=low ubuntu-dev-tools (0.43ubuntu2) UNRELEASED; urgency=low
[ Colin Watson ]
* Fix a number of minor glitches in manual pages. * 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 -- Colin Watson <cjwatson@ubuntu.com> Mon, 01 Sep 2008 09:48:38 +0100
ubuntu-dev-tools (0.43ubuntu1) intrepid; urgency=low ubuntu-dev-tools (0.43ubuntu1) intrepid; urgency=low

2
debian/compat vendored
View File

@ -1 +1 @@
5 6

14
debian/control vendored
View File

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com> Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-dev/ubuntu-dev-tools/trunk 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 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) Build-Depends-Indep: python-central (>= 0.5)
XS-Python-Version: >= 2.5 XS-Python-Version: >= 2.5
Homepage: https://launchpad.net/ubuntu-dev-tools/ Homepage: https://launchpad.net/ubuntu-dev-tools/
@ -13,13 +13,17 @@ Standards-Version: 3.8.0
Package: ubuntu-dev-tools Package: ubuntu-dev-tools
Architecture: all Architecture: all
Section: devel 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), Recommends: bzr, pbuilder | sbuild, reportbug (>= 3.39ubuntu1),
ca-certificates ca-certificates
Conflicts: devscripts (<< 2.10.7ubuntu5) Conflicts: devscripts (<< 2.10.7ubuntu5)
Replaces: devscripts (<< 2.10.7ubuntu5) Replaces: devscripts (<< 2.10.7ubuntu5)
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Description: useful tools for Ubuntu developers Description: useful tools for Ubuntu developers
This is a collection of useful tools that Ubuntu developers use to This is a collection of useful tools that Ubuntu developers use to make their
make their packaging work a lot easier. Such tools can include bug packaging work a lot easier.
filing, packaging preparation, package analysis, etc. .
Such tools can include bug filing, build rebuilding, packaging preparation,
package analysis, among other things.