[arch-commits] Commit in gimp-devel/repos (3 files)

[Eric Belanger]

    Date: Tuesday, June 17, 2008 @ 22:13:46
  Author: eric
Revision: 3016

Merged revisions 978-3013 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gimp-devel/trunk

........
  r2985 | eric | 2008-06-17 21:04:05 -0400 (Tue, 17 Jun 2008) | 2 lines
  
  upgpkg: gimp-devel 2.5.1-1
      Upstream update, Removed libart-lgpl dependency
........

Modified:
  gimp-devel/repos/unstable-i686/	(properties)
  gimp-devel/repos/unstable-i686/ChangeLog
  gimp-devel/repos/unstable-i686/PKGBUILD

-----------+
 ChangeLog |   10 ++++++++--
 PKGBUILD  |   24 ++++++++++++------------
 2 files changed, 20 insertions(+), 14 deletions(-)


Property changes on: gimp-devel/repos/unstable-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gimp-devel/trunk:1-977
   + /gimp-devel/trunk:1-3013

Modified: unstable-i686/ChangeLog
===================================================================
--- unstable-i686/ChangeLog	2008-06-18 02:13:40 UTC (rev 3015)
+++ unstable-i686/ChangeLog	2008-06-18 02:13:46 UTC (rev 3016)
@@ -1,10 +1,16 @@
+2008-06-16  Eric Belanger  <eric at archlinux.org>
+
+	* gimp-devel 2.5.1-1
+	* Upstream update
+	* Removed libart-lgpl dependency
+
 2008-04-12  Eric Belanger  <eric at archlinux.org>
 
-	* gimp-devel 2.5.0
+	* gimp-devel 2.5.0-1
 	* Upstream update
 
 2008-03-01  Eric Belanger  <eric at archlinux.org>
 
-	* gimp-devel 2.4.5
+	* gimp-devel 2.4.5-1
 	* Upstream update
 	* Clarified post-install message

Modified: unstable-i686/PKGBUILD
===================================================================
--- unstable-i686/PKGBUILD	2008-06-18 02:13:40 UTC (rev 3015)
+++ unstable-i686/PKGBUILD	2008-06-18 02:13:46 UTC (rev 3016)
@@ -3,7 +3,7 @@
 # Contributor: Woody Gilk <woody at archlinux.org>
 
 pkgname=gimp-devel
-pkgver=2.5.0
+pkgver=2.5.1
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@
 license=('GPL')
 depends=('gtk2>=2.10' 'lcms>=1.16' 'libxpm>=3.5.6' 'libwmf>=0.2.8.4' \
          'libxmu>=1.0.3' 'librsvg>=2.16.1' 'libmng>=1.0.9' 'desktop-file-utils' \
-         'libexif>=0.6.13' 'libart-lgpl>=2.3.19' 'pygtk>=2.10.4' 'dbus-glib' 'gegl' )
+         'libexif>=0.6.13' 'pygtk>=2.10.4' 'dbus-glib' 'gegl>=0.0.18')
 makedepends=('gutenprint>=5.0.0' 'intltool>=0.35.5' 'libgtkhtml>=2.6.3' \
              'gnome-python>=2.16.2' 'poppler>=0.6' 'pkgconfig>=0.21' \
              'libgnomeprintui>=2.18' 'alsa-lib>=1.0.13')
@@ -20,22 +20,22 @@
 provides=("gimp=${pkgver}")
 install=${pkgname}.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('8ba5d24c700b495e8a9f32743369c925' 'bb27bc214261d36484093e857f015f38')
-sha1sums=('594bcc03b201b709cb86a0d18fa79d1737855f81' '110ce9798173b19a662d086ed7b882b4729f06cf')
+md5sums=('da2a6ffd8ed5e137d34784ef3fba9a04' 'bb27bc214261d36484093e857f015f38')
+sha1sums=('5f2164d32ca02e2c6fe7a26aa1e9292cb21a5d3c' '110ce9798173b19a662d086ed7b882b4729f06cf')
 
 build() {
-  cd ${startdir}/src/gimp-${pkgver}
+  cd ${srcdir}/gimp-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --disable-devel-docs \
     --enable-python --with-gif-compression=lzw \
-    --without-aa
+    --without-aa || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install-strip
+  make DESTDIR=${pkgdir} install-strip || return 1
 
-  install -Dm644 ${startdir}/src/linux.gpl \
-    ${startdir}/pkg/usr/share/gimp/2.0/palettes/Linux.gpl
+  install -D -m644 ${srcdir}/linux.gpl \
+    ${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl || return 1
 
-  ln -s gimp-2.5 ${startdir}/pkg/usr/bin/gimp
-  ln -s gimp-console-2.5 ${startdir}/pkg/usr/bin/gimp-console
-  ln -s gimp-remote-2.5 ${startdir}/pkg/usr/bin/gimp-remote
+  ln -s gimp-2.5 ${pkgdir}/usr/bin/gimp || return 1
+  ln -s gimp-console-2.5 ${pkgdir}/usr/bin/gimp-console || return 1
+  ln -s gimp-remote-2.5 ${pkgdir}/usr/bin/gimp-remote || return 1
 }