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

[SCM] Debian package checker branch, master, updated. 2.5.1-116-gda92b58



The following commit has been merged in the master branch:
commit da92b58f74db5923f2dad02fe18859ebbf016dc8
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jul 17 12:28:26 2011 +0200

    Do not consider "debian/debhelper" a temporary debhelper file

diff --git a/checks/debhelper b/checks/debhelper
index 5895422..c01e6ae 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -283,7 +283,11 @@ foreach my $file (sort readdir(DEBIAN)) {
     } elsif ($file =~ m/^ex\.|\.ex$/i) {
         tag 'dh-make-template-in-source', "debian/$file";
     } elsif ($file =~ m/^(?:.+\.)?debhelper(?:\.log)?$/){
-	push(@indebfiles, $file);
+	# The regex matches "debhelper", but debhelper/Dh_Lib does not
+	# make those, so skip it.
+	if ($file ne 'debhelper') {
+	    push(@indebfiles, $file);
+	}
     } elsif ($file =~ m/^(?:(.*)\.)?maintscript$/) {
 	$seenmaintscript = 1;
     } else {
diff --git a/debian/changelog b/debian/changelog
index 001dc5b..d274e2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,9 @@ lintian (2.5.2) UNRELEASED; urgency=low
     + [NT] Fix a broken regex that caused Lintian skip brace
       expansion checks for some debhelper files.  Thanks to
       Jakub Wilk for the report and the patch.  (Closes: #632883)
+    + [NT] Do not consider "debian/debhelper" a temporary debhelper
+      file.  Some packages uses this a directory to store their
+      debhelper files.
   * checks/debian-source-dir.desc:
     + [NT] Added missing word in the tag description for
       git-patches-not-exported.

-- 
Debian package checker


Reply to: