From 67a4f4e69e692b2f0fa6ad045236b5c70147cf4b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 23 Nov 2013 17:59:26 -0600
Subject: mythtv: add back some deps; refs #933.

Add item descriptions. Change update to push back to main menu so user doesn't need to manually exit Service Menu
---
 abs/core/mythtv/stable-0.27/git_src/git_hash       |  2 +-
 abs/core/mythtv/stable-0.27/mythtv/PKGBUILD        | 15 ++--
 .../stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml  | 92 +++++++++++++---------
 .../mythtv/stable-0.27/mythtv/menu-xml/linhes.xml  | 11 ++-
 .../stable-0.27/mythtv/menu-xml/mythbackup.xml     |  8 +-
 .../stable-0.27/mythtv/menu-xml/mythrestore.xml    | 11 ++-
 .../mythtv/stable-0.27/mythtv/menu-xml/update.xml  |  4 +-
 .../mythtv/stable-0.27/mythtv/menu-xml/update2.xml |  6 +-
 8 files changed, 90 insertions(+), 59 deletions(-)

diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index aa97d7b..31427cb 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-a6c1d5336502a97f25b747e0a036fde4d25fd2ee
+552fdc0e1eb538db847f2aedd54a12764b609a76
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 6ec4e55..c4e0f40 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,17 +1,18 @@
 pkgname=mythtv
 pkgver=0.27
-pkgrel=3
+pkgrel=4
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org/"
 license=('GPL')
-depends=('avahi' 'fftw' 'glew' 'lame' 'libass' 'libavc1394' 'libcdio'
-         'libcec' 'libiec61883' 'libva' 'libvpx' 'libxinerama' 'libxml2'
-         'lirc-utils' 'mysql-clients' 'mysql-python' 'openssl'
-         'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww'
-         'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'taglib' 'urlgrabber'
-         'x264' 'xmltv')
+depends=('avahi' 'faad2' 'fftw' 'glew' 'lame' 'libass' 'libavc1394' 'libcdio'
+         'libcec' 'libcrystalhd-git' 'libiec61883' 'libva' 'libvdpau' 'libvpx'
+         'libxinerama' 'libxrandr' 'libxml2' 'lirc-utils' 'mysql-clients'
+         'mysql-python' 'openssl' 'perl-date-manip' 'perl-dbd-mysql'
+         'perl-io-socket-inet6' 'perl-libwww' 'perl-math-round'
+         'perl-net-upnp' 'perl-soap-lite' 'perl-xml-sax' 'python-pycurl'
+         'python2-lxml' 'qt' 'qtwebkit' 'taglib' 'urlgrabber' 'x264' 'xmltv')
 makedepends=('mesa' 'libgl' 'yasm' 'git' 'rsync')
 replaces=()
 groups=('pvr')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml
index b1fa6b5..644e2a3 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml
@@ -1,98 +1,114 @@
 <mythmenu name="HOST_SETTINGS">
     <button>
         <type>MV_ACCESS_SETUP_MENU</type>
-        <text>Access Control</text>
+        <text>Access</text>
+        <description>Manage which LinHES Settings can be used</description>
         <action>EXEC  mythinstall -s accesscontrol </action>
     </button>
 
     <button>
-        <type>MV_SOFTWARE_MENU</type>
-        <text>Add/Remove software</text>
-        <action>EXEC  mythinstall -s  plugins,software </action>
-    </button>
-
-    <button>
         <type>MV_ADVANCED_SETUP_MENU</type>
         <text>Advanced</text>
+        <description>Settings for Boot Screen, CallerID &amp; starting MythFrontend</description>
         <action>EXEC  mythinstall -s advanced</action>
     </button>
 
     <button>
         <type>MV_AUDIO_SETUP_MENU</type>
-        <text>Audio Settings</text>
+        <text>Audio</text>
+        <description>Settings for Audio drivers, cards &amp; devices</description>
         <action>EXEC  mythinstall -s sound </action>
     </button>
 
     <button>
         <type>MV_ADVANCED_X_SETUP_MENU</type>
         <text>Display</text>
+        <description>Set the display resolution</description>
         <action>EXEC  mythinstall -s advancedX</action>
     </button>
 
     <button>
         <type>MV_NETWORK_SETUP_MENU</type>
         <text>Dynamic DNS</text>
+        <description>Settings for your dyndns.com account</description>
         <action>EXEC  mythinstall -s ddns </action>
     </button>
 
    <button>
