lintian: r593 - in trunk: checks debian testset testset/diffs/debian

[rra@debian.org]

Author: rra
Date: 2006-03-29 07:11:34 +0200 (Wed, 29 Mar 2006)
New Revision: 593

Added:
   trunk/testset/diffs/debian/substvars
Modified:
   trunk/checks/debdiff
   trunk/checks/debdiff.desc
   trunk/debian/changelog
   trunk/testset/tags.diffs
Log:
* checks/debdiff{.desc,}:
  + [RA] Warn if the diff contains debian/substvars.  Based on a patch
    by Michael Ablassmeier.  (Closes: #359646)

Modified: trunk/checks/debdiff
===================================================================
--- trunk/checks/debdiff	2006-03-29 04:52:18 UTC (rev 592)
+++ trunk/checks/debdiff	2006-03-29 05:11:34 UTC (rev 593)
@@ -50,6 +50,9 @@
     $file = $1;
     tag_warn("patch-failure-file-in-diff", $file)
 	if ($file =~ m/\.(orig|rej)$/);
+
+    tag_warn("diff-contains-substvars", $file)
+	if ($file =~ m%^debian/substvars$%);
 }
 close(STAT) or fail("error reading diffstat file: $!");
 

Modified: trunk/checks/debdiff.desc
===================================================================
--- trunk/checks/debdiff.desc	2006-03-29 04:52:18 UTC (rev 592)
+++ trunk/checks/debdiff.desc	2006-03-29 05:11:34 UTC (rev 593)
@@ -24,6 +24,14 @@
  the reason is the location of the original source tarball. dpkg-source
  searches for this in ../package_upstream-version.orig.tar.gz.
 
+Tag: diff-contains-substvars
+Type: warning
+Info: Lintian found a substvars file in the Debian diff for this source 
+ package. The debian/substvars file is usually generated and modified
+ dynamically by debian/rules targets, in which case it must be removed by
+ the clean target.
+Ref: policy 4.9
+
 Tag: source-tar-is-posix-tar
 Type: error
 Info: The source tar archive of this package is made with tar --posix. This

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-29 04:52:18 UTC (rev 592)
+++ trunk/debian/changelog	2006-03-29 05:11:34 UTC (rev 593)
@@ -3,6 +3,9 @@
   * checks/common_data.pm:
     + [RA] Include all combinations of cpu and os from the dpkg cputable
       and ostable files (as of dpkg 1.13.16).  (Closes: #337034, #357433)
+  * checks/debdiff{.desc,}:
+    + [RA] Warn if the diff contains debian/substvars.  Based on a patch
+      by Michael Ablassmeier.  (Closes: #359646)
   * checks/fields:
     + [RA] Allow dpatch in Build-Depends for arch-independent packages if
       it is invoked in clean, build-arch, or binary-arch.

Added: trunk/testset/diffs/debian/substvars
===================================================================
--- trunk/testset/diffs/debian/substvars	2006-03-29 04:52:18 UTC (rev 592)
+++ trunk/testset/diffs/debian/substvars	2006-03-29 05:11:34 UTC (rev 593)
@@ -0,0 +1,2 @@
+# This shouldn't be included in the package; it's normally created
+# dynamically and removed on debian/rules clean.

Modified: trunk/testset/tags.diffs
===================================================================
--- trunk/testset/tags.diffs	2006-03-29 04:52:18 UTC (rev 592)
+++ trunk/testset/tags.diffs	2006-03-29 05:11:34 UTC (rev 593)
@@ -11,6 +11,7 @@
 W: diffs source: configure-generated-file-in-source subdir-good/config.cache
 W: diffs source: configure-generated-file-in-source subdir-good/config.log
 W: diffs source: configure-generated-file-in-source subdir-good/config.status
+W: diffs source: diff-contains-substvars debian/substvars
 W: diffs source: out-of-date-standards-version 3.5.9
 W: diffs: binary-without-manpage diffs
 W: diffs: wrong-bug-number-in-closes l6:#nnnnnn