From 42ae9b94604db5f6bd515863e0ffd3a44b6c866e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 1 May 2012 18:23:11 -0500
Subject: LinHES-config: add huludesktop, fix typo where dolphin and
 webonlinhes were always installed

mythinstall: new pkg with huludesktop
---
 abs/core/LinHES-config/PKGBUILD       | 6 +++---
 abs/core/LinHES-config/mv_common.py   | 4 ++--
 abs/core/LinHES-config/mv_software.py | 4 +++-
 abs/core/mythinstall/PKGBUILD         | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index a8efca2..ad8b9b6 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=70
+pkgrel=71
 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'
@@ -128,14 +128,14 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
          '71fd2d0d448fc2fcd15415a1beed7109'
          '5f3259afe031fda189edae41dd1458f0'
-         '5299131ea195977d97e8582cb142370c'
+         'e1715bbbabd42e7419755b09f60734aa'
          'b845de3e05c1734cce4b9ac5e8f1baaf'
          '6801f87992b44118a12b6dfe6ea68127'
          '5e69839659d65ddda35b8a9982dc29e9'
          '3afd18517bb765d1680f4fcc8d08c9cc'
          'ec6a9961e4d1b53ec1240c5979efff11'
          'fe5e31b833cc6707209e9d656b6eb53c'
-         '9a1728bfd4fb83ca1c46321b57ef0248'
+         'ecb52b9b7a9ac0c8988093c1dfdda635'
          '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
          '0b5b9e5385c7ae77e561812e96ce8161'
          '755c05b833aca6c5be130972af052e8b'
diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py
index 9c5e906..e4bef48 100755
--- a/abs/core/LinHES-config/mv_common.py
+++ b/abs/core/LinHES-config/mv_common.py
@@ -228,9 +228,9 @@ def pacremove(pkg):
     elif pkg == "mupen64":
         pacremove("mupen64plus-svn")
     elif pkg == "dolphinemu":
-        pacinstall("dolphin-emu")
+        pacremove("dolphin-emu")
     elif pkg == "webonlinhes":
-        pacinstall("web-on-linhes")
+        pacremove("web-on-linhes")
 
     if  not pkg_blacklist_check(pkg):
         if not pkg_installed_check(pkg):
diff --git a/abs/core/LinHES-config/mv_software.py b/abs/core/LinHES-config/mv_software.py
index af4ed23..c803a14 100755
--- a/abs/core/LinHES-config/mv_software.py
+++ b/abs/core/LinHES-config/mv_software.py
@@ -29,7 +29,9 @@ def setup_software(systemconfig, data_config):
                           "mythappletrailers", "mythstream",  "mythzoneminder","mythnetvision" )
 
       default_installed=("mythgallery", "mythmovies", "mythmusic")
-      other_pkg=("miro", "mednafen", "romdb", "xine", "dvdcss", "webmin" , "fuppes", "foldingathome","mupen64","dolphinemu","webonlinhes")
+      other_pkg=("miro", "mednafen", "romdb", "xine", "dvdcss", "webmin",
+                 "fuppes", "foldingathome","mupen64","dolphinemu",
+                 "webonlinhes","huludesktop")
 
     for pkg in default_disabled:
         pkgname=pkg+postfix
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index bc8f066..e4e26c8 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jams
 pkgname=mythinstall
 pkgver=3
-pkgrel=22
+pkgrel=23
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=i686
 depends=('mythtv>=0.25')
-- 
cgit v0.12