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

[Jan de Groot]

    Date: Monday, April 20, 2009 @ 15:46:02
  Author: jgc
Revision: 36222

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

........
  r36216 | jgc | 2009-04-20 19:32:06 +0000 (Mon, 20 Apr 2009) | 1 line
  
  upgpkg: gnome-session 2.26.1-1
........

Modified:
  gnome-session/repos/extra-x86_64/	(properties)
  gnome-session/repos/extra-x86_64/PKGBUILD
Deleted:
  gnome-session/repos/extra-x86_64/gnome-session.sh

------------------+
 PKGBUILD         |   13 ++++---------
 gnome-session.sh |    5 -----
 2 files changed, 4 insertions(+), 14 deletions(-)


Property changes on: gnome-session/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-session/trunk:1-33002
   + /gnome-session/trunk:1-36221

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-20 19:40:32 UTC (rev 36221)
+++ extra-x86_64/PKGBUILD	2009-04-20 19:46:02 UTC (rev 36222)
@@ -2,21 +2,19 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-session
-pkgver=2.26.0
+pkgver=2.26.1
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('policykit-gnome>=0.9.2' 'gnome-settings-daemon>=2.26.0' 'at-spi>=1.26.0' 'startup-notification>=0.9' 'dbus>=1.2.4.4permissive' 'libglade>=2.6.4' 'libxtst')
+depends=('policykit-gnome>=0.9.2' 'gnome-settings-daemon>=2.26.1' 'at-spi>=1.26.0' 'startup-notification>=0.10' 'dbus>=1.2.4.4permissive' 'libglade>=2.6.4' 'libxtst')
 makedepends=('pkgconfig' 'intltool' 'xtrans')
 options=(!emptydirs)
 install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2
-	gnome-session.sh)
-md5sums=('e17dbce7446b3e42fac2b1cea7dedffd'
-         '06f84ea99c2c1c686756bf7aac33661a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('aa280939a3e07209081095e8e10fe619')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,7 +26,4 @@
   install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-session-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  mv "${pkgdir}/usr/bin/gnome-session" "${pkgdir}/usr/lib/gnome-session/" || return 1
-  install -m755 "${srcdir}/gnome-session.sh" "${pkgdir}/usr/bin/gnome-session" || return 1
 }

Deleted: extra-x86_64/gnome-session.sh
===================================================================
--- extra-x86_64/gnome-session.sh	2009-04-20 19:40:32 UTC (rev 36221)
+++ extra-x86_64/gnome-session.sh	2009-04-20 19:46:02 UTC (rev 36222)
@@ -1,5 +0,0 @@
-#!/bin/sh
-if [ -n "${DISPLAY}" ]; then
-  . /etc/X11/xinit/xinitrc.d/30-dbus
-fi
-exec /usr/lib/gnome-session/gnome-session $@