python: use default version, require >=2.6

diff --git a/debian/changelog b/debian/changelog
index 1f4a36b067d6884e8999373ed933d34e623c9bfa..4f23960f472906512f2a9d7782ebd33f536248c5 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 00a17a666648f686824523118902a12b6b2978bd..548f25aa4f725bd32a473a4c0826ec88e4d71741 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 cd8245149c282d68f728d016757ff9982033c4a3..1efa756fa4ca36a9916e4ab422edc7cc260ef443 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 e5fa2e3924f7ae915cc2f09d255e9720867f1776..29a9b19e016191ae8f811689cd155f7d792b263c 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 991224fa758063d9b8ac645d050e83e3b23ec224..8994548b8017f1559beb24444d7f0a7a7e5ba961 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 40384b9ff55a546756e1c22a6d603184352a1960..7bd8f4f5f437cb81c9fbb0d51f74985b8752557f 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 fc8e58651a47a1a3040e44a7067a9e45dfdf9dc1..ceece960e59885860f99a4c53521c5b7a55d88b2 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