[SCM] Debian package checker branch, master, updated. 2.5.0-23-g18d4da7
The following commit has been merged in the master branch:
commit 18d4da7e74838e01f2b6cc90e9e5c8759fa9f61c
Author: Niels Thykier <niels@thykier.net>
Date: Thu Jun 2 21:47:19 2011 +0200
Also recognise that dh_pycentral is now obsolete
diff --git a/checks/debhelper b/checks/debhelper
index 6c7e443..6bd3279 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -100,6 +100,9 @@ while (<RULES>) {
if ($dhcommand eq 'dh_python') {
tag 'dh_python-is-obsolete', "line $.";
}
+ if ($dhcommand eq 'dh_pycentral') {
+ tag 'dh_pycentral-is-obsolete', "line $.";
+ }
# Don't warn about recently deprecated commands in code that may be
# optional. It may be there only for backports.
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index d72614d..b969a13 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -95,6 +95,19 @@ Severity: normal
Certainty: certain
Info: This package calls dh_python in its <tt>debian/rules</tt> file.
dh_python 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.
+
+Tag: dh_pycentral-is-obsolete
+Severity: normal
+Certainty: certain
+Info: This package calls dh_pycentral in its <tt>debian/rules</tt> file.
+ dh_pycentral 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/PyCentral2DhPython2
Tag: dh_desktop-is-deprecated
Severity: normal
diff --git a/debian/changelog b/debian/changelog
index e709722..43689ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,13 @@ lintian (2.5.1) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
+ - dh_pycentral-is-obsolete
- dh_python-is-obsolete
- non-empty-dependency_libs-in-la-file
* checks/debhelper{,.desc}:
- + [NT] Recognise that dh_python is obsolete. (Closes: #541978)
+ + [NT] Recognise that dh_python and dh_pycentral are now obsolete.
+ (Closes: #541978)
* checks/fields{,.desc}:
+ [NT] Allow "all" and "any" to appear together in the Architecture
field of a .dsc file. (Closes: #626775)
diff --git a/t/tests/debhelper-deprecated/debian/debian/control.in b/t/tests/debhelper-deprecated/debian/debian/control.in
new file mode 100644
index 0000000..bbf55b3
--- /dev/null
+++ b/t/tests/debhelper-deprecated/debian/debian/control.in
@@ -0,0 +1,17 @@
+Source: {$srcpkg}
+Priority: extra
+Section: {$section}
+Maintainer: {$author}
+Standards-Version: {$standards_version}
+Build-Depends: debhelper (>= 7.0.50~), python-central
+
+Package: {$srcpkg}
+Architecture: {$architecture}
+Depends: $\{misc:Depends\}
+Description: {$description}
+ This is a test package designed to test various aspects of the
+ debhelper-related QA code in lintian. This may be a useless
+ empty package.
+ .
+ This package should not be installed.
+
diff --git a/t/tests/debhelper-deprecated/debian/debian/rules b/t/tests/debhelper-deprecated/debian/debian/rules
index 406f824..c477c2d 100755
--- a/t/tests/debhelper-deprecated/debian/debian/rules
+++ b/t/tests/debhelper-deprecated/debian/debian/rules
@@ -22,6 +22,7 @@ binary-indep:
-dh_dhelp
dh_scrollkeeper
-dh_python
+ -dh_pycentral
# 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 9c37c4a..669c348 100644
--- a/t/tests/debhelper-deprecated/tags
+++ b/t/tests/debhelper-deprecated/tags
@@ -1,6 +1,7 @@
W: debhelper-deprecated source: dh_desktop-is-deprecated line 21
W: debhelper-deprecated source: dh_dhelp-is-deprecated line 22
+W: debhelper-deprecated source: dh_pycentral-is-obsolete line 25
W: debhelper-deprecated source: dh_python-is-obsolete line 24
W: debhelper-deprecated source: dh_scrollkeeper-is-deprecated line 23
-W: debhelper-deprecated source: dh_suidregister-is-obsolete line 34
-W: debhelper-deprecated source: dh_undocumented-is-obsolete line 35
+W: debhelper-deprecated source: dh_suidregister-is-obsolete line 35
+W: debhelper-deprecated source: dh_undocumented-is-obsolete line 36
--
Debian package checker
Reply to: