[lintian] 01/01: Correct references to DH_BUILD_OPTIONS -> DEB_BUILD_OPTIONS. Thanks Guillem!
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit bea735f1d3e695889062aac8b69e71347386f128
Author: Chris Lamb <lamby@debian.org>
Date: Wed Jul 12 09:12:16 2017 +0100
Correct references to DH_BUILD_OPTIONS -> DEB_BUILD_OPTIONS. Thanks Guillem!
---
checks/rules.desc | 4 ++--
checks/rules.pm | 4 ++--
debian/changelog | 2 +-
.../debian/debian/rules | 2 +-
t/tests/debhelper-deb-build-options/desc | 5 +++++
t/tests/debhelper-deb-build-options/tags | 1 +
t/tests/debhelper-dh-build-options/desc | 5 -----
t/tests/debhelper-dh-build-options/tags | 1 -
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/checks/rules.desc b/checks/rules.desc
index e4fd6b5..2f2cc52 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -134,11 +134,11 @@ Info: As of debhelper version 4, the DH_COMPAT environment variable is
line in <tt>debian/rules</tt> that sets it globally should be deleted and
a separate <tt>debian/compat</tt> file created if needed.
-Tag: debian-rules-sets-DH_BUILD_OPTIONS
+Tag: debian-rules-sets-DEB_BUILD_OPTIONS
Severity: normal
Certainty: certain
Ref: dpkg-buildflags(1)
-Info: The <tt>debian/rules</tt> file sets the DH_BUILD_OPTIONS variable,
+Info: The <tt>debian/rules</tt> file sets the DEB_BUILD_OPTIONS variable,
which will override any user-specified build profile.
.
Please replace with DH_BUILD_MAINT_OPTIONS.
diff --git a/checks/rules.pm b/checks/rules.pm
index 96cb577..2d73da8 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -208,8 +208,8 @@ sub run {
}
}
- if (/^\s*(?:export\s+)?DH_BUILD_OPTIONS\s*:?=/ && keys(%seen) == 0) {
- tag 'debian-rules-sets-DH_BUILD_OPTIONS', "line $.";
+ if (/^\s*(?:export\s+)?DEB_BUILD_OPTIONS\s*:?=/ && keys(%seen) == 0) {
+ tag 'debian-rules-sets-DEB_BUILD_OPTIONS', "line $.";
}
# check generic problem
diff --git a/debian/changelog b/debian/changelog
index 91ae197..0e95adb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,7 +36,7 @@ lintian (2.5.52) UNRELEASED; urgency=medium
* checks/rules.desc:
+ [CL] Clarify wording in debian-rules-parses-dpkg-parsechangelog to
make the justification clearer. (Closes: #865882)
- + [CL] Check for files setting DH_BUILD_OPTIONS instead of
+ + [CL] Check for files setting DEB_BUILD_OPTIONS instead of
DH_BUILD_MAINT_OPTIONS. (Closes: #833691)
* checks/udev.{desc,pm}:
+ [NT] New check by Petter Reinholdtsen.
diff --git a/t/tests/debhelper-dh-build-options/debian/debian/rules b/t/tests/debhelper-deb-build-options/debian/debian/rules
similarity index 72%
rename from t/tests/debhelper-dh-build-options/debian/debian/rules
rename to t/tests/debhelper-deb-build-options/debian/debian/rules
index 4c4e1a4..69a9f01 100755
--- a/t/tests/debhelper-dh-build-options/debian/debian/rules
+++ b/t/tests/debhelper-deb-build-options/debian/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-export DH_BUILD_OPTIONS=nocheck
+export DEB_BUILD_OPTIONS=nocheck
export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify
%:
diff --git a/t/tests/debhelper-deb-build-options/desc b/t/tests/debhelper-deb-build-options/desc
new file mode 100644
index 0000000..4110bae
--- /dev/null
+++ b/t/tests/debhelper-deb-build-options/desc
@@ -0,0 +1,5 @@
+Testname: debhelper-deb-build-options
+Version: 1.0
+Description: Test the value of DEB_BUILD_OPTIONS
+Test-For:
+ debian-rules-sets-DEB_BUILD_OPTIONS
diff --git a/t/tests/debhelper-deb-build-options/tags b/t/tests/debhelper-deb-build-options/tags
new file mode 100644
index 0000000..65fc975
--- /dev/null
+++ b/t/tests/debhelper-deb-build-options/tags
@@ -0,0 +1 @@
+W: debhelper-deb-build-options source: debian-rules-sets-DEB_BUILD_OPTIONS line 3
diff --git a/t/tests/debhelper-dh-build-options/desc b/t/tests/debhelper-dh-build-options/desc
deleted file mode 100644
index fa7d85b..0000000
--- a/t/tests/debhelper-dh-build-options/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: debhelper-dh-build-options
-Version: 1.0
-Description: Test the value of DH_BUILD_OPTIONS
-Test-For:
- debian-rules-sets-DH_BUILD_OPTIONS
diff --git a/t/tests/debhelper-dh-build-options/tags b/t/tests/debhelper-dh-build-options/tags
deleted file mode 100644
index de4b369..0000000
--- a/t/tests/debhelper-dh-build-options/tags
+++ /dev/null
@@ -1 +0,0 @@
-W: debhelper-dh-build-options source: debian-rules-sets-DH_BUILD_OPTIONS line 3
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: