Merge branch 'testing'

1 files changed, 28 insertions, 28 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 449f456..6a8cba3 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,13 +1,12 @@
 pkgname=LinHES-config
 pkgver=8.0
-pkgrel=2
+pkgrel=10
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
 	 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted'
-	 'python-pexpect' 'python-netifaces'
+	 'python-pexpect' 'python-netifaces' 'xcursor-vanilla-dmz-aa'
 	 'python-iplib' 'mythinstall>=2-10' 'sudo' 'setserial' 'udevil')
-#LinHES-timezone
 arch=('i686' 'x86_64')
 
 source=(mv_install.py 09_mythvantge_runit_grub
@@ -59,15 +58,15 @@ source=(mv_install.py 09_mythvantge_runit_grub
 backup=(etc/mythvantage.cfg)
 install=config.install
 
-build() {
-    mkdir -p $startdir/pkg/etc
-    mkdir -p $startdir/pkg/usr/share/mythtv/themes/default
-    install -D -m0755 09_mythvantge_runit_grub $startdir/pkg/etc/grub.d/09_mythvantge_runit_grub
+package() {
+    mkdir -p $pkgdir/etc
+    mkdir -p $pkgdir/usr/share/mythtv/themes/default
+    install -D -m0755 09_mythvantge_runit_grub $pkgdir/etc/grub.d/09_mythvantge_runit_grub
 
 
-    MVDIR=$startdir/pkg/usr/MythVantage
-    mkdir  $startdir/pkg/etc/profile.d
-    install -m 0755 MythVantage.sh  $startdir/pkg/etc/profile.d/MythVantage.sh
+    MVDIR=$pkgdir/usr/MythVantage
+    mkdir $pkgdir/etc/profile.d
+    install -m 0755 MythVantage.sh  $pkgdir/etc/profile.d/MythVantage.sh
     mkdir -p $MVDIR/bin
     mkdir -p $MVDIR/etc
 
@@ -110,30 +109,31 @@ build() {
     install -m 0755 plymouth_config.py $MVDIR/bin/
     install -m 0755 discover_infinitv.py $MVDIR/bin/
     install -m 0755 backend_control.sh $MVDIR/bin/
-    install -m 0755 mythvantage.cfg $startdir/pkg/etc/
+    install -m 0755 mythvantage.cfg $pkgdir/etc/
 
     #README file displayed on install
     install -m 0755 README $MVDIR/README
 
-    mkdir -p $startdir/pkg/usr/bin
-    install -m 0755 file_time_offset.py $startdir/pkg/usr/bin/file_time_offset.py
+    mkdir -p $pkgdir/usr/bin
+    install -m 0755 file_time_offset.py $pkgdir/usr/bin/file_time_offset.py
     #Copy in the branding stuff
-    install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release
+    install -m 0755 LinHES-release $pkgdir/etc/LinHES-release
 
     #sudo rules
-    mkdir -p $startdir/pkg/etc/sudoers.d/
-    chmod 750 $startdir/pkg/etc/sudoers.d/
-    chown -R root:root $startdir/pkg/etc/sudoers.d
-    install -o root -g root -m 0750 config-sudo.rules $startdir/pkg/etc/sudoers.d/config_sudo
+    mkdir -p $pkgdir/etc/sudoers.d/
+    chmod 750 $pkgdir/etc/sudoers.d/
+    chown -R root:root $pkgdir/etc/sudoers.d
+    install -o root -g root -m 0750 config-sudo.rules $pkgdir/etc/sudoers.d/config_sudo
 
     #sysctrl conf
-    install -o root -g root  -D -m 0755 hdhr.conf $startdir/pkg/etc/sysctl.d/hdhr.conf
+    install -o root -g root  -D -m 0755 hdhr.conf $pkgdir/etc/sysctl.d/hdhr.conf
 
     #modules blacklist files
-    install -o root -g root  -D -m 0755 blacklist_pcspkr.conf $startdir/pkg/etc/modprobe.d/blacklist_pcspkr.conf
-    install -o root -g root  -D -m 0755 blacklist_nouveau.conf $startdir/pkg/etc/modprobe.d/blacklist_nouveau.conf
+    install -o root -g root  -D -m 0755 blacklist_pcspkr.conf $pkgdir/etc/modprobe.d/blacklist_pcspkr.conf
+    install -o root -g root  -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
 }
-md5sums=('7cdc9bc678ab02a2d30444e20a3c71eb'
+
+md5sums=('c832059cd635359d39a2ac3166ff463c'
          '3f6855b7bb860a44f96a972c2e80f497'
          'aaeb581275433649ff74e05da5e61a78'
          '2596460462cf6c889cf8f95485537b20'
@@ -155,11 +155,11 @@ md5sums=('7cdc9bc678ab02a2d30444e20a3c71eb'
          '5e865cc04fe5de8a39d9c1e377fc4ebe'
          'd3490e93f313bbbcbc6c3693c56b9c17'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
-         '71fd2d0d448fc2fcd15415a1beed7109'
+         '2506860a416e1988934225d80d501c2c'
          'c0549457750c4f8e8038d904a0f3012a'
-         '3d1e3c7315881a109fb089a540d2262c'
+         '075fe16ef92621ce31f41df5c5577daf'
          'b845de3e05c1734cce4b9ac5e8f1baaf'
-         'f9b38f3d8e6d25b7c67b4c33cdee58db'
+         '31ad5416bf2ab1909338a16035941127'
          '8b7dce4a3a0a281fa6656aa8781a648e'
          'f7f2dc11d1ba454cd25eeaa133104b62'
          '824e49d9b01fed295c704ab68908b464'
@@ -167,11 +167,11 @@ md5sums=('7cdc9bc678ab02a2d30444e20a3c71eb'
          '3eec99951c01d1a1abf7ecfeb33f922b'
          '087a0ef743bc8af915503f8773536ce4'
          '183a11aa06d60065106472ed9f72cc4a'
-         'b4900090d841d3e390cb840cf16afd85'
+         '80685e047993b00161be29e3580f3a40'
          '299c24c0820fc9c483c820db2595e3cb'
          'cf51cb22e23218ae7e9b55cac1ba3a7f'
-         'e4b61402858058f7575b776d62d5ee89'
-         '1a17256202d851f37c54f2836c244b5d'
+         '781f161a79c3188a31c8615b8258b241'
+         '540a5b7f63a83ad53d6924c637bfd1c7'
          '2596460462cf6c889cf8f95485537b20'
          'dc3c5270691a62600475705f4cb78b56'
          '4804aa93aaad3dfcfff08cd9ffd68836'