Merge branch 'master' of mihanson@knoppmyth.net:LinHES-PKGBUILD

21 files changed, 49 insertions, 45 deletions

diff --git a/abs/core-testing/filesystem/PKGBUILD b/abs/core-testing/filesystem/PKGBUILD
index b68b73a..aca2a86 100644
--- a/abs/core-testing/filesystem/PKGBUILD
+++ b/abs/core-testing/filesystem/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=filesystem
 pkgver=2009.01
-pkgrel=3
+pkgrel=4
 pkgdesc="Base filesystem"
 arch=(i686 x86_64)
 license=('GPL')
@@ -18,25 +18,6 @@ backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd
 source=(group issue nsswitch.conf securetty host.conf ld.so.conf
         passwd shadow fstab crypttab hosts motd resolv.conf shells
         gshadow services protocols profile modprobe.d.usb-load-ehci-first)
-md5sums=('f4cf8d0a2de2658165148d5f64d81675'
-         '1bdc5dba66947d74866a5df8ce9ef3b1'
-         '775464ba7588b4976e0c2a02b83123f4'
-         '655071da46d2ac03e0fb8a071bf193ea'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '2c24792d97ef3cf0d73b60d4c429730b'
-         '8a9042a2cedf6b6b47eb8973f14289cb'
-         '019e5c24f9befef395a28e7ef2e4e5b9'
-         'c4f23a66a1bcc08fd164639bdafbc60a'
-         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
-         '81b3cb42a6ddabc2ed2310511ee9c859'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '40dac0de4c6b99c8ca97effbd7527c84'
-         'ab9c2a40eba287b2918589ab8e0b2fbf'
-         'f436d2e0ed02b7b73bd10c6693e95ac3'
-         '65d78e621ed69eed69f854c3ee2e5942'
-         '288a2e8d63c5ea2c2d852c7147e59d28'
-         '8098ffd9fbf890468d3198277596b85a')
 
 build()
 {
@@ -92,3 +73,23 @@ build()
   # Add /etc/modprobe.d/
   install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first ${pkgdir}/etc/modprobe.d/usb-load-ehci-first
 }
+
+md5sums=('f4cf8d0a2de2658165148d5f64d81675'
+         '1bdc5dba66947d74866a5df8ce9ef3b1'
+         '042ab2ae8ee489908ae87e0598070a11'
+         '655071da46d2ac03e0fb8a071bf193ea'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '2c24792d97ef3cf0d73b60d4c429730b'
+         '8a9042a2cedf6b6b47eb8973f14289cb'
+         '019e5c24f9befef395a28e7ef2e4e5b9'
+         'c4f23a66a1bcc08fd164639bdafbc60a'
+         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
+         '81b3cb42a6ddabc2ed2310511ee9c859'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '40dac0de4c6b99c8ca97effbd7527c84'
+         'ab9c2a40eba287b2918589ab8e0b2fbf'
+         'f436d2e0ed02b7b73bd10c6693e95ac3'
+         '65d78e621ed69eed69f854c3ee2e5942'
+         '288a2e8d63c5ea2c2d852c7147e59d28'
+         '8098ffd9fbf890468d3198277596b85a')
diff --git a/abs/core-testing/filesystem/nsswitch.conf b/abs/core-testing/filesystem/nsswitch.conf
index 7d86691..ec84725 100644
--- a/abs/core-testing/filesystem/nsswitch.conf
+++ b/abs/core-testing/filesystem/nsswitch.conf
@@ -15,5 +15,6 @@ ethers: db files
 rpc: db files
 
 netgroup: db files
+automount:files
 
 # End /etc/nsswitch.conf
diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index e77d22a..d4bdc50 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=76
+pkgrel=77
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -56,6 +56,7 @@ build() {
   mkdir -p $startdir/pkg/etc/logrotate.d/
   cp pause_mythcommflag $startdir/pkg/etc/logrotate.d/
 }
+
 md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '9a2181cdc0bc9cc8b42101f19620def8'
          '9ae2cd7a0c42d57ad8b5f515d7d60196'
