From: Russ Allbery <rra@debian.org>
Date: Tue, 21 Aug 2012 23:55:13 +0000 (-0700)
Subject: Merge branch 'master' into bug571776-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=52ad20d192fa0583a5697031570693cc3bfe6d50;hp=59460a5707731bd88ae9a54571ceb398e9f41114;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug571776-rra
---

diff --git a/debian/changelog b/debian/changelog
index 3fb60d8..d11c1fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,11 @@ debian-policy (3.9.4.0) UNRELEASED; urgency=low
     Seconded: Charles Plessy <plessy@debian.org>
     Seconded: Guillem Jover <guillem@debian.org>
     Closes: #654958
+  * Policy: Document restrictions on the use of /run for wheezy
+    Wording: Roger Leigh <rleigh@debian.org>
+    Seconded: Charles Plessy <plessy@debian.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Closes: #676561
 
  -- Russ Allbery <rra@debian.org>  Sat, 17 Mar 2012 16:30:33 -0700
 
diff --git a/policy.sgml b/policy.sgml
index 87b3030..5d2105e 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -6962,6 +6962,12 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
 		  in <file>/run</file> should be stored on a temporary
 		  file system.
 		</p>
+		<p>
+		  Packages must not assume the <file>/run</file>
+		  directory exists or is usable without a dependency
+		  on <tt>initscripts (>= 2.88dsf-13.3)</tt> until the
+		  stable release of Debian supports <file>/run</file>.
+		</p>
 	      </item>
               <item>
                 <p>
diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 480fef6..233e8c2 100644
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -57,6 +57,11 @@ Unreleased.
   at build time.  This is used to ensure that the archive meets license
   requirements for providing source for all binaries.
   </item>
+<tag>9.1.1</tag>
+  <item>Packages must not assume the <file>/run</file> directory exists or
+  is usable without a dependency on <tt>initscripts (>= 2.88dsf-13.3)</tt>
+  until the stable release of Debian supports <file>/run</file>.
+  </item>
 <tag>12.5</tag>
   <item>All copyright files must be encoded in UTF-8.
   </item>