-       <type>MV_FILESHARES_MENU</type>
-       <text>File Shares</text>
-       <action>EXEC  mythinstall -s fileshare</action>
+        <type>MV_FILESHARES_MENU</type>
+        <text>File Sharing</text>
+        <description>Settings for file sharing via NFS or SMB</description>
+        <action>EXEC  mythinstall -s fileshare</action>
    </button>
 
    <button>
-       <type>MV_MISC_SETUP_MENU</type>
-       <text>Miscellanous</text>
-       <action>EXEC  mythinstall -s misc </action>
+        <type>MV_MISC_SETUP_MENU</type>
+        <text>Miscellanous</text>
+        <description>Set timezone, shortcuts &amp; automatic updates</description>
+        <action>EXEC  mythinstall -s misc </action>
    </button>
 
    <button>
-       <type>MV_NETWORK_SETUP_MENU</type>
-       <text>Network</text>
-       <action>EXEC  mythinstall -s network </action>
+        <type>MV_NETWORK_SETUP_MENU</type>
+        <text>Network</text>
+        <description>Settings for the network device &amp; hostname</description>
+        <action>EXEC  mythinstall -s network </action>
    </button>
 
+    <button>
+        <type>MV_SOFTWARE_MENU</type>
+        <text>Programs</text>
+        <description>Manage programs for the LinHES system</description>
+        <action>EXEC  mythinstall -s  plugins,software </action>
+    </button>
+
    <button>
-       <type>MV_IR_SETUP_MENU</type>
-       <text>Remotes</text>
-       <action>EXEC  mythinstall -s ir </action>
+        <type>MV_IR_SETUP_MENU</type>
+        <text>Remotes</text>
+        <description>Settings for remotes, receivers &amp; blasters</description>
+        <action>EXEC  mythinstall -s ir </action>
    </button>
 
    <button>
-       <type>MV_SCREENSAVER_SETUP_MENU</type>
-       <text>Screensaver</text>
-       <action>EXEC  mythinstall -s screensaver </action>
+        <type>MV_SCREENSAVER_SETUP_MENU</type>
+        <text>Screensaver</text>
+        <description>Set the Screensaver program and settings</description>
+        <action>EXEC  mythinstall -s screensaver </action>
    </button>
 
    <button>
-       <type>MV_SHUTDOWN_SETUP_MENU</type>
-       <text>Shutdown Settings</text>
-       <action>EXEC  mythinstall -s sleep </action>
+        <type>MV_VNC_SETUP_MENU</type>
+        <text>Screen Sharing</text>
+        <description>Settings for VNC and XVNC screen sharing</description>
+        <action>EXEC  mythinstall -s vnc </action>
    </button>
 
    <button>
-       <type>MV_SYSTEM_SETUP_MENU</type>
-       <text>System Type</text>
-       <action>EXEC  mythinstall -s hostype </action>
+        <type>MV_SHUTDOWN_SETUP_MENU</type>
+        <text>Shutdown</text>
+        <description>Set when to turn of the LinHES system</description>
+        <action>EXEC  mythinstall -s sleep </action>
    </button>
 
    <button>
-       <type>MV_USER_SETUP_MENU</type>
-       <text>User Accounts</text>
-       <action>EXEC  mythinstall -s user </action>
+        <type>MV_SYSTEM_SETUP_MENU</type>
+        <text>System Type</text>
+        <description>Settings for LinHES system type, pointer size &amp; MythWelcome</description>
+        <action>EXEC  mythinstall -s hostype </action>
    </button>
 
    <button>
-       <type>MV_VNC_SETUP_MENU</type>
-       <text>VNC Service</text>
-       <action>EXEC  mythinstall -s vnc </action>
+        <type>MV_USER_SETUP_MENU</type>
+        <text>User Accounts</text>
+        <description>Manage Users on the LinHES system</description>
+        <action>EXEC  mythinstall -s user </action>
    </button>
 
    <button>
-       <type>MV_WEBACCESS_SETUP_MENU</type>
-       <text>Web Security</text>
-       <action>EXEC  mythinstall -s webuser </action>
+        <type>MV_WEBACCESS_SETUP_MENU</type>
+        <text>Web Security</text>
+        <description>Manage the password for the local website</description>
+        <action>EXEC  mythinstall -s webuser </action>
    </button>
 
 </mythmenu>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml
index 342766d..b661b23 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/linhes.xml
@@ -2,7 +2,7 @@
 
     <button>
         <type>SETUP_GENERAL</type>
-        <text>MythTV Configuration</text>
+        <text>MythTV Settings</text>
         <text lang="IT">Impostazioni</text>
         <text lang="ES">Configuración</text>
         <text lang="DE">Zubehör / Konfiguration</text>