@@ -79,7 +80,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'c537c44156d8404016cc4b405b092d45'
          '4e66f302a77f1a857476e7f289d0c157'
          'be324dba44ae96676973a74421944853'
-         'c9dc0dd07369622879a000247ac55074'
+         'ccca6bdbbd86b203a3eecdbbe363e701'
          '65629302a4d2c3adf88cdf0ebc10d493'
          '2734054f08c4c885bb9070dce239d4c3'
          '87b0dc855181f98516acb18a7d551601'
diff --git a/abs/core-testing/linhes-scripts/install_hulu.sh b/abs/core-testing/linhes-scripts/install_hulu.sh
index 28e855c..9b06b2e 100644
--- a/abs/core-testing/linhes-scripts/install_hulu.sh
+++ b/abs/core-testing/linhes-scripts/install_hulu.sh
@@ -11,11 +11,11 @@ echo "Please download it from http://www.hulu.com/labs/hulu-desktop-linux"
 echo "Then copy (or move) it to /tmp"
 exit
 fi
-if grep -q Hulu /usr/share/mythtv/is.xml
+if grep -q Hulu /usr/share/mythtv/themes/defaultmenu/is.xml
 then
 echo "Hulu Desktop exist in Online Streams!"
 else
-  mv /usr/share/mythtv/is.xml /tmp                                           
+  mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp                                           
   grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp                         
   echo "<!--#Hulu-->" >> /tmp/is.xml.tmp                                     
   echo "   <button>" >> /tmp/is.xml.tmp                                      
@@ -26,7 +26,7 @@ else
   echo "<!--#Hulu-->" >> /tmp/is.xml.tmp                                     
   echo "" >> /tmp/is.xml.tmp                                                 
   echo "</mythmenu>" >> /tmp/is.xml.tmp                                      
-  mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml
+  mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml
 echo "Hulu Desktop has been added to Online Streams!"
 fi
 if [ -e /home/mythtv/.huludesktop ]
diff --git a/abs/core-testing/mythinstall/PKGBUILD b/abs/core-testing/mythinstall/PKGBUILD
index 7c89e24..387358f 100644
--- a/abs/core-testing/mythinstall/PKGBUILD
+++ b/abs/core-testing/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jams
 pkgname=mythinstall
 pkgver=2
-pkgrel=46
+pkgrel=47
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=i686
 depends=()
diff --git a/abs/core-testing/mythstream/PKGBUILD b/abs/core-testing/mythstream/PKGBUILD
index 8c58fae..023bf01 100644
--- a/abs/core-testing/mythstream/PKGBUILD
+++ b/abs/core-testing/mythstream/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mythstream
 pkgver=0.18_3
-pkgrel=6
+pkgrel=8
 pkgdesc="Unofficial MythTV plugin for Internet audio and video streams."
 arch=('i686' 'x86_64')
 url="http://home.kabelfoon.nl/~moongies/streamtuned.html"
@@ -31,6 +31,7 @@ build() {
    make INSTALL_ROOT=$startdir/pkg install
    cp $srcdir/streams.res $pkgdir/usr/share/mythtv/mythstream
 }
+
 md5sums=('ba354b83fefe6028c5379fb832a44b6a'
          '0131d9e05b55141357bc66e2a88a8132'
          'b7fb47a56b6809938f237632174faeb2')
diff --git a/abs/core-testing/mythstream/mythstream.install b/abs/core-testing/mythstream/mythstream.install
index 5af96f2..3b87835 100644
--- a/abs/core-testing/mythstream/mythstream.install
+++ b/abs/core-testing/mythstream/mythstream.install
@@ -1,6 +1,6 @@
 # arg 1:  the new package version
 post_install() {
-  mv /usr/share/mythtv/is.xml /tmp
+  mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp
   grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
   echo "<!--#MythStream-->" >> /tmp/is.xml.tmp
   echo "   <button>" >> /tmp/is.xml.tmp
@@ -11,11 +11,11 @@ post_install() {
   echo "<!--#MythStream-->" >> /tmp/is.xml.tmp
   echo "" >> /tmp/is.xml.tmp
   echo "</mythmenu>" >> /tmp/is.xml.tmp
-  mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml
+  mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml
 }
 post_remove() {
-	mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
-	sed -e '/\#MythStream/,/\#MythStream/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
+	mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp
+	sed -e '/\#MythStream/,/\#MythStream/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml
 }
 
 op=$1
diff --git a/abs/core-testing/mythtv/stable-0.23/mytharchive/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mytharchive/PKGBUILD
index 2f0446c..d34d397 100644
--- a/abs/core-testing/mythtv/stable-0.23/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mytharchive/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mytharchive
 pkgver=0.23
-pkgrel=5
+pkgrel=6
 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythbrowser/PKGBUILD
index 916cb86..dfa3c0e 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythbrowser/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythbrowser/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythbrowser
 pkgver=0.23
-pkgrel=4
+pkgrel=5
 pkgdesc="Mini web browser for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythgallery/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythgallery/PKGBUILD
index 12b81e4..5c2eff1 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythgallery/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythgallery/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythgallery
 pkgver=0.23
-pkgrel=5
+pkgrel=6
 pkgdesc="Image gallery plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythgame/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythgame/PKGBUILD
index 224491e..6f9d445 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythgame/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythgame/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythgame
 pkgver=0.23
-pkgrel=4
+pkgrel=5
 pkgdesc="Emulation plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythmovies/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythmovies/PKGBUILD
index 7e7726f..a53453a 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythmovies/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythmovies/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythmovies
 pkgver=0.23
-pkgrel=4
+pkgrel=6
 pkgdesc="Displays information about movies playing in the area."
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythmusic/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythmusic/PKGBUILD
index 72657c4..70cd6d9 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythmusic/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythmusic/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythmusic
 pkgver=0.23
-pkgrel=6
+pkgrel=8
 pkgdesc="Music playing plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythnetvision/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythnetvision/PKGBUILD
index 5ecbd78..6cd5059 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythnetvision/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythnetvision/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythnetvision
 pkgver=0.23
-pkgrel=6
+pkgrel=7
 pkgdesc="Internet video plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythnews/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythnews/PKGBUILD
index c719323..1bf285e 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythnews/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythnews/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythnews
 pkgver=0.23
-pkgrel=5
+pkgrel=6
 pkgdesc="News checking plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythsmolt/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythsmolt/PKGBUILD
index 6ec22a8..0fa1e40 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythsmolt/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythsmolt/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythsmolt
 pkgver=0.23
-pkgrel=2
+pkgrel=3
 pkgdesc="mythsmolt, a hardware profileing tool"
 arch=('i686' 'x86_64')
 url="http://www.mythvantage.com"
diff --git a/abs/core-testing/mythtv/stable-0.23/myththemes/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/myththemes/PKGBUILD
index 371ce97..1d9eab5 100755
--- a/abs/core-testing/mythtv/stable-0.23/myththemes/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/myththemes/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=myththemes
 pkgver=0.23
-pkgrel=5
+pkgrel=7
 pkgdesc="Themes for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD
index 72934da..bf4f404 100755
--- a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.23
-pkgrel=24
+pkgrel=26
 pkgdesc="A personal video recorder for Linux"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythvideo/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythvideo/PKGBUILD
index 0761d6a..6783dbc 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythvideo/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythvideo/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythvideo
 pkgver=0.23
-pkgrel=6
+pkgrel=9
 pkgdesc="Video playback and browsing plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythweather/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythweather/PKGBUILD
index de3abaf..b8224ee 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythweather/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythweather/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweather
 pkgver=0.23
-pkgrel=5
+pkgrel=7
 pkgdesc="Weather checking plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/stable-0.23/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythzoneminder/PKGBUILD
index a7fa2e7..58ebb93 100644
--- a/abs/core-testing/mythtv/stable-0.23/mythzoneminder/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythzoneminder/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythzoneminder
 pkgver=0.23
-pkgrel=5
+pkgrel=6
 pkgdesc="Integrates ZoneMinder into MythTV"
 url="http://www.mythtv.org"
 license="GPL"