python: use default version, require >=2.6

diff --git a/debian/changelog b/debian/changelog
index 1f4a36b..4f23960 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+autopkgtest (2.2.2) unstable; urgency=low
+
+  [ Martin Pitt ]
+  * Fix hashbang lines to use python instead of python2.6, and update
+    debian/control to only depend on python (>= 2.6) instead of python2.6.
+    Closes: #644332.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2012 01:03:02 +0100
+
 autopkgtest (2.2.1) unstable; urgency=low
 
   [ Stefano Zacchiroli ]

diff --git a/debian/control b/debian/control
index 00a17a6..548f25a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git
 
 Package: autopkgtest
 Architecture: all
-Depends: python2.6
+Depends: python (>= 2.6)
 Conflicts: autodebtest (<< 0.5.3)
 Replaces: autodebtest (<< 0.5.3)
 Recommends: apt-utils, pbuilder

diff --git a/runner/adt-run b/runner/adt-run
index cd82451..1efa756 100755 (executable)
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python
 #
 # adt-run is part of autopkgtest
 # autopkgtest is a tool for testing Debian binary packages

diff --git a/virt-subproc/adt-virt-chroot b/virt-subproc/adt-virt-chroot
index e5fa2e3..29a9b19 100755 (executable)
--- a/virt-subproc/adt-virt-chroot
+++ b/virt-subproc/adt-virt-chroot
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python
 #
 # adt-virt-chroot is part of autopkgtest
 # autopkgtest is a tool for testing Debian binary packages

diff --git a/virt-subproc/adt-virt-null b/virt-subproc/adt-virt-null
index 991224f..8994548 100755 (executable)
--- a/virt-subproc/adt-virt-null
+++ b/virt-subproc/adt-virt-null
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python
 #
 # adt-virt-null is part of autopkgtest
 # autopkgtest is a tool for testing Debian binary packages

diff --git a/virt-subproc/adt-virt-schroot b/virt-subproc/adt-virt-schroot
index 40384b9..7bd8f4f 100755 (executable)
--- a/virt-subproc/adt-virt-schroot
+++ b/virt-subproc/adt-virt-schroot
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python
 #
 # adt-virt-schroot is part of autopkgtest
 # autopkgtest is a tool for testing Debian binary packages

diff --git a/virt-subproc/adt-virt-xenlvm b/virt-subproc/adt-virt-xenlvm
index fc8e586..ceece96 100755 (executable)
--- a/virt-subproc/adt-virt-xenlvm
+++ b/virt-subproc/adt-virt-xenlvm
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python
 #
 # adt-virt-xenlvm is part of autopkgtest
 # autopkgtest is a tool for testing Debian binary packages