debian: Remove /etc/X11/WindowMaker folder

The path /etc/X11/WindowMaker is not needed now. The files were
deleted or moved to /usr/share/WindowMaker. Some files were the
same in /etc/X11/WindowMaker and /usr/share/WindowMaker.

The configuration file menu.hook is moved to /etc/GNUstep/Defaults

Duplicated:
 - wmmacros
 - appearence.menu (copied & generated).
 - background.menu

Removed:
 - menu.prehook
 - menu.posthook

Moved:
 - menu.hook (generated).

debian/changelog

@@ -1,3 +1,16 @@
+wmaker (0.95.2-1+git-1) unstable; urgency=low
+
+  * Patch 53_Debian_WMState.diff changed, because the WMState file
+    in upstream is now different. Now, the dock launch WPrefs.
+  * Removed /etc/X11/WindowMaker files.
+    * Removed from debian/wmaker-common.dirs
+    * Removed (duplicated) files in debian/wmaker-common.install
+    * New path for menu.hook: /usr/share/WindowMaker
+      * Changed in the menu-method files (wmaker and wmappearance.
+    * Removed menu.posthook and menu.prehook.
+
+ -- Rodolfo García Peñas (kix) <kix@kix.es>  Tue, 21 Feb 2012 21:32:31 +0100
+
 wmaker (0.95.2-1) unstable; urgency=low
 
   * New upstream version 0.95.2 [Closes: #69669, #486542, #270877]

debian/debianfiles/menu/wmappearance

@@ -6,7 +6,7 @@ compat="menu-1"
 #!include menu.h
 
 genmenu="appearance.menu"
-rootprefix="/etc/X11/WindowMaker"
+rootprefix="/usr/share/WindowMaker"
 userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}") "/Library/WindowMaker"
 treewalk=(M)
 

debian/patches/53_Debian_WMState.diff

@@ -3,8 +3,17 @@ Author: Rodolfo García Peñas (kix) <kix@kix.es>
 Last-Update: 2012-01-09
 --- a/WindowMaker/Defaults/WMState.in
 +++ b/WindowMaker/Defaults/WMState.in
-@@ -10,14 +10,14 @@
-         DropCommand = "wmsetbg -u -t %d";
+@@ -2,7 +2,7 @@
+   Dock = {
+     Applications = (
+       {
+-        Command = "#wprefs#";
++        Command = "/usr/bin/WPrefs";
+         Name = Logo.WMDock;
+         AutoLaunch = No;
+         Forced = No;
+@@ -10,8 +10,8 @@
+         Lock = Yes;
        },
        {
 -	Command = xterm;
@@ -14,10 +23,3 @@ Last-Update: 2012-01-09
  	AutoLaunch = No;
  	Forced = No;
  	Position = "0,1";
-       },
-       {
--	Command = "#wprefs#";
-+	Command = "/usr/bin/WPrefs";
- 	Name = groupLeader.WPrefs;
- 	AutoLaunch = No;
- 	Forced = No;

debian/wmaker-common.dirs

@@ -1,6 +1,5 @@
 etc/menu-methods
 etc/GNUstep/Defaults
-etc/X11/WindowMaker
 usr/bin
 usr/sbin
 usr/share/doc/wmaker

debian/wmaker-common.install

@@ -129,8 +129,6 @@ usr/share/lib/GNUstep/System/Applications/WPrefs.app/tiff/*.tiff
 debian/debianfiles/wmaker			usr/bin
 debian/debianfiles/upgrade-windowmaker-defaults usr/sbin
 # Theme
-debian/debianfiles/menu/menu.prehook		etc/X11/WindowMaker
-debian/debianfiles/menu/menu.posthook		etc/X11/WindowMaker
 debian/debianfiles/Theme/Debian			usr/share/WindowMaker/Themes
 debian/debianfiles/Theme/debian.tiff		usr/share/WindowMaker/Backgrounds
 # Configuration
@@ -140,11 +138,8 @@ debian/debianfiles/conf/WMWindowAttributes	etc/GNUstep/Defaults
 debian/debianfiles/conf/WMRootMenu		etc/GNUstep/Defaults
 debian/debianfiles/conf/WindowMaker		etc/GNUstep/Defaults
 debian/debianfiles/wmaker-common.desktop	usr/share/xsessions
-usr/share/WindowMaker/wmmacros			etc/X11/WindowMaker
 # Menu
 debian/debianfiles/menu/wmappearance		etc/menu-methods
-WindowMaker/appearance.menu			etc/X11/WindowMaker
-WindowMaker/background.menu			etc/X11/WindowMaker
 # READMES, from the temporal path (see README section in debian/rules)
 README.po					usr/share/doc/wmaker
 README.definable-cursor				usr/share/doc/wmaker

debian/wmaker.menu-method

@@ -7,7 +7,7 @@ compat="menu-1";
 outputencoding="UTF-8"
 
 genmenu="menu.hook"
-rootprefix="/etc/X11/WindowMaker/"
+rootprefix="/usr/share/WindowMaker"
 userprefix=shell("echo -n /${GNUSTEP_USER_ROOT-GNUstep}") "/Library/WindowMaker/"
 treewalk="(M)"
 rootsection="/Debian"
@@ -34,12 +34,12 @@ startmenu= "\n" \
            ifelse( \
                 title(), \
                 "\"" mytitle() "\" MENU", \
-                "Debian MENU\n\n#include <menu.prehook>" \
+                "Debian MENU\n\n" \
            ) \
            "\n"
 endmenu=   ifelse( \
                 title(), \
                 "\"" mytitle() "\" END", \
-                "\n#include <menu.posthook>\n\nDebian END" \
+                "\n\nDebian END" \
            ) \
            "\n"