741573: Clarify option D as Plessy+

This explicitly makes option D an extension of the existing proposal
from Charles Plessy, and not a completely different proposal.

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 4badca1f37412ec4a8fdb70da5c76976c881da99..d980605249a135ae1ba5719a37b9a2d8377ac373 100644 (file)
--- a/741573_menu_systems/odyx_draft.txt
+++ b/741573_menu_systems/odyx_draft.txt
@@ -101,14 +101,12 @@ OPTION D:
 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.
+   1. The Technical Committee adopts the changes proposed by Charles
+      Plessy in ba679bff[1].
 
-   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.
+   2. In addition to those changes, the Technical Committee resolves
+      that 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
@@ -125,12 +123,7 @@ policy, and its power under §6.1.5 to offer advice:
       defined within the Debian Menu sub-policy and Debian Menu
       System.
 
-   6. The policy change by Charles Plessy in ba679bff76[1]
-      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.
-
-   7. Further modifications to the menu policy are allowed using the
+   6. Further modifications to the menu policy are allowed using the
       normal policy modification process.
 
 [1]: http://anonscm.debian.org/cgit/dbnpolicy/policy.git/commit/?id=ba679bff76f5b9152f43d5bc901b9b3aad257479