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

[SCM] Debian package checker branch, master, updated. 2.3.0-25-g428602a



The following commit has been merged in the master branch:
commit 428602a1995c5eee461411b55df568e798bac412
Author: Russ Allbery <rra@debian.org>
Date:   Wed Dec 30 12:13:16 2009 -0800

    Properly ignore CMakeCache.txt in the debian directory
    
    * checks/cruft:
      + [RA] Fix the regex to properly ignore CMakeCache.txt in the debian
        directory.  Thanks, Aaron M. Ucko.  (Closes: #553264)

diff --git a/checks/cruft b/checks/cruft
index d4c671a..ee19502 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -188,7 +188,7 @@ sub check_diffstat {
         # Check for CMake cache files.  These embed the source path and hence
         # will cause FTBFS on buildds, so they should never be touched in the
         # diff.
-        if ($file =~ m,(^|/)CMakeCache.txt\z, and $file !~ m,/debian/,) {
+        if ($file =~ m,(^|/)CMakeCache.txt\z, and $file !~ m,(^|/)debian/,) {
             tag 'diff-contains-cmake-cache-file', $file;
         }
 
diff --git a/debian/changelog b/debian/changelog
index c075aae..ccbd817 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ lintian (2.3.1) UNRELEASED; urgency=low
   * checks/binaries:
     + [RG] Recognise hppa64 binaries and ignore them on the
       binary-from-other-architecture check for hppa. (Closes: #562788)
+  * checks/cruft:
+    + [RA] Fix the regex to properly ignore CMakeCache.txt in the debian
+      directory.  Thanks, Aaron M. Ucko.  (Closes: #553264)
   * checks/init.d.desc:
     + [RG] Bump severity of init.d-script-sourcing-without-test to serious.
   * checks/init.d{,.desc}:

-- 
Debian package checker


Reply to: