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

Conflicts:
	abs/core/LinHES-config/PKGBUILD

5 files changed, 15 insertions, 13 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 527e944..2c6cdb0 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=36
+pkgrel=37
 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'
@@ -121,7 +121,7 @@ md5sums=('6259677916192a92d1adf47b276f7829'
          'a225143e3df6f56d451c2875e54ddbae'
          '9151c74fcaf18ec4cf5e757cfdbc7017'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
-         'd6c2d07c58ca6484c5be8b7093b921cd'
+         '71fd2d0d448fc2fcd15415a1beed7109'
          '5f3259afe031fda189edae41dd1458f0'
          '41b03fb1e0a9d9ae7588e3b813212772'
          'b845de3e05c1734cce4b9ac5e8f1baaf'
diff --git a/abs/core/LinHES-config/README b/abs/core/LinHES-config/README
index 915e72e..e9c7b03 100644
--- a/abs/core/LinHES-config/README
+++ b/abs/core/LinHES-config/README
@@ -1,11 +1,11 @@
 Thanks for choosing LinHES!
 
-Detailed Installation Guide:
-http://linhes.org/bugs/projects/linhes/wiki/Install_LinHES
+Installation Guide:
+http://linhes.org/install
 
-Support for LinHES can be obtained at:
+Support for LinHES:
 http://linhes.org
 irc.freenode.net #linhes
  
-Bugs can be reported at:
+Report bugs at:
 http://linhes.org/bugs
diff --git a/abs/core/gettext/PKGBUILD b/abs/core/gettext/PKGBUILD
index 030e00a..d8946b0 100644
--- a/abs/core/gettext/PKGBUILD
+++ b/abs/core/gettext/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gettext
 pkgver=0.18.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU internationalization library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gettext"
diff --git a/abs/extra/samba/PKGBUILD b/abs/extra/samba/PKGBUILD
index dba70bf..eced810 100644
--- a/abs/extra/samba/PKGBUILD
+++ b/abs/extra/samba/PKGBUILD
@@ -8,11 +8,11 @@ pkgver=3.5.6
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=3.5.6
-pkgrel=1
-arch=(i686 x86_64)
+pkgrel=2
+arch=('i686' 'x86_64')
 url="http://www.samba.org"
 license=('GPL3')
-makedepends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'gnutls>=2.4.1' 'talloc' 'tdb')
+makedepends=('db>=4.7' 'popt' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'gnutls>=2.4.1' 'talloc' 'tdb')
 options=(!makeflags)
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba samba.logrotate 
@@ -59,8 +59,8 @@ depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'libcap>=2.16' 'heimdal>=
       cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
   done
   install -m755 script/smbtar ${pkgdir}/usr/bin/
-  mkdir -p ${pkgdir}/usr/lib/cups/backend
-  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
+  #mkdir -p ${pkgdir}/usr/lib/cups/backend
+  #ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
   mkdir -p ${pkgdir}/usr/include
   install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
   install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
@@ -83,7 +83,7 @@ backup=(etc/logrotate.d/samba
         etc/samba/smb.conf
         etc/xinetd.d/swat
         etc/conf.d/samba)
-depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'gnutls>=2.4.1' 'e2fsprogs' 'tdb' 'talloc')
+depends=('db>=4.7' 'popt' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'gnutls>=2.4.1' 'e2fsprogs' 'tdb' 'talloc')
   cd ${srcdir}/samba-${_realver}/source3
   mkdir -p ${pkgdir}/var/log/samba
   mkdir -p ${pkgdir}/etc/samba/private
diff --git a/abs/extra/samba/__changelog b/abs/extra/samba/__changelog
index 24743b6..1fdfc4a 100644
--- a/abs/extra/samba/__changelog
+++ b/abs/extra/samba/__changelog
@@ -1,2 +1,4 @@
 remove fam support
 update to 3.5.6
+
+remove libcups as dep and build without it.