From: Charles Plessy <plessy@debian.org>
Date: Sat, 15 Feb 2014 02:45:27 +0000 (+0900)
Subject: Changelog and checklist entries for #707851.
X-Git-Url: https://git.donarmstrong.com/?p=debian%2Fdebian-policy.git;a=commitdiff_plain;h=05460e902ccbd1db4bcaa6d987eaf45156a90a59

Changelog and checklist entries for #707851.
---

diff --git a/debian/changelog b/debian/changelog
index 2332986..53449b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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)
+    Seconded: Russ Allbery <rra@debian.org>
+    Closes: #707851
+
+
+ -- Charles Plessy <plessy@debian.org>  Sat, 15 Feb 2014 11:11:24 +0900
+
 debian-policy (3.9.5.0) unstable; urgency=low
 
   * Policy: Document the Package-List field.
diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 19ddd19..e1e789b 100644
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -34,6 +34,28 @@ picking your way through this list.
 
 <chapt> The checklist
 
+<sect id="3.9.6.0"> Version 3.9.6.0
+<p>
+
+Not yet released.
+
+</p><p><taglist>
+<tag>9.6</tag>
+  <item>The requirements for the <em>FreeDesktop menu entries</em> are now
+  documented, in particular regarding the icon size and format, when to display
+  the entry, and where to coordinate the integration of the entries in menus of
+  specific desktop systems. The Debian menu is optionally supported.
+  </item>
+<tag>9.7</tag>
+  <item>Packages already shipping <em>FreeDesktop menu entries</em> should use
+  them to associate applications with media types.  Only in the absence of
+  desktop entries, a file in <em>mailcap</em> format should be used.
+  Associations between media types and files should be done via upstream
+  databases, nevertheless it is also possible to register these associations
+  directly in Debian if needed.
+  </item>
+</taglist></p>
+
 <sect id="3.9.5.0"> Version 3.9.5.0
 <p>
 
@@ -93,7 +115,6 @@ Released October, 2013.
 <tag>virtual</tag>
   <item><tt>mp3-decoder</tt> and <tt>mp3-encoder</tt> are removed.</item>
 </taglist></p>
-
 <sect id="3.9.4.0"> Version 3.9.4.0
 <p>