[arch-commits] CVS update of extra/gnome/gnome-terminal (2 files)

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 17:22:13
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-terminal

Modified: PKGBUILD (1.30 -> 1.31) gnome-terminal.install (1.9 -> 1.10)

upgpkg: gnome-terminal 2.22.0-1
    GNOME 2.22


------------------------+
 PKGBUILD               |   20 ++++++++++----------
 gnome-terminal.install |    5 -----
 2 files changed, 10 insertions(+), 15 deletions(-)


Index: extra/gnome/gnome-terminal/PKGBUILD
diff -u extra/gnome/gnome-terminal/PKGBUILD:1.30 extra/gnome/gnome-terminal/PKGBUILD:1.31
--- extra/gnome/gnome-terminal/PKGBUILD:1.30	Thu Jan 10 15:33:04 2008
+++ extra/gnome/gnome-terminal/PKGBUILD	Fri Mar 14 17:22:13 2008
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD,v 1.30 2008/01/10 20:33:04 jgc Exp $
+# $Id: PKGBUILD,v 1.31 2008/03/14 21:22:13 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=2.18.4
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.20.1.1' 'vte>=0.16.12' 'startup-notification>=0.9')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0') 
+depends=('libgnomeui>=2.20.1.1' 'vte>=0.16.13' 'startup-notification>=0.9')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2') 
 options=('!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e4429d66d0d2ede8e14756cfbc15d30a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('e91f000b8157c668940a297d7cfbc9f8')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-scrollkeeper
+              --localstatedir=/var --disable-scrollkeeper || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
   
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/gnome-terminal/gnome-terminal.install
diff -u extra/gnome/gnome-terminal/gnome-terminal.install:1.9 extra/gnome/gnome-terminal/gnome-terminal.install:1.10
--- extra/gnome/gnome-terminal/gnome-terminal.install:1.9	Sun Sep 23 09:08:19 2007
+++ extra/gnome/gnome-terminal/gnome-terminal.install	Fri Mar 14 17:22:13 2008
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*