Merge branch 'testing' of git@linhes.org:linhes_pkgbuild into testing

7 files changed, 8 insertions, 16 deletions

diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 62e2e0c..21a084b 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jams
 pkgname=mythinstall
 pkgver=3
-pkgrel=25
+pkgrel=26
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=i686
 depends=('mythtv>=0.25')
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash
index 8df731d..a49d4a9 100644
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.25/git_src/git_hash
@@ -1 +1 @@
-2a2af9f7f7b66c13b7cb4e65149acbf6088f4cbf
+c22ac5272ac23a6a8a45653aaf8804339cc06a4a
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash_web b/abs/core/mythtv/stable-0.25/git_src/git_hash_web
index 0bcf85d..814e09b 100644
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash_web
+++ b/abs/core/mythtv/stable-0.25/git_src/git_hash_web
@@ -1 +1 @@
-1d056f77dc29045008b52b82e90bc935ff1ab948
+8c43d8da31d738c75ec6abc9daff2772b16310c8
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
index 2c3db17..e6afd7b 100644
--- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=0.25
-pkgrel=1
+pkgrel=2
 
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index aaa1a12..43f4b25 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mythtv
 pkgver=0.25
-pkgrel=4
+pkgrel=5
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
@@ -118,7 +118,7 @@ package() {
 
   # patch the xml LinHES style
   cp -r ${startdir}/menu-xml/*.xml ${pkgdir}/usr/share/mythtv/themes/defaultmenu/
-  mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/
+#  mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/
   cd ${pkgdir}/usr/share/mythtv
   patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1
   patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1
@@ -136,7 +136,7 @@ package() {
 
 md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
          '2babd4b8e146a7538d18dcd55695b0be'
-         '55c079404303ec4edeb1a8af1cf16597'
+         'c4db7784c5107ae846fd795a4dabe0bc'
          'f735805a80b0d1180dee01f9df1b7004'
          'f407d6af23e74a49540755420f84fa58'
          '5469d9921b726db750b991c87d226158')
diff --git a/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch b/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch
index 5fbcddf..ebc6264 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch
+++ b/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch
@@ -1232,14 +1232,6 @@ diff --git a/mythtv/programs/mythutil/mythutil.pro b/mythtv/programs/mythutil/my
 index 774528f..5be3ec7 100644
 --- a/mythtv/programs/mythutil/mythutil.pro
 +++ b/mythtv/programs/mythutil/mythutil.pro
-@@ -3,6 +3,7 @@ include ( ../../version.pro )
- include ( ../programs-libs.pro )
- 
- QT += network sql
-+QT += xml
- 
- TEMPLATE = app
- CONFIG += thread
 @@ -10,7 +11,7 @@ TARGET = mythutil
  target.path = $${PREFIX}/bin
  INSTALLS = target
diff --git a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
index f78c224..8d4e6a6 100644
--- a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweb
 pkgver=0.25
-pkgrel=1
+pkgrel=2
 
 commit_hash=`cat ../git_src/git_hash_web`