Merge remote-tracking branch 'origin/testing' into testing

# By Britney Fransen (12) and others
# Via Britney Fransen
* origin/testing:
  mythtv: fixed and cleaned some menus. Closes #846
  v4l-dvb: fix conflicting kernel modules. refs #844
  mythdb-initial: add MiscStatusScript value to initial db. refs #845.
  LinHES-system: remove dup .install
  keylaunch: update .keylaunchrc to run mythtv-setup as user
  rsyslog: increase log retention to 2 weeks
  runit-scripts: enable cron logging to syslog
  premake:initial inclusion. closes #801
  libaacs-git:initial inclusion. closes #801
  aacskeys:initial inclusion. closes #801
  LinHES-system: Add scripts for misc status in MythWeb. closes #845.
  linhes-scripts: tweak myth2mkv. Update version to 0.25-004
  dvb-firmware: add xc5000c firmware. change xc5000 modprobe options. closes #844
  v4l-dvb: update to snapshot from 20120828. refs #844
  LinHES-system: update myth_status.py to work with tuners in error. closes #843
  curlftpfs: Initial Inclusion.
  linhes-scripts: minor changes to myth2mkv
  mythtv:Bumped to latest fixes. Added ./configure items to close #842.
  LinHES-config:7.4 rdt 9th anniversary release.

Conflicts:
	abs/core/LinHES-config/LinHES-release
	abs/core/LinHES-config/PKGBUILD
	abs/core/LinHES-system/PKGBUILD
	abs/core/keylaunch/PKGBUILD
	abs/core/linhes-scripts/PKGBUILD
	abs/core/mythdb-initial/PKGBUILD
	abs/core/mythdb-initial/mc.sql
	abs/core/mythtv/stable-0.25/git_src/git_hash
	abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
	abs/core/rsyslog/PKGBUILD
	abs/core/runit-scripts/PKGBUILD
	abs/core/v4l-dvb/PKGBUILD

1 files changed, 46 insertions, 47 deletions

diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml
index 9d483d3..844647b 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml
@@ -1,78 +1,77 @@
 <mythmenu name="HOST_SETTINGS">
 
    <button>
-      <type>MV_NETWORK_SETUP_MENU</type>
-      <text>Network Settings</text>
-      <action>EXEC  mythinstall -s network </action>
+      <type>MV_ACCESS_SETUP_MENU</type>
+      <text>Access Control</text>
+      <action>EXEC  mythinstall -s accesscontrol </action>
    </button>
-
+   
    <button>
-      <type>MV_NETWORK_SETUP_MENU</type>
-      <text>DDNS Settings</text>
-      <action>EXEC  mythinstall -s ddns </action>
+      <type>MV_ADVANCED_SETUP_MENU</type>
+      <text>Advanced</text>
+      <action>EXEC  mythinstall -s advanced</action>
    </button>
+
    <button>
-      <type>MV_SYSTEM_SETUP_MENU</type>
-      <text>System Type</text>
-      <action>EXEC  mythinstall -s hostype </action>
+      <type>MV_AUDIO_SETUP_MENU</type>
+      <text>Audio</text>
+       <action>EXEC  mythinstall -s sound </action>
    </button>
 
    <button>
-      <type>MV_SCREENSAVER_SETUP_MENU</type>
-      <text>Screensaver Settings</text>
-      <action>EXEC  mythinstall -s screensaver </action>
+      <type>MV_ADVANCED_X_SETUP_MENU</type>
+      <text>Display</text>
+      <action>EXEC  mythinstall -s advancedX</action>
    </button>
-
+   
    <button>
-      <type>MV_IR_SETUP_MENU</type>
-      <text>Remotes</text>
-       <action>EXEC  mythinstall -s ir </action>
+      <type>MV_NETWORK_SETUP_MENU</type>
+      <text>Dynamic DNS</text>
+      <action>EXEC  mythinstall -s ddns </action>
    </button>
-
+   
    <button>
       <type>MV_MISC_SETUP_MENU</type>
-      <text>Miscellanous Settings</text>
+      <text>Miscellanous</text>
       <action>EXEC  mythinstall -s misc </action>
    </button>
-
+   
    <button>
-      <type>MV_SOFTWARE_MENU</type>
-      <text>Software</text>
-      <action>EXEC  mythinstall -s  plugins,software </action>
+      <type>MV_NETWORK_SETUP_MENU</type>
+      <text>Network</text>
+      <action>EXEC  mythinstall -s network </action>
    </button>
-
-
-
+   
    <button>
-      <type>MV_SHUTDOWN_SETUP_MENU</type>
-      <text>Shutdown Settings</text>
-      <action>EXEC  mythinstall -s sleep </action>
+      <type>MV_IR_SETUP_MENU</type>
+      <text>Remotes</text>
+       <action>EXEC  mythinstall -s ir </action>
    </button>
-
+   
    <button>
-      <type>MV_ADVANCED_X_SETUP_MENU</type>
-      <text>Display Settings</text>
-      <action>EXEC  mythinstall -s advancedX</action>
+      <type>MV_SCREENSAVER_SETUP_MENU</type>
+      <text>Screensaver</text>
+      <action>EXEC  mythinstall -s screensaver </action>
    </button>
-
+   
    <button>
-      <type>MV_ADVANCED_SETUP_MENU</type>
-      <text>Advanced Settings</text>
-      <action>EXEC  mythinstall -s advanced</action>
+      <type>MV_SHUTDOWN_SETUP_MENU</type>
+      <text>Shutdown</text>
+      <action>EXEC  mythinstall -s sleep </action>
    </button>
-
+   
    <button>
-      <type>MV_AUDIO_SETUP_MENU</type>
-      <text>Audio Settings</text>
-       <action>EXEC  mythinstall -s sound </action>
+      <type>MV_SOFTWARE_MENU</type>
+      <text>Software</text>
+      <action>EXEC  mythinstall -s  plugins,software </action>
    </button>
-
+   
    <button>
-      <type>MV_ACCESS_SETUP_MENU</type>
-      <text>Access Control</text>
-      <action>EXEC  mythinstall -s accesscontrol </action>
-   </button>
-
+      <type>MV_SYSTEM_SETUP_MENU</type>
+      <text>System Type</text>
+      <action>EXEC  mythinstall -s hostype </action>
+   </button>   
+   
    <button>
       <type>MV_USER_SETUP_MENU</type>
       <text>User Accounts</text>