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

[SCM] Debian package checker branch, master, updated. 2.5.11-157-g1499bd7



The following commit has been merged in the master branch:
commit 1499bd78f490cd7e136101f13f48c04aa4a9abfd
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Feb 15 15:17:40 2013 +0100

    c/rules: Remove ant1.7 as alternative to ant
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/rules b/checks/rules
index 32686ca..4aad759 100644
--- a/checks/rules
+++ b/checks/rules
@@ -39,7 +39,7 @@ my $DEPRECATED_MAKEFILES = Lintian::Data->new('rules/deprecated-makefiles');
 # than the default is required.
 our @GLOBAL_CLEAN_DEPENDS =
     (
-     [ 'ant | ant1.7' => qr'^include\s*/usr/share/cdbs/1/rules/ant\.mk' ],
+     [ ant => qr'^include\s*/usr/share/cdbs/1/rules/ant\.mk' ],
      [ cdbs => qr'^include\s+/usr/share/cdbs/' ],
      [ cdbs => qr'^include\s+/usr/share/R/debian/r-cran\.mk' ],
      [ dbs => qr'^include\s+/usr/share/dbs/' ],
@@ -73,7 +73,7 @@ my @GLOBAL_DEPENDS =
 # depend on, this package is allowed (and required) in Build-Depends.
 my @RULE_CLEAN_DEPENDS =
     (
-     [ 'ant | ant1.7' => qr'^\t\s*(\S+=\S+\s+)*ant\s' ],
+     [ ant => qr'^\t\s*(\S+=\S+\s+)*ant\s' ],
      [ debhelper => qr'^\t\s*dh_.+' ],
      [ 'dh-ocaml, ocaml-nox | ocaml' => qr'^\t\s*dh_ocamlinit\s' ],
      [ dpatch => qr'^\t\s*(\S+=\S+\s+)*dpatch\s' ],
diff --git a/debian/changelog b/debian/changelog
index ccf0e36..5755546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -91,6 +91,9 @@ lintian (2.5.12) UNRELEASED; urgency=low
     + [NT] Retire unneeded-build-dep-on-quilt, it is only a pedantic
       tag and apparently not too accurate.  Thanks to Charles Plessy
       and Frank Kuester for the reports.  (Closes: #615516, #681061)
+  * checks/rules:
+    + [NT] Remove ant1.7 as alternative to ant as ant1.7 has been
+      removed from Wheezy.
   * checks/shared-libs:
     + [NT] Special case gcc packages when looking for dev symlinks.
       gcc stores its dev symlinks in some special directories.

-- 
Debian package checker


Reply to: