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

[SCM] Debian package checker branch, master, updated. 2.2.17-47-g8e347b3



The following commit has been merged in the master branch:
commit 8c2a6e2689e7dfe35855c9c991ae2e96e80d1363
Author: Russ Allbery <rra@debian.org>
Date:   Thu Nov 12 22:06:44 2009 -0800

    Allow CMakeCache.txt files in the debian directory
    
    * checks/cruft:
      + [RA] Allow CMakeCache.txt files in the debian directory.  Thanks,
        Aaron M. Ucko.  (Closes: #553264)

diff --git a/checks/cruft b/checks/cruft
index d5b1279..47d2bf8 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,) {
+        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 e00f340..882ce06 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -72,6 +72,8 @@ lintian (2.2.18) UNRELEASED; urgency=low
   * checks/cruft:
     + [FL] Add automake1.11 to list of autotools packages.  Thanks,
       Laurent Bigonville.  (Closes: #551051)
+    + [RA] Allow CMakeCache.txt files in the debian directory.  Thanks,
+      Aaron M. Ucko.  (Closes: #553264)
   * checks/debconf.desc:
     + [FL] Remove experimental flag from template-uses-unsplit-choices.
       This was only done to not disrupt the lenny freeze.  Thanks,

-- 
Debian package checker


Reply to: