lintian: r1254 - in trunk: checks debian testset

[rra@debian.org]

Author: rra
Date: 2008-03-07 09:37:05 +0100 (Fri, 07 Mar 2008)
New Revision: 1254

Modified:
   trunk/checks/etcfiles
   trunk/debian/changelog
   trunk/testset/tags.scripts
Log:
* checks/etcfiles:
  + [RA] /etc/init.d/{skeleton,rc,rcS} are not conffiles, and README
    files in /etc need not be.

Modified: trunk/checks/etcfiles
===================================================================
--- trunk/checks/etcfiles	2008-03-07 08:36:23 UTC (rev 1253)
+++ trunk/checks/etcfiles	2008-03-07 08:37:05 UTC (rev 1254)
@@ -61,8 +61,12 @@
     # skip it unless it is a file in /etc
     next unless $file =~ m,^etc, and $perm =~ m,^-,;
 
-    # if there is a /etc/foo, it must be a conffile
-    if (not exists($conffiles{$file})) {
+    # If there is a /etc/foo, it must be a conffile (with a few exceptions).
+    if (not exists($conffiles{$file})
+	and $file !~ m,/README$,
+	and $file ne 'etc/init.d/skeleton'
+	and $file ne 'etc/init.d/rc'
+	and $file ne 'etc/init.d/rcS') {
 	tag "file-in-etc-not-marked-as-conffile", "/$file";
     }
 }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-07 08:36:23 UTC (rev 1253)
+++ trunk/debian/changelog	2008-03-07 08:37:05 UTC (rev 1254)
@@ -12,6 +12,9 @@
     + [RA] Subversion conflicts generate three files, two with revision
       numbers and one with .mine.  Only warn about the revision numbers;
       .mine probably won't occur alone and may be a false positive.
+  * checks/etcfiles:
+    + [RA] /etc/init.d/{skeleton,rc,rcS} are not conffiles, and README
+      files in /etc need not be.
   * checks/scripts:
     + [RA] Attempt to quash some Perl warnings.
   * checks/shared-libs:

Modified: trunk/testset/tags.scripts
===================================================================
--- trunk/testset/tags.scripts	2008-03-07 08:36:23 UTC (rev 1253)
+++ trunk/testset/tags.scripts	2008-03-07 08:37:05 UTC (rev 1254)
@@ -3,7 +3,6 @@
 E: scripts: calls-suidperl-directly ./usr/bin/suidperlfoo
 E: scripts: copyright-file-lacks-pointer-to-perl-license
 E: scripts: duplicate-updaterc.d-calls-in-postrm lsb-other
-E: scripts: file-in-etc-not-marked-as-conffile /etc/init.d/skeleton
 E: scripts: init.d-script-does-not-implement-required-option /etc/init.d/lsb-broken force-reload
 E: scripts: init.d-script-does-not-implement-required-option /etc/init.d/lsb-broken restart
 E: scripts: init.d-script-has-duplicate-lsb-section /etc/init.d/lsb-broken