Policy: Relax /usr/share FHS requirement for directories with mixed content.

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

diff --git a/debian/changelog b/debian/changelog
index 53449b3eb51cedd1f4a1a17933b1c7f6029f63f1..40813ae72a566bac6cc513cd6d8e0cf5f1b64013 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,24 @@
-debian-policy (3.9.6.0) UNRELEASED; urgency=medium
-
-  * Policy: Document the FreeDesktop menu entries and media type declarations.
-    The Debian menu is optionally supported.
-    Wording: Charles Plessy <plessy@debian.org>
-    Seconded: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
-    Seconded: Cyril Brulebois <kibi@debian.org> (for the menu entries)
+debian-policy (3.9.6.0) unstable; urgency=low
+
+  * upgrading-checklist.sgml: remove spurious 'details in' leftover from
+    the HTML transition.  Closes: #740100. Thanks Jakub Wilk.
+  * Fix use of metasyntactic variable in [11.5.1] Web servers and applications
+    Closes: #737730. Thanks Olivier Berger.
+  * Policy: Remove reference to DEHS (dead service)
+    Wording: David Prévot <taffit@debian.org>
+    Seconded: Julian Gilbey <julian@d-and-j.net>
+    Seconded: Charles Plessy <plessy@debian.org>
+    Closes: #731810
+  * Policy: Relax /usr/share FHS requirement for directories with mixed content.
+    Wording: Joey Hess <joeyh@debian.org>
     Seconded: Russ Allbery <rra@debian.org>
-    Closes: #707851
-
+    Seconded: Julien Cristau <jcristau@debian.org>
+    Seconded: Jakub Wilk <jwilk@debian.org>
+    Seconded: Michael Biebl <biebl@debian.org>
+    Closes: #741304
+  * Packaging: refreshed the names of the Policy Editors.
 
- -- Charles Plessy <plessy@debian.org>  Sat, 15 Feb 2014 11:11:24 +0900
+ -- Bill Allombert <ballombe@debian.org>  Thu, 01 May 2014 22:14:14 +0200
 
 debian-policy (3.9.5.0) unstable; urgency=low