[SCM] Debian package checker branch, master, updated. 2.2.18-72-gdfa361d
The following commit has been merged in the master branch:
commit dfa361d1fa21bb5038edeb2fb48c4e263edbd9b9
Author: Russ Allbery <rra@debian.org>
Date: Fri Dec 25 13:25:21 2009 -0800
Check for DEB_AUTO_UPDATE_DEBIAN_CONTROL
* checks/rules{,.desc}:
+ [RA] Add a new check for DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes.
Thanks, Nelson A. de Oliveira. (Closes: #557120)
Also add a new test suite for general debian/rules issues.
diff --git a/checks/rules b/checks/rules
index 8ecea2c..230d52e 100644
--- a/checks/rules
+++ b/checks/rules
@@ -165,6 +165,9 @@ while (<RULES>) {
if (/\$[\(\{]DEB_BUILD_OPTS[\)\}]/) {
tag "debian-rules-uses-DEB_BUILD_OPTS", "line $.";
}
+ if (/^\s*DEB_AUTO_UPDATE_DEBIAN_CONTROL\s*=\s*yes/) {
+ tag 'debian-rules-automatically-updates-control', "line $.";
+ }
# Keep track of whether this portion of debian/rules may be optional
if (/^ifn?(eq|def)\s/) {
diff --git a/checks/rules.desc b/checks/rules.desc
index 19fa7c8..2a9dc48 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -76,6 +76,14 @@ Info: The standard environment variable for build options is
DEB_BUILD_OPTIONS. Usually, referring to DEB_BUILD_OPTS is a mistake and
DEB_BUILD_OPTIONS was intended instead.
+Tag: debian-rules-automatically-updates-control
+Severity: serious
+Certainty: possible
+Info: DEB_AUTO_UPDATE_DEBIAN_CONTROL appears to be set to <tt>yes</tt> in
+ the <tt>debian/rules</tt> file. This activates a feature of CDBS which
+ may not be used in packages uploaded to the Debian archive.
+Ref: http://ftp-master.debian.org/REJECT-FAQ.html
+
Tag: debian-rules-sets-DH_COMPAT
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index d19e54d..712ee92 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lintian (2.3.0) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
+ - debian-rules-automatically-updates-control
- duplicated-compressed-file
- init.d-script-missing-dependency-on-local_fs (experimental)
- init.d-script-missing-dependency-on-remote_fs (experimental)
@@ -75,6 +76,8 @@ lintian (2.3.0) UNRELEASED; urgency=low
Build-Depends and Build-Depends-Indep is meaningless and there's no
reason, even pedantically, to worry about the separation. Thanks,
Charles Plessy. (Closes: #552200, #555667)
+ + [RA] Add a new check for DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes.
+ Thanks, Nelson A. de Oliveira. (Closes: #557120)
* collection/ar-info{,.desc}:
+ [RA] Collects the results of ar t on all *.a files, used by the new
diff --git a/t/COVERAGE b/t/COVERAGE
index 3869b60..a75d2b5 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -175,7 +175,6 @@ po-debconf not-using-po-debconf
rules debian-rules-is-symlink
rules debian-rules-not-a-makefile
-rules debian-rules-uses-DEB_BUILD_OPTS
scripts csh-considered-harmful
scripts gawk-script-but-no-gawk-dep
@@ -460,10 +459,6 @@ po-debconf stray-translated-debconf-templates
po-debconf translated-default-field
po-debconf unknown-encoding-in-po-file
-rules clean-should-be-satisfied-by-build-depends
-rules debian-rules-uses-pwd
-rules missing-dh_python-build-dependency
-
scripts ancient-dpkg-epoch-check
scripts ancient-dpkg-long-filenames-check
scripts ancient-dpkg-multi-conrep-check
@@ -526,7 +521,6 @@ binary
debian-changelog-file-missing-or-wrong-name
debian-news-entry-has-strange-distribution
debian-news-file-uses-obsolete-national-encoding
- debian-rules-uses-pwd
deprecated-kdelnk-file
desktop-contains-deprecated-header
desktop-entry-missing-required-key
@@ -584,7 +578,6 @@ binary
xs-vcs-header-in-debian-control
cdbs-test
- clean-should-be-satisfied-by-build-depends
no-human-maintainers
debconf
@@ -599,7 +592,6 @@ debconf
misnamed-po-file
missing-debconf-dependency
missing-debconf-dependency-for-preinst
- missing-dh_python-build-dependency
newer-debconf-templates
no-complete-debconf-translation
no-debconf-config
diff --git a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in b/t/tests/rules-general/debian/debian/control.in
similarity index 90%
copy from t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
copy to t/tests/rules-general/debian/debian/control.in
index 76b52f1..62c0e04 100644
--- a/t/tests/debhelper-dh-clean-k-ok/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: debhelper (>= 6)
+Build-Depends-Indep: debhelper (>= 7.0.50~)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/rules-general/debian/debian/pycompat b/t/tests/rules-general/debian/debian/pycompat
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/t/tests/rules-general/debian/debian/pycompat
@@ -0,0 +1 @@
+1
diff --git a/t/tests/rules-general/debian/debian/rules b/t/tests/rules-general/debian/debian/rules
new file mode 100755
index 0000000..9a76350
--- /dev/null
+++ b/t/tests/rules-general/debian/debian/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
+
+%:
+ dh $@
+
+override_dh_python:
+ dh_python
+
+clean:
+ dh_clean
+ echo $(DEB_BUILD_OPTS) $(PWD)
diff --git a/t/tests/rules-general/desc b/t/tests/rules-general/desc
new file mode 100644
index 0000000..6b7cb6e
--- /dev/null
+++ b/t/tests/rules-general/desc
@@ -0,0 +1,10 @@
+Testname: rules-general
+Sequence: 6000
+Version: 1.0
+Description: Test various debian/rules checks
+Test-For:
+ clean-should-be-satisfied-by-build-depends
+ 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
new file mode 100644
index 0000000..e8a296c
--- /dev/null
+++ b/t/tests/rules-general/tags
@@ -0,0 +1,5 @@
+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: