Merge branch 'testing'

# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
  LinHES-config: during install don't kill off lirc.  This keeps the remote active all the way to the finish
  Change version numbers to 8.0  to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
  LinHES-conifig: mv_install.py  for the last partition don't go all the way to the end.  Gotta leave room for gpt tables.
  xf86-video-ati: xorg ati driver.
  LinHES-config: timezip.py  add syncing up of parental lvl passwords and starting level with MBE.
  LinHES-system: correct the logic for breaking out of the wmctrl loop.   As written it would break out of the inner loop..but not the 60 iteration loop.
  e16_theme_settings:  remove slide-in prop for new windows.   For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
  LinHES-config, mythinstall:  change  case of hd_pvr and   serial to all lower refs #902
  zilog-firmware:   firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters  but including the firmware just in case someone really wants to
  linhes-udev-rules:  added hdprv_lirc rule. All of these lirc rules are limited to exactly one device.  If more then one device is present then only the last device in init will get the symlink
  runit-scripts:  fix logging for igdeamon,   add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
  LinHES-system:   add lh_system_restore and lh_system_backup.  These scripts are called from the mythmenu. refs #900
  iguanair: rebuild with python 2.7
  LinHES-system: msg_daemon.py fix  init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
  linhes-udev-rules:  add rules for mce,streamzap,serial  lirc devices.
  mythinstall: recompile for matching libs
  mythtv:  latest .25-fixes  and change mythbackup/restore call lh_system_$op   to replace mythbackup/mythrestore.  mythbackup no longer works correctly with the new windowmanager
  linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
  LinHES-config, supplimental-web:  Fix proxy numbering for Ceton infiniTV
  linhes-system:  add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
  ...

9 files changed, 201 insertions, 114 deletions

