[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.3-36-g57fb9f8



The following commit has been merged in the master branch:
commit 57fb9f83b2887e97f6d747d2758fbf5e5f43acf9
Author: Jakub Wilk <jwilk@debian.org>
Date:   Thu Sep 29 20:08:08 2011 +0200

    checks/rules: Also consider "dh [...] --with=X"
    
    Previously only "dh [...] --with X" could trigger a tag for missing
    build-depends.
    
    Acked-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/rules b/checks/rules
index a0fdb1d..9d81ce5 100644
--- a/checks/rules
+++ b/checks/rules
@@ -76,13 +76,13 @@ my @RULE_CLEAN_DEPENDS =
     (
      [ 'ant | ant1.7' => qr'^\t\s*(\S+=\S+\s+)*ant\s' ],
      [ debhelper => qr'^\t\s*dh_.+' ],
-     [ 'dh-ocaml, ocaml-nox | ocaml' => qr'^\t\s*(?:dh_ocamlinit|dh\s.*--with\s+(?:\S+,)*ocaml)\s' ],
+     [ 'dh-ocaml, ocaml-nox | ocaml' => qr'^\t\s*(?:dh_ocamlinit|dh\s.*--with(?:=|\s+)(?:\S+,)*ocaml)\s' ],
      [ dpatch => qr'^\t\s*(\S+=\S+\s+)*dpatch\s' ],
      [ 'po-debconf' => qr'^\t\s*debconf-updatepo\s' ],
      [ $PYTHON_DEPEND => qr'^\t\s*python\s', 'missing-python-build-dependency' ],
      [ $PYTHON3_DEPEND => qr'^\t\s*python3\s', 'missing-python-build-dependency' ],
      [ $ANYPYTHON_DEPEND => qr'\ssetup\.py\b', 'missing-python-build-dependency' ],
-     [ quilt => qr'^\t\s*dh\s.*--with\s+(?:\S+,)*quilt' ],
+     [ quilt => qr'^\t\s*dh\s.*--with(?:=|\s+)(?:\S+,)*quilt' ],
      [ quilt => qr'^\t\s*(\S+=\S+\s+)*quilt\s' ],
      [ yada => qr'^\t\s*yada\s' ],
     );
diff --git a/debian/changelog b/debian/changelog
index f815751..d7d12e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ lintian (2.5.4) UNRELEASED; urgency=low
       (Closes: #641983)
     + [JW] Improve "linked against libvga.so" test.  This avoid
       setuid-binary false-positives.  (Closes: #642038)
+  * checks/rules:
+    + [JW] Fixed false negative "missing-build-dependency" when using
+      "dh --with=X" rather than "dh --with X".  (Closes: #643714)
   * checks/scripts:
     + [RA] Exclude files ending in *.erb from several shell script
       checks.  ERB is a Ruby templating language, so these will probably

-- 
Debian package checker


Reply to: