[arch-commits] CVS update of extra (3 files)

[Tobias Kieslich]

    Date: Friday, November 16, 2007 @ 16:50:14
  Author: tobias
    Path: /home/cvs-extra/extra

Modified: daemons/courier-imap/PKGBUILD (1.27 -> 1.28)
          daemons/courier-mta/PKGBUILD (1.27 -> 1.28)
          multimedia/gimp/PKGBUILD (1.69 -> 1.70)

Fixes only in cvs:
gimp- remove some stufffrom PGBUILD now handled in upstream
courier-* replace gcc by gcc-libs dependency
courier mta   conflict with smtp-server, it's just easier for me
              add esmtpauthclient to backup array


-------------------------------+
 daemons/courier-imap/PKGBUILD |    4 ++--
 daemons/courier-mta/PKGBUILD  |    9 +++++----
 multimedia/gimp/PKGBUILD      |    7 +------
 3 files changed, 8 insertions(+), 12 deletions(-)


Index: extra/daemons/courier-imap/PKGBUILD
diff -u extra/daemons/courier-imap/PKGBUILD:1.27 extra/daemons/courier-imap/PKGBUILD:1.28
--- extra/daemons/courier-imap/PKGBUILD:1.27	Thu Oct 25 19:22:46 2007
+++ extra/daemons/courier-imap/PKGBUILD	Fri Nov 16 16:50:14 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.27 2007/10/25 23:22:46 tobias Exp $
+# $Id: PKGBUILD,v 1.28 2007/11/16 21:50:14 tobias Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Committer: Manolis Tzanidakis <manolis at archlinux.org>
 
@@ -9,7 +9,7 @@
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.courier-mta.org/imap/"
-depends=('courier-maildrop>=2.0.3-2' 'gcc' 'fam' 'db>=4.6' 'openssl')
+depends=('courier-maildrop>=2.0.3-2' 'gcc-libs' 'fam' 'db>=4.6' 'openssl')
 backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \
         'etc/courier-imap/imapd' 'etc/courier-imap/imapd-ssl' \
         'etc/courier-imap/pop3d' 'etc/courier-imap/pop3d-ssl'\
Index: extra/daemons/courier-mta/PKGBUILD
diff -u extra/daemons/courier-mta/PKGBUILD:1.27 extra/daemons/courier-mta/PKGBUILD:1.28
--- extra/daemons/courier-mta/PKGBUILD:1.27	Thu Oct 25 17:01:06 2007
+++ extra/daemons/courier-mta/PKGBUILD	Fri Nov 16 16:50:14 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.27 2007/10/25 21:01:06 tobias Exp $
+# $Id: PKGBUILD,v 1.28 2007/11/16 21:50:14 tobias Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
@@ -17,12 +17,13 @@
         'etc/courier/courierd' 'etc/courier/sqwebmaild' \
         'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \
         'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \
-        'etc/courier/webadmin/password' 'etc/conf.d/courier-mta')
+        'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \
+        'etc/conf.d/courier-mta')
 url="http://courier-mta.org"
-depends=('courier-authlib>=0.59-2' 'gcc' 'fam' 'db>=4.6' 'pcre')
+depends=('courier-authlib>=0.59-2' 'gcc-libs' 'fam' 'db>=4.6' 'pcre')
 makedepends=('apache' 'pam' 'expect' 'gnupg' 'libldap')
 provides=('smtp-server' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop')
-conflicts=('courier-imap' 'smtp-server' 'courier-maildrop')
+conflicts=('courier-imap' 'smtp-server' 'imap-server' 'courier-maildrop')
 options=('!libtool')
 install=(courier-mta.install)
 source=(http://dl.sourceforge.net/sourceforge/courier/courier-${pkgver}.tar.bz2 \
Index: extra/multimedia/gimp/PKGBUILD
diff -u extra/multimedia/gimp/PKGBUILD:1.69 extra/multimedia/gimp/PKGBUILD:1.70
--- extra/multimedia/gimp/PKGBUILD:1.69	Wed Oct 31 16:28:24 2007
+++ extra/multimedia/gimp/PKGBUILD	Fri Nov 16 16:50:14 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.69 2007/10/31 20:28:24 tobias Exp $
+# $Id: PKGBUILD,v 1.70 2007/11/16 21:50:14 tobias Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 
 pkgname=gimp
@@ -29,11 +29,6 @@
      --without-aa
    make || return 1
    make DESTDIR=${startdir}/pkg install-strip
-   cd ${startdir}/pkg
-   mkdir -p usr/share/{applications,mime-info}
-   mv usr/share/gimp/2.0/misc/gimp.desktop usr/share/applications/
-   mv usr/share/gimp/2.0/misc/gimp.keys usr/share/mime-info/
-   rm -r usr/share/gimp/2.0/misc
    install -Dm644 ${startdir}/src/linux.gpl \
      ${startdir}/pkg/usr/share/gimp/2.0/palettes/Linux.gpl
 }