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

[Jan de Groot]

    Date: Sunday, April 12, 2009 @ 11:07:29
  Author: jgc
Revision: 35359

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

........
  r35352 | jgc | 2009-04-12 14:54:10 +0000 (Sun, 12 Apr 2009) | 1 line
  
  upgpkg: gnome-keyring 2.26.1-1
........

Modified:
  gnome-keyring/repos/extra-i686/	(properties)
  gnome-keyring/repos/extra-i686/PKGBUILD
Deleted:
  gnome-keyring/repos/extra-i686/gnome-keyring.service

-----------------------+
 PKGBUILD              |   10 +++-------
 gnome-keyring.service |    3 ---
 2 files changed, 3 insertions(+), 10 deletions(-)


Property changes on: gnome-keyring/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-keyring/trunk:1-31959
   + /gnome-keyring/trunk:1-35358

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-12 15:04:22 UTC (rev 35358)
+++ extra-i686/PKGBUILD	2009-04-12 15:07:29 UTC (rev 35359)
@@ -2,7 +2,7 @@
 #Maintainer: Jan De Groot <jgc at archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=2.26.0
+pkgver=2.26.1
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
@@ -12,9 +12,8 @@
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2
-	gnome-keyring.service)
-md5sums=('0395fcf79b990465030a2795dcddacb9' '16062d82eb8062201fb24f3e0ceb49a6')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('060b349a0aae130fdd3cd0a9827258c6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,9 +24,6 @@
   make || return 1
   make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
-  install -m755 -d "${pkgdir}/usr/share/dbus-1/services"
-  install -m644 "${srcdir}/gnome-keyring.service" "${pkgdir}/usr/share/dbus-1/services/" || return 1
-     
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-keyring ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas

Deleted: extra-i686/gnome-keyring.service
===================================================================
--- extra-i686/gnome-keyring.service	2009-04-12 15:04:22 UTC (rev 35358)
+++ extra-i686/gnome-keyring.service	2009-04-12 15:07:29 UTC (rev 35359)
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.keyring
-Exec=/usr/bin/gnome-keyring-daemon