[SCM] Debian package checker branch, master, updated. 2.2.7-7-g742ae34

["Colin Watson" <cjwatson@canonical.com>]

The following commit has been merged in the master branch:
commit 742ae34dfdc14407f72de44045b90caf1591fb0c
Author: Colin Watson <cjwatson@canonical.com>
Date:   Tue Mar 10 18:43:17 2009 +0000

    Policy 3.8.1 will state that /var/lock and /var/run may be volatile
    
    * checks/files{,.desc}:
      + [CW] Emit dir-or-file-in-var-lock or dir-or-file-in-var-run, as
        appropriate, for packages shipping directories or files in /var/lock
        or /var/run. See policy bug #514326.

diff --git a/checks/files b/checks/files
index 64fd2e9..34178af 100644
--- a/checks/files
+++ b/checks/files
@@ -486,6 +486,13 @@ foreach my $file (sort keys %{$info->index}) {
     elsif ($type ne 'udeb' and $file =~ m,^var/lib/games/.,) {
 	tag "non-standard-dir-in-var", "$file";
     }
+    # ---------------- /var/lock, /var/run
+    elsif ($file =~ m,^var/lock/.,) {
+	tag "dir-or-file-in-var-lock", "$file";
+    }
+    elsif ($file =~ m,^var/run/.,) {
+	tag "dir-or-file-in-var-run", "$file";
+    }
     # ---------------- /var/www
     # Packages are allowed to create /var/www since it's historically been the
     # default document root, but they shouldn't be installing stuff under that
diff --git a/checks/files.desc b/checks/files.desc
index e8ecc83..5a4bbea 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -427,6 +427,20 @@ Severity: important
 Certainty: certain
 Info: Documentation files should be owned by <tt>root/root</tt>.
 
+Tag: dir-or-file-in-var-lock
+Severity: important
+Certainty: certain
+Info: <tt>/var/lock</tt> may be a temporary filesystem, so any directories
+ or files needed there must be created dynamically at boot time.
+Ref: policy 9.3.2
+
+Tag: dir-or-file-in-var-run
+Severity: important
+Certainty: certain
+Info: <tt>/var/run</tt> may be a temporary filesystem, so any directories
+ or files needed there must be created dynamically at boot time.
+Ref: policy 9.3.2
+
 Tag: dir-or-file-in-var-www
 Severity: important
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index f5ecf3e..c39335a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ lintian (2.2.8) UNRELEASED; urgency=low
     + [RA] Using UTF-8 is now a Policy must and hence serious.
   * checks/control-file.desc:
     + [RA] Using UTF-8 is now a Policy must and hence serious.
+  * checks/files{,.desc}:
+    + [CW] Emit dir-or-file-in-var-lock or dir-or-file-in-var-run, as
+      appropriate, for packages shipping directories or files in /var/lock
+      or /var/run. See policy bug #514326.
   * checks/menus{,.desc}:
     + [RA] Revert the change to not require update-menus in postinst.
       This is still needed due to #518919.  Don't require update-menus in
diff --git a/t/tests/files-general/debian/debian/dirs b/t/tests/files-general/debian/debian/dirs
new file mode 100644
index 0000000..6ba3980
--- /dev/null
+++ b/t/tests/files-general/debian/debian/dirs
@@ -0,0 +1,2 @@
+var/lock/lintian
+var/run/lintian
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index 6b3df73..677feae 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -1 +1,3 @@
+E: files-general: dir-or-file-in-var-lock var/lock/lintian/
+E: files-general: dir-or-file-in-var-run var/run/lintian/
 W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/22x22/lintian-16x16.png 16x16

-- 
Debian package checker