Merge branch 'master' into bug571776-rra

[debian/debian-policy.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ebc5cedfba2d213d89234ef921e61c2a3c3bdc44..d11c1fd9a6e476a333d0b49a19abf320e2c6e3e8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 debian-policy (3.9.4.0) UNRELEASED; urgency=low
 
+  * Resynchronize the archive section list with ftp-master, adding tasks.
+    Patch from Charles Plessy.  (Closes: #670429)
   * Policy: Copyright files must be encoded in UTF-8
     Wording: Russ Allbery <rra@debian.org>
     Seconded: Guillem Jover <guillem@debian.org>
@@ -23,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