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

[Jan de Groot]

    Date: Friday, April 3, 2009 @ 17:17:49
  Author: jgc
Revision: 33019

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

........
  r33018 | jgc | 2009-04-03 21:17:37 +0000 (Fri, 03 Apr 2009) | 2 lines
  
  upgpkg: gnome-bluetooth 0.12.0-1
      Remove desktop-file-utils dependency, as we include no desktop file anymore. Take care of old gconf schemas, the new package does not have them
........

Modified:
  gnome-bluetooth/repos/testing-x86_64/	(properties)
  gnome-bluetooth/repos/testing-x86_64/PKGBUILD
  gnome-bluetooth/repos/testing-x86_64/gnome-bluetooth.install

-------------------------+
 PKGBUILD                |   10 +++-------
 gnome-bluetooth.install |   23 +++--------------------
 2 files changed, 6 insertions(+), 27 deletions(-)


Property changes on: gnome-bluetooth/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-bluetooth/trunk:1-33015
   + /gnome-bluetooth/trunk:1-33018

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-04-03 21:17:37 UTC (rev 33018)
+++ testing-x86_64/PKGBUILD	2009-04-03 21:17:49 UTC (rev 33019)
@@ -8,9 +8,9 @@
 arch=('i686' 'x86_64')
 url="http://www.usefulinc.com/software/gnome-bluetooth/"
 license=('GPL' 'LGPL')
-depends=('libbtctl>=0.10.0' 'libgnomeui>=2.24.1' 'desktop-file-utils' 'gconf>=2.26.0-2')
+depends=('libbtctl>=0.10.0' 'libgnomeui>=2.24.1')
 makedepends=('gob2' 'intltool' 'pygtk>=2.14.1')
-options=('!libtool' '!emptydirs')
+options=('!libtool')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/0.12/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('881a01ce964b8c02b5d40be8b5aedcaf')
@@ -24,9 +24,5 @@
       -e 's|^pydir = /usr|pydir = |' \
       -i src/Makefile || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-     
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas" || return 1
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-bluetooth ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install || return 1
 }

Modified: testing-x86_64/gnome-bluetooth.install
===================================================================
--- testing-x86_64/gnome-bluetooth.install	2009-04-03 21:17:37 UTC (rev 33018)
+++ testing-x86_64/gnome-bluetooth.install	2009-04-03 21:17:49 UTC (rev 33019)
@@ -1,22 +1,5 @@
-pkgname=gnome-bluetooth
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-}
-
 pre_upgrade() {
-  pre_remove $1
+  if [ -f usr/share/gconf/schemas/gnome-bluetooth.schemas ]; then
+    usr/sbin/gconfpkg --uninstall gnome-bluetooth
+  fi
 }
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-}