diff --git a/buildd b/buildd index 1b55f32..31eb182 100755 --- a/buildd +++ b/buildd @@ -199,7 +199,7 @@ else: # filter out duplicate and invalid architectures archs.intersection_update(valid_archs) -release = options.series # if None it falls back to the current development series +release = options.series or Distribution('ubuntu').getDevelopmentSeries().name pocket = 'Release' if release and '-' in release: # split release and pocket diff --git a/debian/changelog b/debian/changelog index 2e32db9..ba79c1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,10 +16,30 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low * buildd: Add a --batch mode for batch retrying/rescoring of packages. [ Iain Lane ] - * requestsync: Guard some calls when -n is specified + * requestsync: + - Guard some calls when -n is specified + - Fetch changelog of specified version, not current version. If an + experimenal upload happened after the unstable one we're syncing, this + is considered to be current by p.d.o and we would get those changelog + entries in the sync request + - Remove trailing fullstop from sync bug title * suspicious-source: Add *.hs *.el *.css to whitelist - -- Iain Lane Sat, 08 Aug 2009 16:02:25 +0100 + [ Siegfried-Angel Gevatter Pujals ] + * pbuilder-dist: + - Expand "~" in PBUILDFOLDER to the user's home directory. + - If there's a "etc//apt.conf" file inside the build result + directory, pass it to pbuilder as --aptconfdir. Thanks to Paul Novotny + and Ryan Pavlik (LP: #363043). + + [ Luca Falavigna ] + * Switch to python-support to ease initial import into Debian: + - debian/control: build-depend on python-support instead of pycentral, + also remove unneeded XB-Python-Version field from binary stanza. + - debian/rules: set DEB_PYTHON_SYSTEM to pysupport. + - ubuntu-dev-tools.preinst: remove stale pycentral files on upgrades. + + -- Luca Falavigna Fri, 21 Aug 2009 17:30:05 +0200 ubuntu-dev-tools (0.75) karmic; urgency=low diff --git a/debian/control b/debian/control index c6b6a63..d33a854 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ubuntu Developers 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 (>= 6), python-all-dev (>= 2.5) -Build-Depends-Indep: python-central (>= 0.5) +Build-Depends-Indep: python-support (>= 0.5.3) XS-Python-Version: >= 2.5 Homepage: https://launchpad.net/ubuntu-dev-tools/ Standards-Version: 3.8.0 @@ -19,7 +19,6 @@ Recommends: bzr, pbuilder | cowdancer | sbuild, reportbug (>= 3.39ubuntu1), ca-certificates, debootstrap, genisoimage, perl-modules, libwww-perl 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. diff --git a/debian/rules b/debian/rules index c10c010..cd6d27f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM := pycentral +DEB_PYTHON_SYSTEM := pysupport include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk diff --git a/debian/ubuntu-dev-tools.preinst b/debian/ubuntu-dev-tools.preinst index a41d6c2..a4a6a38 100644 --- a/debian/ubuntu-dev-tools.preinst +++ b/debian/ubuntu-dev-tools.preinst @@ -16,5 +16,14 @@ if [ -e /etc/bash_completion.d/pbuilder-dist/pbuilder-dist ]; then mv -fv "$tmp_file" /etc/bash_completion.d/pbuilder-dist fi +# Remove stale pycentral files on upgrades. +# This can be removed after the next LTS (likely 10.04) is released. +if [ "$1" = upgrade ] +then + if dpkg --compare-versions "$2" lt "0.76" ; then + pycentral pkgremove ubuntu-dev-tools + fi +fi + #DEBHELPER# diff --git a/pbuilder-dist b/pbuilder-dist index c9ff8d0..43dcfb9 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -21,7 +21,7 @@ # # ################################################################## # -# This script is a wrapper to be able to easily use pbuilder for +# This script is a wrapper to be able to easily use pbuilder/cowbuilder for # different distributions (eg, Gutsy, Hardy, Debian unstable, etc). # # You can create symlinks to a pbuilder-dist executable to get different @@ -85,10 +85,7 @@ class pbuilder_dist: ############################################################## - if 'PBUILDFOLDER' in os.environ: - self.base = os.environ['PBUILDFOLDER'] - else: - self.base = os.path.expanduser('~/pbuilder/') + self.base = os.path.expanduser(os.environ.get('PBUILDFOLDER', '~/pbuilder/')) if not os.path.exists(self.base): os.makedirs(self.base) @@ -248,7 +245,9 @@ class pbuilder_dist: arguments.append('--debootstrapopts --arch') arguments.append('--debootstrapopts "%(build_architecture)s"' % self) - ### $( [ $ISDEBIAN != "False" ] || echo "--aptconfdir \"${BASE_DIR}/etc/${DISTRIBUTION}/apt.conf/\"" ) \ + apt_conf_dir = os.path.join(self.base, 'etc/%(target_distro)s/apt.conf' % self) + if os.path.exists(apt_conf_dir): + arguments.append('--aptconfdir "%s"' % apt_conf_dir) # Append remaining arguments if remaining_arguments: diff --git a/requestsync b/requestsync index 6892165..bf63546 100755 --- a/requestsync +++ b/requestsync @@ -279,14 +279,14 @@ if __name__ == '__main__': sys.exit(1) # -s flag not specified - check if we do need sponsorship. - if (not newsource): - if (not sponsorship): + if (not sponsorship): + if (not newsource): sponsorship = needsSponsorship(srcpkg, component) else: - sponsorship = PersonTeam.getMe().isLpTeamMember('motu') # assume going to universe + sponsorship = not PersonTeam.getMe().isLpTeamMember('motu') # assume going to universe # Check for existing package reports. - if not newsource and use_lp_bugs: checkExistingReports(srcpkg) + if (not newsource) and use_lp_bugs: checkExistingReports(srcpkg) # Generate bug report. subscribe = 'ubuntu-archive' @@ -305,7 +305,7 @@ if __name__ == '__main__': subscribe = 'motu-release' - pkg_to_sync = '%s %s (%s) from Debian %s (%s).' % (srcpkg, deb_version, component, distro, debiancomponent) + pkg_to_sync = '%s %s (%s) from Debian %s (%s)' % (srcpkg, deb_version, component, distro, debiancomponent) title = "Sync %s" % pkg_to_sync if ffe == True: title = "FFe: " + title diff --git a/ubuntutools/requestsync/common.py b/ubuntutools/requestsync/common.py index 8833ddd..47096cd 100644 --- a/ubuntutools/requestsync/common.py +++ b/ubuntutools/requestsync/common.py @@ -42,6 +42,7 @@ def getDebianChangelog(srcpkg, version): Return the new changelog entries upto 'version'. ''' pkgname = srcpkg.getPackageName() + pkgversion = srcpkg.getVersion() component = srcpkg.getComponent() if pkgname.startswith('lib'): subdir = 'lib%s' % pkgname[3] @@ -51,8 +52,8 @@ def getDebianChangelog(srcpkg, version): # Get the debian changelog file from packages.debian.org try: changelog = urllib2.urlopen( - 'http://packages.debian.org/changelogs/pool/%s/%s/%s/current/changelog.txt' % \ - (component, subdir, pkgname)) + 'http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog.txt' % \ + (component, subdir, pkgname, pkgname, pkgversion)) except urllib2.HTTPError, error: print >> sys.stderr, 'Unable to connect to packages.debian.org: %s' % error return None