summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hanson <mihanson@linhes.org>2011-11-04 02:45:43 (GMT)
committerMichael Hanson <mihanson@linhes.org>2011-11-04 02:45:43 (GMT)
commit914ae9958bca87e3f219448a60d861b1b36f198b (patch)
treeb18850bede6aa95e52ba41265c5afa226f759999
parentf597f6110f25fe3e648625113bfc3b3875d01117 (diff)
parent0fdddf9ae0c87c986ce6cae751c07a0f8c603021 (diff)
downloadlinhes_pkgbuild-914ae9958bca87e3f219448a60d861b1b36f198b.zip
linhes_pkgbuild-914ae9958bca87e3f219448a60d861b1b36f198b.tar.gz
linhes_pkgbuild-914ae9958bca87e3f219448a60d861b1b36f198b.tar.bz2
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
-rw-r--r--abs/core/linhes-scripts/PKGBUILD4
-rw-r--r--abs/core/linhes-scripts/upgrade_linhes_script.sh4
2 files changed, 6 insertions, 2 deletions
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 13ffc97..ed18456 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=14
+pkgrel=16
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
@@ -97,4 +97,4 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
'35693f50939d5827aeabfce8c5dce589'
'a94fe6d980f4b810f2e2ae5352084b39'
'974c137d3fcb85942ba8945a1bc815fe'
- '52d30a902c6e6de52f6d1481fd90b689')
+ '5ada346a85ceb4b4fc15514706c65fe7')
diff --git a/abs/core/linhes-scripts/upgrade_linhes_script.sh b/abs/core/linhes-scripts/upgrade_linhes_script.sh
index 506af3e..e48824b 100644
--- a/abs/core/linhes-scripts/upgrade_linhes_script.sh
+++ b/abs/core/linhes-scripts/upgrade_linhes_script.sh
@@ -138,6 +138,10 @@ cp /usr/share/mythtv/is.xml.021 /usr/share/mythtv/is.xml
# cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg
# /usr/LH/bin/mythwelcome-config.py
# fi
+#remove portmap as it's no longer used.
+
+remove_service.sh portmap
+
wget ftp://ftp.knoppmyth.net/R6/sources/wallpaper.png -P /tmp
mv /tmp/wallpaper.png /home/mythtv/.fluxbox/
chown mythtv.mythtv /home/mythtv/.fluxbox/wallpaper.png