Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD

4 files changed, 41 insertions, 11 deletions

diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
index 16bfb3a..e7768c7 100644
--- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.21
-pkgrel=54
+pkgrel=55
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
diff --git a/abs/core-testing/mythtv/stable/mythtv/mythtv.install b/abs/core-testing/mythtv/stable/mythtv/mythtv.install
index 87507a5..e65898b 100644
--- a/abs/core-testing/mythtv/stable/mythtv/mythtv.install
+++ b/abs/core-testing/mythtv/stable/mythtv/mythtv.install
@@ -9,8 +9,14 @@ post_install() {
 
 	fi
 }
+pre_upgrade() {
+	cp /usr/share/mythtv/is.xml /tmp
+	cp /usr/share/mythtv/media_settings.xml /tmp
+}
 
 post_upgrade() {
+	cp /tmp/is.xml /usr/share/mythtv/
+	cp /tmp/media_settings.xml /usr/share/mythtv/
 	if [ ! -d /var/log/mythtv ]
 	then
 		mkdir -p /var/log/mythv
diff --git a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
index 7e274fd..881ff9b 100644
--- a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
+++ b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv-vdpau
 pkgver=0.21
-pkgrel=7
+pkgrel=8
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
@@ -9,7 +9,7 @@ backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt usr/share/mythtv/is.xml
 source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-${pkgver}-fixes.tar.bz2 \
 	mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch  \
 	smolt_jump.patch pretty \
-	http://www.avenard.org/files/media/vdpau/mythtv-fixes-glvdpau20263.patch.gz)
+	http://www.avenard.org/files/media/vdpau/mythtv-fixes-glvdpau20300.patch.gz)
 
 #md5sums=('e316ed18d7ac837cf8c4af54b1478793' '7ef6de58240e7aad389a0b13d91b1cf6'\
 #         'a0ecb7f476cb71c0c1ac90d349fc7695')
@@ -32,7 +32,7 @@ build() {
 #	 patch -p0 < ../pop_be_restart.cpp.patch
 	 patch -p0 < ../smolt_jump.patch
 #	 patch -p0 < ../2.6.28_dvb_api_version.diff
-       	patch -p1 < ../mythtv-fixes-glvdpau20263.patch
+       	patch -p1 < ../mythtv-fixes-glvdpau20300.patch
 
    . /etc/profile.d/qt3.sh
 
diff --git a/abs/extra-testing/community/mythtv-vdpau/mythtv.install b/abs/extra-testing/community/mythtv-vdpau/mythtv.install
index 5f911e4..3bd6b56 100644
--- a/abs/extra-testing/community/mythtv-vdpau/mythtv.install
+++ b/abs/extra-testing/community/mythtv-vdpau/mythtv.install
@@ -1,19 +1,43 @@
 # arg 1:  the new package version
 post_install() {
-    echo 
 	echo
-	echo "As is with no guarantee, please do not file any bug reports against this package."
-}
+	echo
+	echo "As is with no guarantee, please don't file any bu reports against this package."
+	if [ ! -d /var/log/mythtv ]
+	then
+		mkdir -p /var/log/mythv
+		chown -R mythtv /var/log/mythtv
+		echo "---" > /var/log/mythtv/mythbackend.log
+		chown mythtv /var/log/mythtv/mythbackend.log
 
-post_upgrade(){
-    echo 
+	fi
+}
+post_upgrade() {
 	echo
-	echo "As is with no guarantee, please do not file any bug reports against this package."
+	echo
+	echo "As is with no guarantee, please don't file any bu reports against this package."
+}
+pre_upgrade() {
+	cp /usr/share/mythtv/is.xml /tmp
+	cp /usr/share/mythtv/media_settings.xml /tmp
+}
 
+post_upgrade() {
+	cp /tmp/is.xml /usr/share/mythtv/
+	cp /tmp/media_settings.xml /usr/share/mythtv/
+	if [ ! -d /var/log/mythtv ]
+	then
+		mkdir -p /var/log/mythv
+		chown -R mythtv /var/log/mythtv
+	fi
 }
+
+
 # arg 1:  the old package version
 post_remove() {
-   echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
+	echo -e "NOTE: MySQL database was not removed.  To remove run:\nmysql -u root -e 'drop database mythconverg;'"
+	/bin/true
+
 }
 
 op=$1