diff --git a/abs/core/wmaker_settings/GNUstep/Defaults/WMRootMenu b/abs/core/wmaker_settings/GNUstep/Defaults/WMRootMenu
index 508c70e..8beca25 100644
--- a/abs/core/wmaker_settings/GNUstep/Defaults/WMRootMenu
+++ b/abs/core/wmaker_settings/GNUstep/Defaults/WMRootMenu
@@ -1,105 +1,39 @@
 (
-  Applications,
+  "Window Maker",
+  (Applications, OPEN_MENU, "/usr/share/wm_data/GNUstep/Defaults/aux_menu"),
+  (MythTV, OPEN_MENU, "/usr/share/wm_data/GNUstep/Defaults/myth_menu"),
   (
-    Info,
-    ("Info Panel", INFO_PANEL),
-    (Legal, LEGAL_PANEL),
-    ("System Console", EXEC, xconsole),
-    ("System Load", SHEXEC, "xosview || xload"),
-    ("Process List", EXEC, "xterm -e top"),
-    ("Manual Browser", EXEC, xman)
-  ),
-  (Run..., EXEC, "%a(Run,Type command to run:)"),
-  (XTerm, EXEC, "xterm -sb"),
-  ("Mozilla Firefox", EXEC, firefox),
-  (Workspaces, WORKSPACE_MENU),
-  (
-    Applications,
-    (Gimp, SHEXEC, "gimp >/dev/null"),
-    (Ghostview, EXEC, "ghostview %a(Enter file to view)"),
-    (Xpdf, EXEC, "xpdf %a(Enter PDF to view)"),
-    (Abiword, EXEC, abiword),
-    (Dia, EXEC, dia),
-    (
-      OpenOffice.org,
-      (OpenOffice.org, EXEC, ooffice),
-      (Writer, EXEC, oowriter),
-      (Spreadsheet, EXEC, oocalc),
-      (Draw, EXEC, oodraw),
-      (Impress, EXEC, ooimpress)
-    ),
-    (
-      Editors,
-      (XEmacs, EXEC, xemacs),
-      (Emacs, EXEC, emacs),
-      (XJed, EXEC, xjed),
-      (VI, EXEC, "xterm -e vi"),
-      (GVIM, EXEC, gvim),
-      (NEdit, EXEC, nedit),
-      (Xedit, EXEC, xedit)
-    ),
-    (
-      Multimedia,
-      (
-        XMMS,
-        (XMMS, EXEC, xmms),
-        ("XMMS play/pause", EXEC, "xmms -t"),
-        ("XMMS stop", EXEC, "xmms -s")
-      ),
-      ("Xine video player", EXEC, xine),
-      (MPlayer, EXEC, mplayer)
-    )
-  ),
-  (
-    Utils,
-    (Calculator, EXEC, xcalc),
-    (
-      "Window Properties",
-      SHEXEC,
-      "xprop | xmessage -center -title 'xprop' -file -"
-    ),
-    ("Font Chooser", EXEC, xfontsel),
-    (Magnify, EXEC, wmagnify),
-    (Colormap, EXEC, xcmap),
-    ("Kill X Application", EXEC, xkill)
-  ),
-  (
-    Selection,
-    (Copy, SHEXEC, "echo '%s' | wxcopy"),
-    ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
-    (Navigate, EXEC, "mozilla %s"),
-    ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
-  ),
-  (
-    Commands,
-    ("Hide Others", HIDE_OTHERS),
-    ("Show All", SHOW_ALL),
-    ("Arrange Icons", ARRANGE_ICONS),
-    (Refresh, REFRESH),
-    (Lock, EXEC, "xlock -allowroot -usefirst")
+    "Service Menu",
+    OPEN_MENU,
+    "/usr/share/wm_data/GNUstep/Defaults/system_menu"
   ),
+  (Run..., EXEC, "%A(Run, Type command:)"),
   (
     Appearance,
     (
       Themes,
       OPEN_MENU,
-      "-noext /usr/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
+      "-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
     ),
     (
       Styles,
       OPEN_MENU,
-      "-noext /usr/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
+      "-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
     ),
     (
       "Icon Sets",
       OPEN_MENU,
-      "-noext /usr/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
+      "-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
     ),
     (
       Background,
       (
         Solid,
-        (Black, EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+        (
+          Black,
+          EXEC,
+          "wdwrite WindowMaker WorkspaceBack '(solid, \"black\")'"
+        ),
         (
           Blue,
           EXEC,
@@ -113,7 +47,7 @@
         (
           Bluemarine,
           EXEC,
-          "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"
+          "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"
         ),
         (
           Purple,
@@ -123,7 +57,7 @@
         (
           Wheat,
           EXEC,
-          "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"
+          "wdwrite WindowMaker WorkspaceBack '(solid, \"wheat4\")'"
         ),
         (
           "Dark Gray",
@@ -146,68 +80,73 @@
         (
           Sky,
           EXEC,
-          "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"
+          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"blue4\", \"white\"'"
         ),
         (
           "Blue Shades",
           EXEC,
-          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"
+          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\"'"
         ),
         (
           "Indigo Shades",
           EXEC,
-          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"
+          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\"'"
         ),
         (
           "Purple Shades",
           EXEC,
-          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"
+          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\"'"
         ),
         (
           "Wheat Shades",
           EXEC,
-          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"
+          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\"'"
         ),
         (
           "Grey Shades",
           EXEC,
-          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"
+          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\"'"
         ),
         (
           "Wine Shades",
           EXEC,
-          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'"
+          "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\"'"
         )
       ),
       (
         Images,
         OPEN_MENU,
-        "-noext /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
+        "-noext $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
       )
     ),
     (
       "Save Theme",
-      SHEXEC,
-      "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""
+      EXEC,
+      "getstyle -p \"%a(Theme name, Name to save theme as)\""
     ),
     (
       "Save IconSet",
       SHEXEC,
-      "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""
-    ),
-    (
-      "Preferences Utility",
-      EXEC,
-      "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs"
+      "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name,Name to save icon set as)\""
     )
   ),
+  (Workspaces, WORKSPACE_MENU),
   (
-    Session,
+    Workspace,
+    ("Hide Others", HIDE_OTHERS),
+    ("Show All", SHOW_ALL),
+    ("Arrange Icons", ARRANGE_ICONS),
+    (Refresh, REFRESH),
     ("Save Session", SAVE_SESSION),
-    ("Clear Session", CLEAR_SESSION),
-    ("Restart Window Maker", RESTART),
-    ("Start BlackBox", RESTART, blackbox),
-    ("Start IceWM", RESTART, icewm),
-    (Exit, EXIT)
-  )
+    ("Clear Session", CLEAR_SESSION)
+  ),
+  (
+    "Regenerate application menu",
+    EXEC,
+    "/usr/share/wm_data/GNUstep/wm_menu.sh"
+  ),
+  ("Configure Window Maker", EXEC, WPrefs),
+  ("Info Panel", INFO_PANEL),
+  ("Restart Window Maker", RESTART),
+  ("Exit Window Maker", EXIT)
 )
diff --git a/abs/core/wmaker_settings/GNUstep/Defaults/WMState.vnc b/abs/core/wmaker_settings/GNUstep/Defaults/WMState.vnc
new file mode 100644
index 0000000..dbd9373
--- /dev/null
+++ b/abs/core/wmaker_settings/GNUstep/Defaults/WMState.vnc
@@ -0,0 +1,98 @@
+{
+  Dock = {
+    Applications768 = (
+      {
+        Forced = No;
+        Name = Logo.WMDock;
+        BuggyApplication = No;
+        AutoLaunch = No;
+        Position = "0,0";
+        Lock = Yes;
+        Command = "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs";
+      },
+      {
+        Forced = No;
+        Name = xterm.XTerm;
+        BuggyApplication = No;
+        AutoLaunch = No;
+        Position = "0,1";
+        Lock = No;
+        Command = xterm;
+      },
+      {
+        Forced = No;
+        Name = "mythtv-setup.Mythtv-setup";
+        BuggyApplication = No;
+        AutoLaunch = No;
+        Position = "0,2";
+        Lock = No;
+        Command = "mythtv-setup --geometry 800x600";
+      }
+    );
+    Applications = (
+      {
+        Forced = No;
+        Name = Logo.WMDock;
+        BuggyApplication = No;
+        AutoLaunch = No;
+        Position = "0,0";
+        Lock = Yes;
+        Command = "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs";
+      },
+      {
+        Forced = No;
+        Name = xterm.XTerm;
+        BuggyApplication = No;
+        AutoLaunch = No;
+        Position = "0,1";
+        Lock = No;
+        Command = xterm;
+      },
+      {
+        Forced = No;
+        Name = "mythtv-setup.Mythtv-setup";
+        BuggyApplication = No;
+        AutoLaunch = No;
+        Position = "0,2";
+        Lock = No;
+        Command = "mythtv-setup --geometry 800x600";
+      }
+    );
+    Lowered = No;
+    Position = "-64,0";
+  };
+  Clip = {
+    Forced = No;
+    Name = Logo.WMClip;
+    BuggyApplication = No;
+    AutoLaunch = No;
+    Position = "960,704";
+    Lock = No;
+    Command = "-";
+  };
+  Workspaces = (
+    {
+      Clip = {
+        AutoRaiseLower = No;
+        AutoCollapse = No;
+        Applications = ();
+        Collapsed = No;
+        AutoAttractIcons = No;
+        Lowered = Yes;
+      };
+      Name = Main;
+    },
+    {
+      Clip = {
+        AutoRaiseLower = No;
+        AutoCollapse = No;
+        Applications = ();
+        Collapsed = No;
+        AutoAttractIcons = No;
+        Lowered = Yes;
+      };
+      Name = "Workspace 2";
+    }
+  );
+}
+
diff --git a/abs/core/wmaker_settings/GNUstep/Defaults/WMWindowAttributes b/abs/core/wmaker_settings/GNUstep/Defaults/WMWindowAttributes
index d359650..ca6c8ea 100644
--- a/abs/core/wmaker_settings/GNUstep/Defaults/WMWindowAttributes
+++ b/abs/core/wmaker_settings/GNUstep/Defaults/WMWindowAttributes
@@ -22,4 +22,9 @@
     NoMiniaturizeButton = Yes;
     Omnipresent = Yes;
   };
+
+  "mythtv-setup.Mythtv-setup" = {
+    Icon = "gnome-nettool.png";
+  };
+
 }
diff --git a/abs/core/wmaker_settings/GNUstep/Defaults/aux_menu b/abs/core/wmaker_settings/GNUstep/Defaults/aux_menu
new file mode 100644
index 0000000..0bce5c5
--- /dev/null
+++ b/abs/core/wmaker_settings/GNUstep/Defaults/aux_menu
@@ -0,0 +1,20 @@
+"Applications" MENU
+ "Internet" MENU
+  "Avahi SSH Server Browser" EXEC /usr/bin/bssh
+  "Avahi VNC Server Browser" EXEC /usr/bin/bvnc
+ "Internet" END
+ "Programming" MENU
+  "Qt Assistant" EXEC /usr/bin/assistant
+  "Qt Designer" EXEC /usr/bin/designer
+  "Qt Linguist" EXEC /usr/bin/linguist
+ "Programming" END
+ "Sound & Video" MENU
+  "QT V4L2 test Utility" EXEC qv4l2
+ "Sound & Video" END
+ "System Tools" MENU
+  "Avahi Zeroconf Browser" EXEC /usr/bin/avahi-discover
+  "Tilda" EXEC tilda
+  "UXTerm" EXEC uxterm
+  "XTerm" EXEC xterm
+ "System Tools" END
+"Applications" END
diff --git a/abs/core/wmaker_settings/GNUstep/Defaults/myth_menu b/abs/core/wmaker_settings/GNUstep/Defaults/myth_menu
new file mode 100644
index 0000000..e626aea
--- /dev/null
+++ b/abs/core/wmaker_settings/GNUstep/Defaults/myth_menu
@@ -0,0 +1,4 @@
+"Applications" MENU
+  "MythFrontend" EXEC mythfrontend
+  "MythTV setup" EXEC mythtv-setup
+"Applications" END
diff --git a/abs/core/wmaker_settings/GNUstep/Defaults/system_menu b/abs/core/wmaker_settings/GNUstep/Defaults/system_menu
new file mode 100644
index 0000000..fb2750c
--- /dev/null
+++ b/abs/core/wmaker_settings/GNUstep/Defaults/system_menu
@@ -0,0 +1,18 @@
+"Service Menu" MENU
+  "Access " EXEC sudo mythinstall -s accesscontrol
+  "Add/Remove software " EXEC sudo mythinstall -s plugins,software
+  "Advanced" EXEC sudo mythinstall -s advanced
+  "Audio Settings" EXEC sudo mythinstall -s sound
+  "Display " EXEC sudo mythinstall -s advancedX
+  "Dynamic DNS"  EXEC sudo mythinstall -s ddns
+  "File shares" EXEC sudo mythinstall -s fileshare
+  "Miscellanouse settings" EXEC sudo mythinstall -s misc
+  "Network " EXEC sudo mythinstall -s network
+  "Remotes " EXEC sudo mythinstall -s ir
+  "Screensaver " EXEC sudo mythinstall -s screensaver
+  "Shutdown settings " EXEC sudo mythinstall -s sleep
+  "System Type " EXEC sudo mythinstall -s hostype
+  "User accounts" EXEC sudo mythinstall -s user
+  "VNC service " EXEC sudo mythinstall -s vnc
+  "Web security" EXEC sudo mythinstall -s webuser
+"Service Menu" END
diff --git a/abs/core/wmaker_settings/GNUstep/wm_menu.sh b/abs/core/wmaker_settings/GNUstep/wm_menu.sh
new file mode 100755
index 0000000..b0dce82
--- /dev/null
+++ b/abs/core/wmaker_settings/GNUstep/wm_menu.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+xdg_menu --format WindowMaker --root-menu /etc/xdg/menus/arch-applications.menu >/usr/share/wm_data/GNUstep/Defaults/aux_menu
diff --git a/abs/core/wmaker_settings/PKGBUILD b/abs/core/wmaker_settings/PKGBUILD
index 1cc7a99..8b29e41 100644
--- a/abs/core/wmaker_settings/PKGBUILD
+++ b/abs/core/wmaker_settings/PKGBUILD
@@ -1,13 +1,13 @@
 pkgname=wmaker_settings
 pkgver=1.0
-pkgrel=10
+pkgrel=18
 pkgdesc="Default settings for windowmaker+ theme"
 depends=('windowmaker' 'linhes-scripts>=7-24')
 source=()
-arch=('i686')
+arch=('i686' 'x86_64')
 groups=(alt_wm)
 install=wmaker_settings.install
-configdir=/data/
+configdir=/usr/share/wm_data
 build() {
 	echo $startdir
   	mkdir -p $pkgdir/$configdir
diff --git a/abs/core/wmaker_settings/wmaker_settings.install b/abs/core/wmaker_settings/wmaker_settings.install
index 3418844..54fb477 100644
--- a/abs/core/wmaker_settings/wmaker_settings.install
+++ b/abs/core/wmaker_settings/wmaker_settings.install
@@ -1,5 +1,6 @@
 # This is a default template for a post-install scriptlet.  You can
 # remove any functions you don't need (and this header).
+configdir=/usr/share/wm_data
 
 # arg 1:  the new package version
 pre_install() {
@@ -9,11 +10,11 @@ pre_install() {
 
 # arg 1:  the new package version
 post_install() {
-   chown -R 1000:100 /data/GNUstep
-   setfacl -d -R -m u:1000:rwx /data/GNUstep
-   setfacl -R -m u:1000:rwx /data/GNUstep
-   setfacl -d -R -m o::rwx /data/GNUstep
-   setfacl  -R -m o::rwx /data/GNUstep
+   chown -R 1000:100 $configdir/GNUstep
+   setfacl -d -R -m u:1000:rwx $configdir/GNUstep
+   setfacl -R -m u:1000:rwx $configdir/GNUstep
+   setfacl -d -R -m o::rwx $configdir/GNUstep
+   setfacl  -R -m o::rwx $configdir/GNUstep
 
 }