[Pkg-wmaker-commits] [wmaker] 03/04: Make our menu useable by refering to "menu.hook".

[Andreas Metzler]

This is an automated email from the git hooks/post-receive script.

ametzler pushed a commit to branch master
in repository wmaker.

commit 8aa83db17700c716ced585e2ce69dc4a28235661
Author: Andreas Metzler <ametzler at bebt.de>
Date:   Mon Aug 7 14:40:12 2017 +0200

    Make our menu useable by refering to "menu.hook".
    
    Ship our menu  (in classic format) as /etc/GNUstep/Defaults/menu.Debian
    and add a symlink to it as /usr/share/WindowMaker/menu.hook to make the
    menu accessible for upgraded installations. Also ship the menu in
    PropList format in /usr/share/doc/wmaker-common/examples/plmenu.Debian.
---
 debian/changelog                                   |  4 +++
 debian/debianfiles/conf/WMRootMenu                 | 30 +---------------------
 debian/debianfiles/conf/menu.Debian                | 30 ++++++++++++++++++++++
 .../debianfiles/conf/{WMRootMenu => plmenu.Debian} |  0
 debian/wmaker-common.examples                      |  1 +
 debian/wmaker-common.install                       |  1 +
 debian/wmaker-common.links                         |  1 +
 7 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 502f496..8d61383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,10 @@ wmaker (0.95.8-2) UNRELEASED; urgency=medium
     on upgrades and purge.
   * Because of the moved manpage (which in turn is needed for using
     dh_installwm) wmaker breaks/replaces wmaker-common (<< 0.95.8-2~).
+  * Ship our menu (in classic format) as /etc/GNUstep/Defaults/menu.Debian and
+    add a symlink to it as /usr/share/WindowMaker/menu.hook to make the menu
+    accessible for upgraded installations. Also ship the menu in PropList
+    format in /usr/share/doc/wmaker-common/examples/plmenu.Debian.
 
  -- Doug Torrance <dtorrance at piedmont.edu>  Mon, 24 Jul 2017 22:34:23 -0400
 
diff --git a/debian/debianfiles/conf/WMRootMenu b/debian/debianfiles/conf/WMRootMenu
index e65b933..e86eda4 100644
--- a/debian/debianfiles/conf/WMRootMenu
+++ b/debian/debianfiles/conf/WMRootMenu
@@ -1,29 +1 @@
-(
-  Debian,
-  (
-    Applications,
-    OPEN_PLMENU,
-    "|| wmmenugen -parser:xdg /usr/share/applications/"
-  ),
-  (Run..., EXEC, "%A(Run,Type command to run)"),
-  (
-    "Window Maker",
-    ("Info Panel ...", INFO_PANEL),
-    ("Legal Panel ...", LEGAL_PANEL),
-    (Preferences, EXEC, WPrefs),
-    ("Refresh screen", REFRESH),
-    (Restart, RESTART)
-  ),
-  (
-    WorkSpace,
-    (Appearance, OPEN_MENU, appearance.menu),
-    ("Arrange Icons", ARRANGE_ICONS),
-    ("Clear Session", CLEAR_SESSION),
-    ("Hide Others", HIDE_OTHERS),
-    ("Save Session", SAVE_SESSION),
-    ("Show All", SHOW_ALL),
-    (Workspaces, WORKSPACE_MENU)
-  ),
-  (Exit, EXIT),
-  ("Exit session", SHUTDOWN)
-)
+"menu.hook"
diff --git a/debian/debianfiles/conf/menu.Debian b/debian/debianfiles/conf/menu.Debian
new file mode 100644
index 0000000..9192990
--- /dev/null
+++ b/debian/debianfiles/conf/menu.Debian
@@ -0,0 +1,30 @@
+/* Root Menu definition for WindowMaker
+ * This menu is in old (not-PropList) because we want to include it in 
+ * ~/GNUstep/Defaults/WMRootMenu with a single line containing just
+ * "menu.hook"
+ * (/usr/share/WindowMaker/menu.hook is a symlink pointing to
+ * /etc/GNUstep/Defaults/menu.Debian)
+ * This currently is only supported for old-style menus.
+ */
+Debian MENU
+  "Applications" OPEN_PLMENU "|| wmmenugen -parser:xdg /usr/share/applications/"
+  "Run..." EXEC "%A(Run,Type command to run)"
+  "Window Maker" MENU
+    "Info Panel ..."  INFO_PANEL
+    "Legal Panel ..."  LEGAL_PANEL
+    "Preferences"  EXEC WPrefs
+    "Refresh screen"  REFRESH
+    "Restart"  RESTART
+  "Window Maker" END
+  "WorkSpace" MENU
+    "Appearance"  OPEN_MENU appearance.menu
+    "Arrange Icons"  ARRANGE_ICONS
+    "Clear Session"  CLEAR_SESSION
+    "Hide Others"  HIDE_OTHERS
+    "Save Session"  SAVE_SESSION
+    "Show All"  SHOW_ALL
+    "Workspaces"  WORKSPACE_MENU
+  "WorkSpace" END
+    "Exit"  EXIT
+    "Exit session"  SHUTDOWN
+Debian END
diff --git a/debian/debianfiles/conf/WMRootMenu b/debian/debianfiles/conf/plmenu.Debian
similarity index 100%
copy from debian/debianfiles/conf/WMRootMenu
copy to debian/debianfiles/conf/plmenu.Debian
diff --git a/debian/wmaker-common.examples b/debian/wmaker-common.examples
new file mode 100644
index 0000000..c21b522
--- /dev/null
+++ b/debian/wmaker-common.examples
@@ -0,0 +1 @@
+debian/debianfiles/conf/plmenu.Debian
diff --git a/debian/wmaker-common.install b/debian/wmaker-common.install
index b1698f0..5efde11 100644
--- a/debian/wmaker-common.install
+++ b/debian/wmaker-common.install
@@ -5,6 +5,7 @@ debian/debianfiles/Themes/debian.tiff		usr/share/WindowMaker/Backgrounds
 debian/debianfiles/conf/WMRootMenu		etc/GNUstep/Defaults
 debian/debianfiles/conf/WMWindowAttributes	etc/GNUstep/Defaults
 debian/debianfiles/conf/WindowMaker		etc/GNUstep/Defaults
+debian/debianfiles/conf/menu.Debian		etc/GNUstep/Defaults
 debian/debianfiles/wmaker			usr/bin
 debian/debianfiles/wmaker-common.desktop	usr/share/xsessions
 etc/GNUstep/Defaults/WMGLOBAL
diff --git a/debian/wmaker-common.links b/debian/wmaker-common.links
new file mode 100644
index 0000000..f406a73
--- /dev/null
+++ b/debian/wmaker-common.links
@@ -0,0 +1 @@
+etc/GNUstep/Defaults/menu.Debian usr/share/WindowMaker/menu.hook

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git