[SCM] Debian package checker branch, master, updated. 2.3.3-17-gac4f93d
The following commit has been merged in the master branch:
commit ac4f93d4ccfcc3f7427be574cc67874cb3941507
Author: Russ Allbery <rra@debian.org>
Date: Sat Mar 20 13:58:04 2010 -0700
Allow ant1.7 to satisfy an ant build dependency
* checks/rules:
+ [RA] Allow ant1.7 to satisfy a build requirement for ant. Thanks,
Rene Engelhard. (Closes: #572430)
diff --git a/checks/rules b/checks/rules
index 230d52e..bc4e62c 100644
--- a/checks/rules
+++ b/checks/rules
@@ -33,7 +33,7 @@ our $PYTHON_DEPEND = 'python | python-dev | python-all | python-all-dev | '
# than the default is required.
our @GLOBAL_CLEAN_DEPENDS =
(
- [ ant => qr'^include\s*/usr/share/cdbs/1/rules/ant\.mk' ],
+ [ 'ant | ant1.7' => 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/' ],
@@ -68,7 +68,7 @@ my @GLOBAL_DEPENDS =
# depend on, this package is allowed (and required) in Build-Depends.
my @RULE_CLEAN_DEPENDS =
(
- [ ant => qr'^\t\s*(\S+=\S+\s+)*ant\s' ],
+ [ 'ant | ant1.7' => qr'^\t\s*(\S+=\S+\s+)*ant\s' ],
[ debhelper => qr'^\t\s*dh_.+' ],
[ dpatch => qr'^\t\s*(\S+=\S+\s+)*dpatch\s' ],
[ "po-debconf" => qr'^\t\s*debconf-updatepo\s' ],
diff --git a/debian/changelog b/debian/changelog
index 1df3bba..112d9db 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ lintian (2.3.4) UNRELEASED; urgency=low
+ [RG] Update package-depends-on-hardcoded-libc exception to also
exclude eglibc. Based on a patch from Cyril Brulebois.
(Closes: #573398)
+ * checks/rules:
+ + [RA] Allow ant1.7 to satisfy a build requirement for ant. Thanks,
+ Rene Engelhard. (Closes: #572430)
* checks/scripts:
+ [ADB] Update the list of octave interpreters, adding octave3.2
(Closes: #574048) and removing octave2.1 (only available in lenny
--
Debian package checker
Reply to: