[SCM] Debian package checker branch, master, updated. 2.5.12-120-g638d3a9
The following commit has been merged in the master branch:
commit 638d3a93724711ede9d12179dde15c219f95cd15
Author: Luca Falavigna <dktrkranz@debian.org>
Date: Sun May 26 17:36:40 2013 +0200
c/debhelper: Detect and tag dh_python as obsolete
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/debhelper b/checks/debhelper
index 82c13a2..1ba9ac1 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -109,6 +109,10 @@ while (<$rules_fd>) {
tag 'dh_pycentral-is-obsolete', "line $.";
$seen_python_helper = 1;
}
+ if ($dhcommand eq 'dh_pysupport') {
+ tag 'dh_pysupport-is-obsolete', "line $.";
+ $seen_python_helper = 1;
+ }
if ($dhcommand eq 'dh_installmanpages') {
tag 'dh_installmanpages-is-obsolete', "line $.";
}
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 5a43acf..49ec999 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -98,6 +98,16 @@ Info: This package calls dh_pycentral in its <tt>debian/rules</tt> file.
Lenny or older system, please ignore this warning.
Ref: http://wiki.debian.org/Python/PyCentral2DhPython2
+Tag: dh_pysupport-is-obsolete
+Severity: normal
+Certainty: certain
+Info: This package calls dh_pysupport in its <tt>debian/rules</tt> file.
+ dh_pysupport is deprecated and has been replaced by dh_python2.
+ .
+ dh_python2 is available in Squeeze; if backporting the package to a
+ Lenny or older system, please ignore this warning.
+Ref: http://wiki.debian.org/Python/TransitionToDHPython2
+
Tag: dh_installmanpages-is-obsolete
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 713f655..0afe1d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lintian (2.5.13) UNRELEASED; urgency=low
+ Added:
- conffile-is-not-in-package
- debconf-translation-using-general-list
+ - dh_pysupport-is-obsolete
+ Removed:
- debhelper-maintscript-needs-versioned-build-depends
- debhelper-script-needs-versioned-build-depends
@@ -48,6 +49,8 @@ lintian (2.5.13) UNRELEASED; urgency=low
* checks/debhelper{,.desc}:
+ [NT] Retire some tags that is no longer relevant in the
Jessie development cycle.
+ + [NT] Apply patch from Luca Falavigna to detect uses of the
+ depreacated tool, dh_python. (Closes: #709615)
* checks/description:
+ [NT] Skip extended-description-is-probably-too-short
for -dbg packages. Thanks to Paul Wise for the suggestion.
diff --git a/t/tests/debhelper-deprecated/debian/debian/control.in b/t/tests/debhelper-deprecated/debian/debian/control.in
index 16fc0b0..9d9e115 100644
--- a/t/tests/debhelper-deprecated/debian/debian/control.in
+++ b/t/tests/debhelper-deprecated/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9), python-central, python-ply (>= 3.4-1~)
+Build-Depends: debhelper (>= 9), python-central, python-support, python-ply (>= 3.4-1~)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/debhelper-deprecated/debian/debian/rules b/t/tests/debhelper-deprecated/debian/debian/rules
index 9b0f6e8..ed69f53 100755
--- a/t/tests/debhelper-deprecated/debian/debian/rules
+++ b/t/tests/debhelper-deprecated/debian/debian/rules
@@ -28,6 +28,7 @@ binary-indep:
-dh_python$(VERSION) # This should not
-dh_python-ply # neither should this
-dh_pycentral
+ -dh_pysupport
# Check not warning about deprecated commands in optional portions, but
# commands that have been toast for a long time are still warned about.
ifneq "$(LENNY_BACKPORT)" "y"
diff --git a/t/tests/debhelper-deprecated/tags b/t/tests/debhelper-deprecated/tags
index e74a6f7..92a8297 100644
--- a/t/tests/debhelper-deprecated/tags
+++ b/t/tests/debhelper-deprecated/tags
@@ -1,7 +1,8 @@
W: debhelper-deprecated source: dh_desktop-is-deprecated line 25
W: debhelper-deprecated source: dh_installmanpages-is-obsolete line 24
W: debhelper-deprecated source: dh_pycentral-is-obsolete line 30
+W: debhelper-deprecated source: dh_pysupport-is-obsolete line 31
W: debhelper-deprecated source: dh_python-is-obsolete line 27
W: debhelper-deprecated source: dh_scrollkeeper-is-deprecated line 26
-W: debhelper-deprecated source: dh_suidregister-is-obsolete line 40
-W: debhelper-deprecated source: dh_undocumented-is-obsolete line 41
+W: debhelper-deprecated source: dh_suidregister-is-obsolete line 41
+W: debhelper-deprecated source: dh_undocumented-is-obsolete line 42
--
Debian package checker
Reply to: