Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_pkgbuild into testing

Conflicts:
	abs/core/LinHES-system/PKGBUILD

4 files changed, 10 insertions, 7 deletions

diff --git a/abs/core/LinHES-system/LinHES-run b/abs/core/LinHES-system/LinHES-run
index cfabf9e..883bcda 100755
--- a/abs/core/LinHES-system/LinHES-run
+++ b/abs/core/LinHES-system/LinHES-run
@@ -89,12 +89,16 @@ then
         else
 	    rm -f ~/.no_meth
 	fi
-	sudo pacman -R myth2ipod myt2xvid3
+	sudo pacman -R --noconfirm myth2ipod myt2xvid3
 	sudo pacman -S --noconfirm myth2ipod myt2xvid3
+#	sudo ln -s /usr/share/mythtv/mythexport /data/srv/httpd/htdocs
     sudo sv stop mythbackend
     /usr/LH/bin/dtheme.sh
     xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
     sudo sv start mythbackend
+    sudo sv stop mythexport
+    sudo pacman -R --noconfirm mythexport
+    sudo pacman -S --noconfirm mythexport
     sudo chown -R mythtv.mythtv /home/mythtv
     nice -n 19 mythfilldatabase --quiet &
     msg "Guide data is being loaded. \n Until this completes\n some shows will appear as unknown \n in the program guide."
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 73fa1ef..439ff14 100755..100644
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=2
-pkgrel=26
+pkgrel=31
 arch=('i686')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
@@ -54,7 +54,7 @@ md5sums=('71a1fc9b01476b0b2c30596107eeff75'
          '76b2637cac0452b3acdbeeb4e8a5474b'
          'd1f27cb422010077c841376526fe46ea'
          '2ef9f945e034119f77d9b6beb17e4fa5'
-         'f7ecc552a2823cae63d75f58dc7435c4'
+         '5c96527397a35519d72c78d6e3c8dbea'
          '18a884a73344ff6eb74f63b49745e0f5'
          'dc3eef2a624754e16805d72bbe488b67'
          'dc0be354ce77ba2b89868fc29b942c43'
diff --git a/abs/extra/mythexport/PKGBUILD b/abs/extra/mythexport/PKGBUILD
index 8756857..1a51bd2 100644
--- a/abs/extra/mythexport/PKGBUILD
+++ b/abs/extra/mythexport/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=mythexport
 pkgver=2.2.3
-pkgrel=7
+pkgrel=13
 pkgdesc="Export MythTV recording to portable media players"
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('atomicparsley' 'perl-config-simple' 'perl-net-upnp' 'perl-xml-rss'
          'perl-proc-daemon' 'perl-proc-pid-file' 'perl-html-template' 'handbrake-cli'
-	 'tablet-encode' 'mencoder')
+	 'tablet-encode' 'mencoder' 'perl-log-dispatch')
 optdepends=('lighttpd: For web based interaction')
 url="http://www.ubuntuupdates.org/mythexport"
 source=(https://launchpad.net/ubuntu/precise/+source/${pkgname}/${pkgver}-0ubuntu2/+files/${pkgname}_${pkgver}.orig.tar.gz
diff --git a/abs/extra/mythexport/mythexport.install b/abs/extra/mythexport/mythexport.install
index 9bd1213..d2c1ae0 100644
--- a/abs/extra/mythexport/mythexport.install
+++ b/abs/extra/mythexport/mythexport.install
@@ -10,9 +10,8 @@ post_install() {
   mkdir /srv/http/.mythtv
   fi
   chown -R mythtv:mythtv /myth/mythexport
-
 	mysql -u root mythconverg < /usr/share/mythtv/mythexport.sql
-	ln -s /usr/share/mythtv/mythexport /data/srv/httpd/htdocs/
+	ln -s /usr/share/mythtv/mythexport /data/srv/httpd/htdocs
 	ln -s /myth/mythexport /usr/share/mythtv/mythexport/video
 	ln -s /home/mythtv/.mythtv/config.xml /srv/http/.mythtv
 	chown mythtv:mythtv /var/run/mythtv