From ee3ad27b78d3fe64da09a05043d30867f1b13c1d Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Fri, 21 Aug 2009 17:53:35 +0200 Subject: [PATCH] * 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. --- debian/changelog | 8 +++++++- debian/control | 3 +-- debian/rules | 2 +- debian/ubuntu-dev-tools.preinst | 9 +++++++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 24b947f..ba79c1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,8 +32,14 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low 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. - -- Iain Lane Mon, 17 Aug 2009 12:00:33 +0100 + -- 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#