[SCM] Debian package checker branch, master, updated. 2.5.4-177-g35c6de9
The following commit has been merged in the master branch:
commit 35c6de91030b7d1c2b9ffd3a1ddbe0839b3badd7
Author: Niels Thykier <niels@thykier.net>
Date: Mon Feb 20 00:06:00 2012 +0100
Remove references to yada as it is being removed
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/po-debconf b/checks/po-debconf
index 3f2cdc9..423bfa3 100644
--- a/checks/po-debconf
+++ b/checks/po-debconf
@@ -88,22 +88,9 @@ for (@lang_templates) {
tag 'stray-translated-debconf-templates', $_ unless /templates\.in$/;
}
-# yada builds its template and po/POTFILES.in dynamically at build time, so
-# excuse yada from some of these checks (including the out of date templates
-# check).
my $missing_files = 0;
-my $yada = 0;
-if (open (RULES, '<', "$debfiles/rules")) {
- local $_;
- while (<RULES>) {
- if (m%^\t\s*(?:perl debian/)?yada\s%) {
- $yada = 1;
- $missing_files = 1;
- }
- }
-}
-if (!$yada && -f "$debfiles/po/POTFILES.in") {
+if ( -f "$debfiles/po/POTFILES.in") {
open(POTFILES, '<', "$debfiles/po/POTFILES.in")
or fail("Can't open debfiles/po/POTFILES.in.");
while (<POTFILES>) {
@@ -118,7 +105,7 @@ if (!$yada && -f "$debfiles/po/POTFILES.in") {
}
}
close(POTFILES);
-} elsif (!$yada) {
+} else {
tag 'missing-potfiles-in';
$missing_files = 1;
}
diff --git a/checks/rules b/checks/rules
index bdba0b6..b41acbb 100644
--- a/checks/rules
+++ b/checks/rules
@@ -82,7 +82,6 @@ my @RULE_CLEAN_DEPENDS =
[ $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*(\S+=\S+\s+)*quilt\s' ],
- [ yada => qr'^\t\s*yada\s' ],
);
# The following targets are required per Policy.
diff --git a/debian/changelog b/debian/changelog
index 9ae840e..564cb5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -117,6 +117,10 @@ lintian (2.5.5) UNRELEASED; urgency=low
any package (according to lintian.d.o).
* checks/nmu:
+ [JW] Properly handle uploader names with commas.
+ * checks/po-debconf:
+ + [NT] Remove special handling for packages using yada.
+ * checks/rules:
+ + [NT] Remove check for missing build-depends on yada.
* checks/scripts:
+ [NT] Accepted patch from Evan Broder to check for missing
versioned pre-depends on dpkg when using maintscript helper.
--
Debian package checker
Reply to: