[Pkg-wmaker-commits] [wmaker] 02/02: Remove old-style Debian menu and use only the proplist menu.

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch master
in repository wmaker.

commit 02d7b958d9daf1f842d10802290a5921277c0862
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sun Aug 13 09:22:40 2017 -0400

    Remove old-style Debian menu and use only the proplist menu.
---
 debian/README.Debian                |  9 ++++-----
 debian/changelog                    |  7 +++----
 debian/debianfiles/conf/menu.Debian | 30 ------------------------------
 debian/wmaker-common.examples       |  1 -
 debian/wmaker-common.install        |  2 +-
 debian/wmaker-common.links          |  2 +-
 6 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index a186582..a376dac 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -195,10 +195,9 @@ the root menu.  And that is not a good idea (the reason is left as an
 exercise to the reader, take into account the people that aren't using
 menu.hook as the root menu in the first place).
 
-Still want to use WPrefs to edit you menu? Copy
-/usr/share/doc/wmaker-common/examples/plmenu.Debian into
-~/GNUstep/Defaults/WMRootMenu, start WPrefs, click the Menu Guru (the 9th
-icon, left to right).  Now go read the docs.  That's the reason they are
-there.
+Still want to use WPrefs to edit you menu? Cut and paste the example
+above into ~/GNUstep/Defaults/WMRootMenu, start WPrefs, click the Menu
+Guru (the 9th icon, left to right).  Now go read the docs.  That's the
+reason they are there.
 
 Marcelo E. Magallon <mmagallo at debian.org>, Thr, 1 Apr 1999 18:47:30 -0600
diff --git a/debian/changelog b/debian/changelog
index d32f377..e837009 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,10 +25,9 @@ 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.
+  * Ship our menu as /etc/GNUstep/Defaults/plmenu.Debian and add a symlink
+    to it as /usr/share/WindowMaker/menu.hook to make the menu accessible for
+    upgraded installations.
 
  -- Doug Torrance <dtorrance at piedmont.edu>  Mon, 24 Jul 2017 22:34:23 -0400
 
diff --git a/debian/debianfiles/conf/menu.Debian b/debian/debianfiles/conf/menu.Debian
deleted file mode 100644
index 9192990..0000000
--- a/debian/debianfiles/conf/menu.Debian
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 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/wmaker-common.examples b/debian/wmaker-common.examples
deleted file mode 100644
index c21b522..0000000
--- a/debian/wmaker-common.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/debianfiles/conf/plmenu.Debian
diff --git a/debian/wmaker-common.install b/debian/wmaker-common.install
index 5efde11..57410fc 100644
--- a/debian/wmaker-common.install
+++ b/debian/wmaker-common.install
@@ -5,7 +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/conf/plmenu.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
index f406a73..9b6ea70 100644
--- a/debian/wmaker-common.links
+++ b/debian/wmaker-common.links
@@ -1 +1 @@
-etc/GNUstep/Defaults/menu.Debian usr/share/WindowMaker/menu.hook
+etc/GNUstep/Defaults/plmenu.Debian usr/share/WindowMaker/menu.hook

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