@@ -26,27 +26,29 @@
         <alttext lang="ET">Sätted</alttext>
         <alttext lang="RU">Ð~]аÑ~AÑ~BÑ~@ойки</alttext>
         <alttext lang="AR">تضبÙ~Jطات</alttext>
-        <description>Configure MythTV and plugins</description>
+        <description>Configure MythTV and Plugins</description>
         <description lang="DE">MythTV und Plugins konfigurieren</description>
         <action>MENU util_menu.xml</action>
     </button>
 
    <button>
      <type>LINHES_SETUP</type>
-     <text>LinHES Configuration</text>
-     <description>Configure LinHES</description>
+     <text>LinHES Settings</text>
+     <description>Configure the LinHES System</description>
      <action>MENU HOST_SETTINGS.xml</action>
    </button>
 
    <button>
      <type>BACKUP</type>
      <text>Backup LinHES</text>
+     <description>Backup the LinHES System</description>
      <action>MENU mythbackup.xml</action>
    </button>
 
    <button>
      <type>RESTORE</type>
      <text>Restore LinHES</text>
+     <description>Restore the LinHES System</description>
      <action>MENU mythrestore.xml</action>
    </button>
 
@@ -54,6 +56,7 @@
    <button>
      <type>UPGRADE</type>
      <text>Update LinHES</text>
+     <description>Update the LinHES System</description>
      <action>MENU update.xml</action>
    </button>
 <!--#Check for updates-->
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml
index 7890d88..61dc4d3 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythbackup.xml
@@ -1,7 +1,7 @@
 <mythmenu name="LinHES">
    <button>
      <type>BACKUP</type>
-     <text>Do you wish to backup?</text>
+     <text>Backup Now?</text>
      <description></description>
      <action>NONE</action>
    </button>
@@ -9,12 +9,14 @@
    <button>
      <type>BACKUP</type>
      <text>Yes</text>
+     <description>Start Backup</description>
      <action>EXEC sudo /usr/LH/bin/lh_system_backup &amp;</action>
    </button>
 
    <button>
-     <type>BACKUP</type>
+     <type>JUMP_RELOAD_THEME</type>
      <text>No</text>
-     <action>UPMENU</action>
+     <description>Return to Main Menu</description>
+     <action>JUMP Reload Theme</action>
    </button>
 </mythmenu>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml
index 161f13f..c4025c5 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mythrestore.xml
@@ -2,20 +2,23 @@
 
    <button>
      <type>RESTORE</type>
-     <text>Do you wish to restore?</text>
-     <description>This will restore from most recent backup.</description>
+     <text>Restore Now?</text>
+     <description>This will restore from the most recent backup.</description>
      <action>NONE</action>
    </button>
 
    <button>
      <type>RESTORE</type>
      <text>Yes</text>
+     <description>Start Restore</description>
      <action>EXEC sudo /usr/LH/bin/lh_system_restore &amp;</action>
    </button>
 
    <button>
-     <type>BACKUP</type>
+     <type>JUMP_RELOAD_THEME</type>
      <text>No</text>
-     <action>UPMENU</action>
+     <description>Return to Main Menu</description>
+     <action>JUMP Reload Theme</action>
    </button>
+
 </mythmenu>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
index d2ac3fe..802774b 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
@@ -1,9 +1,11 @@
 <mythmenu name="LinHES">
 
    <button>
-     <type>UPGRADE</type>
+     <type>JUMP Reload Theme</type>
      <text>Check for Updates</text>
+     <description>Search for LinHES system updates</description>
      <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action>
+     <action>JUMP Reload Theme</action>
    </button>
 
 </mythmenu>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
index 64388cb..ed527fd 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
@@ -3,18 +3,22 @@
    <button>
      <type>UPGRADE</type>
      <text>Install Updates</text>
+     <description>Install updates for the LinHES system</description>
      <action>EXEC sudo /usr/LH/bin/linhes_update2.sh install</action>
    </button>
 
    <button>
-     <type>UPGRADE</type>
+     <type>JUMP_RELOAD_THEME</type>
      <text>Cancel Updates</text>
+     <description>Return to Main Menu</description>
      <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action>
+     <action>JUMP Reload Theme</action>
    </button>
 
    <button>
      <type>UPGRADE</type>
      <text>View Updates</text>
+     <description>Displays the packages to be updated</description>
      <action>MENU update3.xml</action>
    </button>
 </mythmenu>
-- 
cgit v0.12