[SCM] Debian package checker branch, master, updated. 2.5.0-28-g3a1f7ee
The following commit has been merged in the master branch:
commit 3a1f7ee853eadfd4c1dfbabba200ef5b691ba821
Author: Niels Thykier <niels@thykier.net>
Date: Thu Jun 2 23:24:41 2011 +0200
Fixed test regressions caused by recent python changes
diff --git a/t/tests/debhelper-no-depends/debian/debian/rules b/t/tests/debhelper-no-depends/debian/debian/rules
index 595af91..4bb88d6 100755
--- a/t/tests/debhelper-no-depends/debian/debian/rules
+++ b/t/tests/debhelper-no-depends/debian/debian/rules
@@ -11,8 +11,8 @@ binary-indep:
dh_lisp || true
# We don't warn about commands inside make conditionals, so none of these
# get any warnings.
-ifeq "$(USE_PYCENTRAL)" "y"
- dh_pycentral
+ifeq "$(USE_DH_PYTHON2)" "y"
+ dh_python2
else
ifeq "$(USE_PYSUPPORT)" "y"
dh_pysupport
diff --git a/t/tests/rules-general/debian/debian/control.in b/t/tests/rules-general/debian/debian/control.in
index 75780c9..a50c22a 100644
--- a/t/tests/rules-general/debian/debian/control.in
+++ b/t/tests/rules-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends-Indep: debhelper (>= 7.0.50~)
+Build-Depends-Indep: debhelper (>= 7.0.50~), python
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/rules-general/debian/debian/rules b/t/tests/rules-general/debian/debian/rules
index 9a76350..c6597dd 100755
--- a/t/tests/rules-general/debian/debian/rules
+++ b/t/tests/rules-general/debian/debian/rules
@@ -6,7 +6,7 @@ DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
dh $@
override_dh_python:
- dh_python
+ dh_python2
clean:
dh_clean
diff --git a/t/tests/rules-general/desc b/t/tests/rules-general/desc
index 6b7cb6e..b5f7edf 100644
--- a/t/tests/rules-general/desc
+++ b/t/tests/rules-general/desc
@@ -7,4 +7,3 @@ Test-For:
debian-rules-automatically-updates-control
debian-rules-uses-DEB_BUILD_OPTS
debian-rules-uses-pwd
- missing-dh_python-build-dependency
diff --git a/t/tests/rules-general/tags b/t/tests/rules-general/tags
index e8a296c..5c8c7e2 100644
--- a/t/tests/rules-general/tags
+++ b/t/tests/rules-general/tags
@@ -1,5 +1,4 @@
E: rules-general source: clean-should-be-satisfied-by-build-depends debhelper
E: rules-general source: debian-rules-automatically-updates-control line 3
-E: rules-general source: missing-dh_python-build-dependency
W: rules-general source: debian-rules-uses-DEB_BUILD_OPTS line 13
W: rules-general source: debian-rules-uses-pwd line 13
--
Debian package checker
Reply to: