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

[Eric Belanger]

    Date: Thursday, April 24, 2008 @ 19:31:00
  Author: eric
Revision: 938

fixed svn conflict

Modified:
  nip2/repos/extra-x86_64/	(properties)
  nip2/repos/extra-x86_64/PKGBUILD
  nip2/repos/extra-x86_64/nip2.install

--------------+
 PKGBUILD     |   14 +++++++-------
 nip2.install |   11 ++---------
 2 files changed, 9 insertions(+), 16 deletions(-)


Property changes on: nip2/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /nip2/trunk:1
   + /nip2/trunk:1-937

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-04-24 23:28:28 UTC (rev 937)
+++ extra-x86_64/PKGBUILD	2008-04-24 23:31:00 UTC (rev 938)
@@ -4,24 +4,24 @@
 
 pkgname=nip2
 pkgver=7.14.1
-mainver=7.14
-force=y
-pkgrel=1
+pkgrel=2
 pkgdesc="nip2 is a frontend to the vips image library"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://www.vips.ecs.soton.ac.uk/index.php"
-depends=('vips>=7.14.1' 'gtk2' 'gsl')
+depends=('vips>=7.14.1' 'gtk2' 'gsl' 'imagemagick>=6.4.0.2' 'shared-mime-info' 'desktop-file-utils')
+makedepends=('perlxml' 'gnome-doc-utils>=0.11.2')
 install=$pkgname.install
-source=("http://www.vips.ecs.soton.ac.uk/supported/$mainver/$pkgname-$pkgver.tar.gz")
+source=("http://www.vips.ecs.soton.ac.uk/supported/${pkgver%.*}/$pkgname-$pkgver.tar.gz")
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=$startdir/pkg install
-  rm $startdir/pkg/usr/share/mime/{mimeinfo.cache,mime.cache,XMLnamespaces,aliases,globs,magic,subclasses}
-  rm $startdir/pkg/usr/share/applications/mimeinfo.cache
+  rm -f $startdir/pkg/usr/share/mime/{mimeinfo.cache,mime.cache,XMLnamespaces,aliases,globs,magic,subclasses}
+  rm -f $startdir/pkg/usr/share/applications/mimeinfo.cache
 }
 
 
+md5sums=('b2ea46b0e72eea5f7c79b7e9e0ee6b0d')

Modified: extra-x86_64/nip2.install
===================================================================
--- extra-x86_64/nip2.install	2008-04-24 23:28:28 UTC (rev 937)
+++ extra-x86_64/nip2.install	2008-04-24 23:31:00 UTC (rev 938)
@@ -1,9 +1,6 @@
 post_install() {
-  echo "updating scrollkeeper catalogue ..."
-  scrollkeeper-update -p var/lib/scrollkeeper  > /dev/null 2>&1
-  update-mime-database opt/gnome/share/mime > /dev/null 2>&1
-  update-desktop-database > /dev/null 2>&1
-true
+  update-mime-database usr/share/mime > /dev/null 2>&1
+  update-desktop-database -q
 }
 
 post_upgrade() {
@@ -13,7 +10,3 @@
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-$op $*