diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
| commit | d9aad8b00a9f3fb60e456c0e528df90189acb5b3 (patch) | |
| tree | 6b9126d2336c62d1e5533798e7348f6a5723f6ba /abs/core/mythtv | |
| parent | d9a08ac22f9c6661cf3b478927be321274d10794 (diff) | |
| parent | c65b741914b31ac88086e363edc4415eb6aa1686 (diff) | |
| download | linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.zip linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.gz linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
Conflicts:
abs/core/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core/mythtv')
4 files changed, 9 insertions, 26 deletions
diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD index ab70bcd..cf504eb 100755 --- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mythtv pkgver=0.24 -pkgrel=21 +pkgrel=24 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') url="http://www.mythtv.org/" diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml index ebc848b..01b6ffa 100644 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml +++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml @@ -52,7 +52,7 @@ <!--#Check for updates--> <button> <type>UPGRADE</type> - <text>Upgrade LinHES</text> + <text>Update LinHES</text> <action>MENU update.xml</action> </button> <!--#Check for updates--> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml index 5b28833..d2ac3fe 100644 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml +++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml @@ -2,19 +2,8 @@ <button> <type>UPGRADE</type> - <text>Check for updates?</text> - <action>NONE</action> - </button> - - <button> - <type>UPGRADE</type> - <text>Yes</text> + <text>Check for Updates</text> <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action> </button> - - <button> - <type>UPGRADE</type> - <text>No</text> - <action>UPMENU</action> - </button> + </mythmenu> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml index 2ab82ea..64388cb 100644 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml +++ b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml @@ -2,25 +2,19 @@ <button> <type>UPGRADE</type> - <text>Perform updates?</text> - <action>NONE</action> + <text>Install Updates</text> + <action>EXEC sudo /usr/LH/bin/linhes_update2.sh install</action> </button> <button> <type>UPGRADE</type> - <text>Yes</text> + <text>Cancel Updates</text> <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action> </button> - - <button> - <type>UPGRADE</type> - <text>No</text> - <action>UPMENU</action> - </button> <button> <type>UPGRADE</type> - <text>View files to be upgraded.</text> - <action>EXEC sudo /usr/LH/bin/linhes_update3.sh</action> + <text>View Updates</text> + <action>MENU update3.xml</action> </button> </mythmenu> |