741573: Update odyx_draft to incorporate keithp_draft elements

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/741573_menu_systems/odyx_draft.txt b/741573_menu_systems/odyx_draft.txt
index 4a35fb52faf396ab1d1ff02c3b5ee58cfeec78c5..dabc8bf7602f17e01816c6605c2c12e80e5c3d5b 100644 (file)
--- a/741573_menu_systems/odyx_draft.txt
+++ b/741573_menu_systems/odyx_draft.txt
@@ -86,28 +86,52 @@ OPTION C:
 
 OPTION D:
 
-Using its power under §6.1.1 to decide on any matter of technical policy:
-
-   1. The Technical Committee resolves that packages for which the
-      Debian menu system currently applies should provide a .desktop
-      file. Applications providing a .desktop file should not
-      provide a Debian menu file.
-
-   2. We further resolve that "menu programs" should not depend on the
+   The Technical Committee has reviewed the underlying technical
+   issues around this question and has resolved that Debian will be
+   best served by migrating away from our own Debian Menu System and
+   towards the common Freedesktop Desktop Entry Specification, and
+   that menu information for applications should not be duplicated in
+   two different formats.
+
+   To encouage this change, we make menu files optional, ask that
+   packages include .desktop files as appropriate and prohibit
+   packages from providing both menu and .desktop files for the same
+   application.
+
+Using its power under §6.1.1 to decide on any matter of technical
+policy, and its power under §6.1.5 to offer advice:
+
+   1. The Technical Committee resolves that packages which provide
+      applications customarily designed for use within a desktop
+      environment should provide a .desktop file conforming to the
+      Freedesktop Desktop Entry Specification.
+
+   2. Packages may provide menu files at the pleasure of the
+      maintainer, but packages providing a .desktop file shall not
+      also provide a menu file for the same application.
+
+   3. We further resolve that "menu programs" should not depend on the
       Debian Menu System and should instead rely on .desktop file
       contents for constructing a list of applications to present to
       the user.
 
-   3. We recommend that the maintainers of the 'menu' package update
-      that package to reflect this increased focus on .desktop files
-      by modifying the 'menu' package to use .desktop files for the
+   4. We advise the maintainers of the 'menu' package to update that
+      package to reflect this increased focus on .desktop files by
+      modifying the 'menu' package to use .desktop files for the
       source of menu information in addition to menu files.
 
-   4. Discussion of the precise relationship between menu file
+   5. Discussion of the precise relationship between menu file
       section/hints values and .desktop file Categories values may be
       defined within the Debian Menu sub-policy and Debian Menu
       System.
 
+   6. The policy change at
+
+      http://anonscm.debian.org/cgit/dbnpolicy/policy.git/commit/?id=ba679bff76
+
+      would comply with this decision if it were revised to require
+      that no package provide a menu file when it provides a .desktop
+      file for the same application.
 
 OPTION Z: