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

[Jan de Groot]

    Date: Thursday, June 21, 2007 @ 15:43:34
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-terminal

Modified: PKGBUILD (1.25 -> 1.26) gnome-terminal.install (1.7 -> 1.8)

upgpkg: gnome-terminal 2.18.1-1
Migrate to gconfpkg


------------------------+
 PKGBUILD               |   10 +++++-----
 gnome-terminal.install |   14 ++------------
 2 files changed, 7 insertions(+), 17 deletions(-)


Index: extra/gnome/gnome-terminal/PKGBUILD
diff -u extra/gnome/gnome-terminal/PKGBUILD:1.25 extra/gnome/gnome-terminal/PKGBUILD:1.26
--- extra/gnome/gnome-terminal/PKGBUILD:1.25	Sun Apr 22 12:15:58 2007
+++ extra/gnome/gnome-terminal/PKGBUILD	Thu Jun 21 15:43:34 2007
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD,v 1.25 2007/04/22 16:15:58 jgc Exp $
+# $Id: PKGBUILD,v 1.26 2007/06/21 19:43:34 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=2.18.0
-pkgrel=2
+pkgver=2.18.1
+pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.18.1-2' 'vte>=0.16.1-2' 'startup-notification>=0.9' 'scrollkeeper')
+depends=('libgnomeui>=2.18.1-2' 'vte>=0.16.6' 'startup-notification>=0.9' 'scrollkeeper' 'gconf>=2.18.0.1-4')
 makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3') 
 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=('15ba4f3a9851d63d8c06b8f67210dde9')
+md5sums=('c1902cf4727f4cd976d6cc0beb1c03fe')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/gnome-terminal/gnome-terminal.install
diff -u extra/gnome/gnome-terminal/gnome-terminal.install:1.7 extra/gnome/gnome-terminal/gnome-terminal.install:1.8
--- extra/gnome/gnome-terminal/gnome-terminal.install:1.7	Sun Apr 22 12:15:58 2007
+++ extra/gnome/gnome-terminal/gnome-terminal.install	Thu Jun 21 15:43:34 2007
@@ -1,8 +1,7 @@
 pkgname=gnome-terminal
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  usr/sbin/gconfpkg --install ${pkgname}
   scrollkeeper-update -q -p var/lib/scrollkeeper
 }
 
@@ -15,16 +14,7 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {