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

lintian: r415 - in trunk: checks debian testset testset/etcfiles/debian



Author: jeroen
Date: 2005-04-13 01:21:38 +0200 (Wed, 13 Apr 2005)
New Revision: 415

Modified:
   trunk/checks/conffiles
   trunk/checks/conffiles.desc
   trunk/debian/changelog
   trunk/testset/etcfiles/debian/conffiles
   trunk/testset/etcfiles/debian/rules
   trunk/testset/tags.etcfiles
Log:
* checks/conffiles:
  + [JvW] Warn on /var files being a conffile too (Closes: #293443)


Modified: trunk/checks/conffiles
===================================================================
--- trunk/checks/conffiles	2005-01-31 22:42:46 UTC (rev 414)
+++ trunk/checks/conffiles	2005-04-12 23:21:38 UTC (rev 415)
@@ -47,15 +47,11 @@
 	tag "duplicate-conffile", "$_";
     }
 
-    if (m,^/?var/lib/games/,o) {
-	tag "score-file-must-not-be-conffile", "$_";
-    }
-
     if (m,^/?usr/,o) {
 	tag "file-in-usr-marked-as-conffile", "$_";
     } else {
-	unless (m,^/?etc/,o or m,^/?var/,o) {
-	    tag "non-etc-or-var-file-marked-as-conffile", "$_";
+	unless (m,^/?etc/,o) {
+	    tag "non-etc-file-marked-as-conffile", "$_";
 	}
     }
 

Modified: trunk/checks/conffiles.desc
===================================================================
--- trunk/checks/conffiles.desc	2005-01-31 22:42:46 UTC (rev 414)
+++ trunk/checks/conffiles.desc	2005-04-12 23:21:38 UTC (rev 415)
@@ -14,10 +14,11 @@
  administrator would not have a chance to modify this configuration
  file.
 
-Tag: non-etc-or-var-file-marked-as-conffile
+Tag: non-etc-file-marked-as-conffile
 Type: warning
-Info: A file installed in some other directory than <tt>/etc</tt> or
- <tt>/var</tt> is marked as conffile.
+Info: A file installed in some other directory than <tt>/etc</tt>
+ is marked as conffile. A conffile typically implies a configuration file, and
+ policy mandates such files to be in /etc
 Status: untested
 Ref: policy 10.7.2
 
@@ -27,10 +28,6 @@
 Info: All entries in the conffile control file should have an absolute
  path specification.
 
-Tag: score-file-must-not-be-conffile
-Type: error
-Info: Game score and data files should not be marked as conffiles.
-
 Tag: duplicate-conffile
 Type: error
 Info: The file is listed more than once in your <tt>debian/conffiles</tt> file.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-01-31 22:42:46 UTC (rev 414)
+++ trunk/debian/changelog	2005-04-12 23:21:38 UTC (rev 415)
@@ -1,3 +1,10 @@
+lintian (1.23.9) unstable; urgency=low
+
+  * checks/conffiles:
+    + [JvW] Warn on /var files being a conffile too (Closes: #293443)
+
+ -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl>  Tue, 12 Apr 2005 23:12:36 +0200
+
 lintian (1.23.8) unstable; urgency=low
 
   The "Hm, this is the team's one year anniversery of maintaining lintian"

Modified: trunk/testset/etcfiles/debian/conffiles
===================================================================
--- trunk/testset/etcfiles/debian/conffiles	2005-01-31 22:42:46 UTC (rev 414)
+++ trunk/testset/etcfiles/debian/conffiles	2005-04-12 23:21:38 UTC (rev 415)
@@ -1 +1,2 @@
 /etc/proper
+/var/lib/foo

Modified: trunk/testset/etcfiles/debian/rules
===================================================================
--- trunk/testset/etcfiles/debian/rules	2005-01-31 22:42:46 UTC (rev 414)
+++ trunk/testset/etcfiles/debian/rules	2005-04-12 23:21:38 UTC (rev 415)
@@ -13,6 +13,8 @@
 	install -m 644 improper $(tmp)/etc
 	ln $(tmp)/etc/improper $(tmp)/etc/improper-link
 	install -d $(tmp)/usr/share/doc/etcfiles
+	install -d $(tmp)/var/lib
+	cp proper $(tmp)/var/lib/foo
 	install -m 644 debian/README.Debian $(tmp)/usr/share/doc/etcfiles
 	install -m 644 debian/changelog $(tmp)/usr/share/doc/etcfiles
 	#gzip -9 $(tmp)/usr/share/doc/etcfiles/changelog

Modified: trunk/testset/tags.etcfiles
===================================================================
--- trunk/testset/tags.etcfiles	2005-01-31 22:42:46 UTC (rev 414)
+++ trunk/testset/tags.etcfiles	2005-04-12 23:21:38 UTC (rev 415)
@@ -3,4 +3,5 @@
 E: etcfiles: file-in-etc-not-marked-as-conffile /etc/improper-link
 E: etcfiles: no-copyright-file
 W: etcfiles source: ancient-standards-version 3.5.0
+W: etcfiles: non-etc-file-marked-as-conffile /var/lib/foo
 W: etcfiles: package-contains-hardlink etc/improper-link -> etc/improper



Reply to: