From 54f082b6e8ae858112f4ebdb6d91c4ff717ee877 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Mon, 20 Dec 2010 11:30:38 +0200 Subject: [PATCH 1/3] Drop preinst (pbuilder-dist bash_completion handling), it is not required for any current upgrade path on Debian or Ubuntu. --- debian/changelog | 4 +++- debian/ubuntu-dev-tools.preinst | 20 -------------------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 debian/ubuntu-dev-tools.preinst diff --git a/debian/changelog b/debian/changelog index dae1a49..16e6ef6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ ubuntu-dev-tools (0.109) UNRELEASED; urgency=low * Convert debian/copyright to DEP5, make sure all scripts are listed (LP: #692003) + * Drop preinst (pbuilder-dist bash_completion handling), it is not required + for any current upgrade path on Debian or Ubuntu. - -- Stefano Rivera Sun, 19 Dec 2010 02:26:12 +0200 + -- Stefano Rivera Mon, 20 Dec 2010 11:29:02 +0200 ubuntu-dev-tools (0.108) experimental; urgency=low diff --git a/debian/ubuntu-dev-tools.preinst b/debian/ubuntu-dev-tools.preinst deleted file mode 100644 index a41d6c2..0000000 --- a/debian/ubuntu-dev-tools.preinst +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -if [ -e /etc/bash_completion.d/pbuilder-dist/pbuilder-dist ]; then - tmp_file="$(mktemp /etc/bash_completion.d/pbuilder-dist.XXXXXX)" - mv -fv /etc/bash_completion.d/pbuilder-dist/pbuilder-dist \ - "$tmp_file" - rmdir --ignore-fail-on-non-empty /etc/bash_completion.d/pbuilder-dist - # dir non-empty - if [ -d /etc/bash_completion.d/pbuilder-dist ]; then - echo "W: /etc/bash_completion.d/pbuilder-dist not empty; moving /etc/bash_completion.d/pbuilder-dist out of the way" - mv -fv /etc/bash_completion.d/pbuilder-dist /etc/bash_completion.d/pbuilder-dist.dpkg-disabled - - fi - mv -fv "$tmp_file" /etc/bash_completion.d/pbuilder-dist -fi - -#DEBHELPER# - From 32ed378668627ffa3d2430b3cdd6c3bbb34cbe66 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Mon, 20 Dec 2010 11:33:56 +0200 Subject: [PATCH 2/3] * Switch to dh_python2: - Use X-Python-Version instead of XS-Python-Version. - Use ${python:Breaks} to specify Python version compatibility. --- debian/changelog | 5 ++++- debian/control | 6 +++--- debian/rules | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16e6ef6..8c6d9ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,11 @@ ubuntu-dev-tools (0.109) UNRELEASED; urgency=low (LP: #692003) * Drop preinst (pbuilder-dist bash_completion handling), it is not required for any current upgrade path on Debian or Ubuntu. + * Switch to dh_python2: + - Use X-Python-Version instead of XS-Python-Version. + - Use ${python:Breaks} to specify Python version compatibility. - -- Stefano Rivera Mon, 20 Dec 2010 11:29:02 +0200 + -- Stefano Rivera Mon, 20 Dec 2010 11:32:42 +0200 ubuntu-dev-tools (0.108) experimental; urgency=low diff --git a/debian/control b/debian/control index 5f0959f..f6f4f9c 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,9 @@ Uploaders: Luca Falavigna , Benjamin Drung Vcs-Bzr: lp:ubuntu-dev-tools Vcs-Browser: https://code.launchpad.net/~ubuntu-dev/ubuntu-dev-tools/trunk -Build-Depends: debhelper (>= 7), python (>= 2.5) -Build-Depends-Indep: python-support (>= 0.5.3) +Build-Depends: debhelper (>= 7), python-all (>= 2.6.13~) DM-Upload-Allowed: yes -XS-Python-Version: >= 2.5 +X-Python-Version: >= 2.5 Homepage: https://launchpad.net/ubuntu-dev-tools Standards-Version: 3.9.1 @@ -42,6 +41,7 @@ Recommends: bzr, python-soappy, reportbug (>= 3.39ubuntu1) Suggests: qemu-kvm-extras-static +Breaks: ${python:Breaks} 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 2d33f6a..4647c9c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,4 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with python2 From 552892f2648c2b05f7fd37eb1b4c1639a878e380 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Mon, 20 Dec 2010 13:11:12 +0200 Subject: [PATCH 3/3] Incorrect versioned python dependancy --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f6f4f9c..bff18ff 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Luca Falavigna , Benjamin Drung Vcs-Bzr: lp:ubuntu-dev-tools Vcs-Browser: https://code.launchpad.net/~ubuntu-dev/ubuntu-dev-tools/trunk -Build-Depends: debhelper (>= 7), python-all (>= 2.6.13~) +Build-Depends: debhelper (>= 7), python-all (>= 2.6.5-13~) DM-Upload-Allowed: yes X-Python-Version: >= 2.5 Homepage: https://launchpad.net/ubuntu-dev-tools