Merge branch 'master' into bug23712-rra

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

diff --git a/debian/changelog b/debian/changelog
index 410f8793b8af48772a4a6576718b79e342174736..d8f3535fe7ad7979ea9e744196ecc034ed56a5c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,11 @@ debian-policy (3.9.2.0) UNRELEASED; urgency=low
     Seconded: Aurelien Jarno <aurelien@aurel32.net>
     Seconded: Raphael Hertzog <hertzog@debian.org>
     Closes: #619186
+  * Policy: Significant additions to maintainer script documentation
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Steve Langasek <vorlon@debian.org>
+    Seconded: Raphaël Hertzog <hertzog@debian.org>
+    Closes: #504880
   * Virtual: Added mailx as a new virtual package
     Wording: Russ Allbery <rra@debian.org>
     Seconded: Raphaël Hertzog <hertzog@debian.org>
@@ -58,6 +63,9 @@ debian-policy (3.9.2.0) UNRELEASED; urgency=low
     list of files generated from org source.  (Closes: #594274)
   * Fix URLs under www.freedesktop.org to avoid permanent redirects.
     Thanks, David Prévot.  (Closes: #606869)
+  * Add a cross-reference to the Pre-Depends requirement in 3.5 to section
+    7.2 where Pre-Depends is defined.  Thanks, Mattias Ellert and Jonathan
+    Nieder.  (Closes: #599944)
 
  -- Russ Allbery <rra@debian.org>  Thu, 12 Aug 2010 10:47:47 -0700