[arch-commits] Commit in gnome-vfs/repos (testing-x86_64 testing-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Wednesday, March 18, 2009 @ 17:34:23
  Author: jgc
Revision: 30315

Merged revisions 30314 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gnome-vfs/trunk

........
  r30314 | jgc | 2009-03-18 21:34:12 +0000 (Wed, 18 Mar 2009) | 2 lines
  
  upgpkg: gnome-vfs 2.24.1-2
      Rebuild with new gconf to shrink schemas file
........

Modified:
  gnome-vfs/repos/testing-x86_64/	(properties)
  gnome-vfs/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


Property changes on: gnome-vfs/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-vfs/trunk:1-30214
   + /gnome-vfs/trunk:1-30314

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-03-18 21:34:12 UTC (rev 30314)
+++ testing-x86_64/PKGBUILD	2009-03-18 21:34:23 UTC (rev 30315)
@@ -3,12 +3,12 @@
 
 pkgname=gnome-vfs
 pkgver=2.24.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('fam' 'gconf>=2.26.0' 'hal>=0.5.11' 'bzip2' 'avahi>=0.6.24' 'smbclient>=3.3.1' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2.1' 'gnutls>=2.6.4')
-makedepends=('perlxml' 'pkgconfig' 'intltool')
+depends=('fam' 'gconf>=2.26.0-2' 'hal>=0.5.11' 'bzip2' 'avahi>=0.6.24' 'smbclient>=3.3.1' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2.1' 'gnutls>=2.6.4')
+makedepends=('pkgconfig' 'intltool')
 options=('!libtool' '!emptydirs')
 conflicts=(gnome-vfs-samba)
 provides=(gnome-vfs-samba)
@@ -34,6 +34,6 @@
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
   install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${startdir}/pkg/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }