[SCM] Debian package checker branch, master, updated. 55eecc314775c88e18a771e9d9f9b7118ac5dc5c

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 55eecc314775c88e18a771e9d9f9b7118ac5dc5c
Author: Russ Allbery <rra@debian.org>
Date:   Sat Jun 28 19:46:23 2008 -0700

    Warn about DEB_BUILD_OPTS in debian/rules
    
    * checks/rules{,.desc}:
      + [RA] Warn about use of DEB_BUILD_OPTS.  Patch from Raphael Geissert.

diff --git a/checks/rules b/checks/rules
index 238b64d..300d0b9 100644
--- a/checks/rules
+++ b/checks/rules
@@ -113,6 +113,9 @@ while (<RULES>) {
 	/^\t\s*(?:\$[\(\{]MAKE[\}\)]|make)\s(?:.*\s)?-\w*i.*(?:dist)?clean/) {
         tag "debian-rules-ignores-make-clean-error", "line $.";
     }
+    if (/$[\(\{]DEB_BUILD_OPTS[\)\}]/) {
+        tag "debian-rules-uses-DEB_BUILD_OPTS", "line $.";
+    }
 
     # Listing a rule as a dependency of .PHONY is sufficient to make it
     # present for the purposes of GNU make and therefore the Policy
diff --git a/checks/rules.desc b/checks/rules.desc
index 5259dad..f2fd28d 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -64,6 +64,12 @@ 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
+Type: warning
+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-sets-DH_COMPAT
 Type: warning
 Ref: debhelper(7)
diff --git a/debian/changelog b/debian/changelog
index 91f5973..b151539 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ lintian (1.24.2) unstable; urgency=low
       quilt patches when using the 3.0 (quilt) package format.  Fix build
       dependency checking and check all dpatch files.  Patch from Raphaël
       Hertzog.  (Closes: #484549)
+  * checks/rules{,.desc}:
+    + [RA] Warn about use of DEB_BUILD_OPTS.  Patch from Raphael Geissert.
   * checks/scripts:
     + [FL] Apply File::Spec->canonpath() to rpaths to improve
       matching with directories.

-- 
Debian package checker