[lintian] 02/03: Rename generic rules check to something generic
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit b57ae63fd9fa9fb071c8ab0257678db631d042e5
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Sun Dec 22 17:39:42 2013 +0100
Rename generic rules check to something generic
Will help to pass implemented tag scripts.
signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/rules.desc | 8 ++++----
data/rules/rules-should-not-use | 8 ++++----
debian/changelog | 8 ++++++++
t/scripts/implemented-tags.t | 1 +
t/tests/rules-general/desc | 6 +++---
t/tests/rules-general/tags | 6 +++---
t/tests/rules-special-variables/desc | 2 +-
t/tests/rules-special-variables/tags | 2 +-
8 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/checks/rules.desc b/checks/rules.desc
index 2352c88..787a16c 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -77,7 +77,7 @@ Info: The <tt>debian/rules</tt> file for this package appears to
include a Makefile that has been deprecated. Please refer to the
documentation of the providing package for a replacement (if any).
-Tag: debian-rules-uses-pwd
+Tag: debian-rules-should-not-use-pwd
Severity: normal
Certainty: certain
Info: The <tt>debian/rules</tt> file for this package appears to use the
@@ -110,14 +110,14 @@ Info: A rule in the <tt>debian/rules</tt> file for this package calls the
so that other error messages from the clean or distclean rule will still
be caught (or just remove the "-" if the package uses a static makefile).
-Tag: debian-rules-uses-DEB_BUILD_OPTS
+Tag: debian-rules-should-not-use-DEB_BUILD_OPTS
Severity: normal
Certainty: certain
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
+Tag: debian-rules-should-not-automatically-update-control
Severity: serious
Certainty: possible
Info: DEB_AUTO_UPDATE_DEBIAN_CONTROL appears to be set to <tt>yes</tt> in
@@ -210,7 +210,7 @@ Info: The package appears to use an <tt>ExtUtils::MakeMaker</tt>
should be replaced with
make install DESTDIR=$(TMP) # RIGHT
-Tag: debian-rules-uses-or-modifies-user-only-variable
+Tag: debian-rules-should-not-use-or-modify-user-only-variable
Severity: normal
Certainty: possible
Ref: #631786
diff --git a/data/rules/rules-should-not-use b/data/rules/rules-should-not-use
index 3760c0e..a05bce2 100644
--- a/data/rules/rules-should-not-use
+++ b/data/rules/rules-should-not-use
@@ -3,8 +3,8 @@
# tag ~~ regex (\x\s)
# Please sort by alphabetic sort of tags
#
-debian-rules-automatically-updates-control ~~ ^\s*DEB_AUTO_UPDATE_DEBIAN_CONTROL\s*=\s*yes
-debian-rules-uses-DEB_BUILD_OPTS ~~ \$[\(\{]DEB_BUILD_OPTS[\)\}]
-debian-rules-uses-or-modifies-user-only-variable ~~ \bDEB_[^_ \t]+FLAGS_(?:SET|APPEND)\b
-debian-rules-uses-pwd ~~ \$[\(\{]PWD[\)\}]
+debian-rules-should-not-automatically-update-control ~~ ^\s*DEB_AUTO_UPDATE_DEBIAN_CONTROL\s*=\s*yes
+debian-rules-should-not-use-DEB_BUILD_OPTS ~~ \$[\(\{]DEB_BUILD_OPTS[\)\}]
+debian-rules-should-not-use-or-modify-user-only-variable ~~ \bDEB_[^_ \t]+FLAGS_(?:SET|APPEND)\b
+debian-rules-should-not-use-pwd ~~ \$[\(\{]PWD[\)\}]
diff --git a/debian/changelog b/debian/changelog
index ad1b2d8..c87fed3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,14 @@ lintian (2.5.21) UNRELEASED; urgency=medium
* checks/rules.{desc,pm}:
+ [BR] Use Lintian::Data for forbidden construct in rules
file.
+ + [BR] Rename debian-rules-automatically-updates-control to
+ debian-rules-should-not-automatically-update-control.
+ + [BR] Rename debian-rules-uses-pwd to
+ debian-rules-should-not-use-pwd.
+ + [BR] Rename debian-rules-uses-DEB_BUILD_OPTS to
+ debian-rules-should-not-use-DEB_BUILD_OPTS.
+ + [BR] Rename debian-rules-uses-or-modifies-user-only-variable
+ to debian-rules-should-not-use-or-modify-user-only-variable.
* debian/control:
+ [NT] Add relevant relations on libyaml-perl, which is
diff --git a/t/scripts/implemented-tags.t b/t/scripts/implemented-tags.t
index a7808ca..a5443bd 100755
--- a/t/scripts/implemented-tags.t
+++ b/t/scripts/implemented-tags.t
@@ -49,6 +49,7 @@ our $EXCLUDE =join(
^install-info-used-in-maintainer-script$
^maintainer-script-removes-device-files$
^suidregister-used-in-maintainer-script$
+ ^debian-rules-should-not-.*$
));
# Exclude "lintian.desc" as it does not have a perl module like other
diff --git a/t/tests/rules-general/desc b/t/tests/rules-general/desc
index b5f7edf..a1ce36f 100644
--- a/t/tests/rules-general/desc
+++ b/t/tests/rules-general/desc
@@ -4,6 +4,6 @@ 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
+ debian-rules-should-not-automatically-update-control
+ debian-rules-should-not-use-DEB_BUILD_OPTS
+ debian-rules-should-not-use-pwd
diff --git a/t/tests/rules-general/tags b/t/tests/rules-general/tags
index f6931fa..10d0b6a 100644
--- a/t/tests/rules-general/tags
+++ b/t/tests/rules-general/tags
@@ -1,4 +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
-W: rules-general source: debian-rules-uses-DEB_BUILD_OPTS line 10
-W: rules-general source: debian-rules-uses-pwd line 10
+E: rules-general source: debian-rules-should-not-automatically-update-control line 3
+W: rules-general source: debian-rules-should-not-use-DEB_BUILD_OPTS line 10
+W: rules-general source: debian-rules-should-not-use-pwd line 10
diff --git a/t/tests/rules-special-variables/desc b/t/tests/rules-special-variables/desc
index e8c28a8..feff74d 100644
--- a/t/tests/rules-special-variables/desc
+++ b/t/tests/rules-special-variables/desc
@@ -2,4 +2,4 @@ Testname: rules-special-variables
Sequence: 6000
Version: 1.0
Description: Test for debian/rules using special variables
-Test-For: debian-rules-uses-or-modifies-user-only-variable
+Test-For: debian-rules-should-not-use-or-modify-user-only-variable
diff --git a/t/tests/rules-special-variables/tags b/t/tests/rules-special-variables/tags
index 4b3549d..d20f58d 100644
--- a/t/tests/rules-special-variables/tags
+++ b/t/tests/rules-special-variables/tags
@@ -1 +1 @@
-W: rules-special-variables source: debian-rules-uses-or-modifies-user-only-variable line 3
+W: rules-special-variables source: debian-rules-should-not-use-or-modify-user-only-variable line 3
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: