Merge from trunk

debian/changelog

@@ -2,6 +2,11 @@ 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.
+  * Switch to dh_python2:
+    - Use X-Python-Version instead of XS-Python-Version.
+    - Use ${python:Breaks} to specify Python version compatibility.
   * Support reading configuration variables from devscripts configuration
     files. (LP: #681693)
     - Added ubuntu-dev-tools.5

debian/control

@@ -6,12 +6,12 @@ Uploaders: Luca Falavigna <dktrkranz@debian.org>,
            Benjamin Drung <bdrung@ubuntu.com>
 Vcs-Bzr: lp:ubuntu-dev-tools
 Vcs-Browser: https://code.launchpad.net/~ubuntu-dev/ubuntu-dev-tools/trunk
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5)
-Build-Depends-Indep: python-setuptools,
-                     python-support (>= 0.5.3),
-                     python-unittest2
+Build-Depends: debhelper (>= 7.0.50~),
+               python-all (>= 2.6.5-13~),
+               python-setuptools,
+               python-unittest2
 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
 
@@ -44,6 +44,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.

debian/rules

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with python2
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

debian/ubuntu-dev-tools.preinst

@@ -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#
-