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

[Tobias Kieslich]

    Date: Sunday, September 7, 2008 @ 22:34:04
  Author: tobias
Revision: 12037

Merged revisions 2286-12034 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gimp/trunk

........
  r2293 | eric | 2008-05-30 15:02:30 -0700 (Fri, 30 May 2008) | 2 lines
  
  upgpkg: gimp 2.4.6-1
      added md5sums
........
  r8642 | jgc | 2008-08-14 05:26:06 -0700 (Thu, 14 Aug 2008) | 5 lines
  
  - Fix install scriptlet to update the GTK icon cache
  - Remove postinstall message, move it to optdepends (guess there should be more optdepends)
  - Tighten dependency versions
  - Add some "|| return 1" checks
........
  r12034 | tobias | 2008-09-07 19:24:10 -0700 (Sun, 07 Sep 2008) | 1 line
  
  upgpkg: gimp 2.4.7-1
........

Modified:
  gimp/repos/extra-i686/	(properties)
  gimp/repos/extra-i686/PKGBUILD
  gimp/repos/extra-i686/gimp.install

--------------+
 PKGBUILD     |   22 +++++++++++-----------
 gimp.install |   21 +++------------------
 2 files changed, 14 insertions(+), 29 deletions(-)


Property changes on: gimp/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gimp/trunk:1-2285
   + /gimp/trunk:1-12034

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-08 02:31:30 UTC (rev 12036)
+++ extra-i686/PKGBUILD	2008-09-08 02:34:04 UTC (rev 12037)
@@ -2,33 +2,33 @@
 # Maintainer: tobias <tobias at archlinux.org>
 
 pkgname=gimp
-pkgver=2.4.6
+pkgver=2.4.7
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.gimp.org/"
-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' \
-         'libexif>=0.6.13' 'libart-lgpl>=2.3.19' 'pygtk>=2.10.4' 'dbus-glib')
-makedepends=('gutenprint>=5.0.0' 'perlxml' \
-             'poppler-glib>=0.8' 'pkgconfig>=0.21' \
-             'alsa-lib>=1.0.13' 'libgnomeui')
+depends=('gtk2>=2.12.11' 'lcms>=1.17' 'libxpm>=3.5.7' 'libwmf>=0.2.8.4'
+         'libxmu>=1.0.4' 'librsvg>=2.22.2' 'libmng>=1.0.10' 'dbus-glib>=0.7.6'
+         'libexif>=0.6.16' 'libart-lgpl>=2.3.20' 'pygtk>=2.12.1')
+makedepends=('gutenprint>=5.0.2' 'perlxml' 'poppler-glib>=0.8.4'
+             'pkgconfig' 'alsa-lib>=1.0.16' 'libgnomeui>=2.22.1')
+				 optdepends=('gutenprint: Advanced printing support' 'poppler-glib: Opening PDF files')
 options=('!libtool' '!makeflags')
 conflicts=('gimp-unstable')
 install=${pkgname}.install
 source=(ftp://ftp.gimp.org/pub/gimp/v2.4/${pkgname}-${pkgver}.tar.bz2
         linux.gpl)
-md5sums=('a0bd1560f81f15c23ed4c0c6cb9c4b59' 'bb27bc214261d36484093e857f015f38')
+md5sums=('8d0e059597d70fbdeb77e6447bae29c4' 'bb27bc214261d36484093e857f015f38')
 
 build() {
    cd ${startdir}/src/${pkgname}-${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=${startdir}/pkg install-strip || return 1
    install -Dm644 ${startdir}/src/linux.gpl \
-     ${startdir}/pkg/usr/share/gimp/2.0/palettes/Linux.gpl
+     ${startdir}/pkg/usr/share/gimp/2.0/palettes/Linux.gpl || return 1
 }

Modified: extra-i686/gimp.install
===================================================================
--- extra-i686/gimp.install	2008-09-08 02:31:30 UTC (rev 12036)
+++ extra-i686/gimp.install	2008-09-08 02:34:04 UTC (rev 12037)
@@ -1,27 +1,12 @@
-
-# arg 1:  the new package version
 post_install() {
-  cat << EOM
-
---> gimp has built-in cups print support now. for more sophisticated printing,
---> please install gutenprint.
-
-EOM
-  echo "update desktop mime database..."
   update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-# arg 1:  the old package version
 post_remove() {
-  echo "update desktop mime database..."
-  update-desktop-database -q
+  post_install
 }
-
-op=$1
-shift
-$op $*
-# vim: ft=sh