[arch-commits] CVS update of extra/gnome/gdm (PKGBUILD gdm.install)

[Jan de Groot]

    Date: Saturday, August 4, 2007 @ 17:30:10
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gdm

Modified: PKGBUILD (1.60 -> 1.61) gdm.install (1.12 -> 1.13)

upgpkg: gdm 2.18.4-1


-------------+
 PKGBUILD    |   15 ++++++---------
 gdm.install |    6 ------
 2 files changed, 6 insertions(+), 15 deletions(-)


Index: extra/gnome/gdm/PKGBUILD
diff -u extra/gnome/gdm/PKGBUILD:1.60 extra/gnome/gdm/PKGBUILD:1.61
--- extra/gnome/gdm/PKGBUILD:1.60	Sat Jul  7 05:56:57 2007
+++ extra/gnome/gdm/PKGBUILD	Sat Aug  4 17:30:10 2007
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD,v 1.60 2007/07/07 09:56:57 jgc Exp $
+# $Id: PKGBUILD,v 1.61 2007/08/04 21:30:10 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gdm
-pkgver=2.18.3
+pkgver=2.18.4
 pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('pam' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.14.0-2' 'librsvg>=2.16.1' 'gksu' 'popt' 'xorg-xsm' 'dbus-glib>=0.7.4' 'scrollkeeper' 'gconf>=2.18.0.1-4')
+depends=('pam' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.14.0-2' 'librsvg>=2.18.0' 'gksu' 'popt' 'xorg-xsm' 'dbus-glib>=0.7.4' 'scrollkeeper')
 makedepends=('perlxml' 'zenity>=2.18.1' 'gnome-doc-utils>=0.10.3' 'pkgconfig')
 install=gdm.install
 url="http://www.gnome.org"
@@ -19,7 +19,7 @@
 	gdm.pam
 	gdm-autologin.pam
 	gdm-stop.diff)
-md5sums=('08555fce34d247062625c1a451a4d5a6' '770fe5aeb8d35271a5a2330ce01508f0'
+md5sums=('53e5f5820fa67abf55c37ea7570807b7' '770fe5aeb8d35271a5a2330ce01508f0'
          '682c0602f2f235085d5d9255428d7a35' 'b20fe3c8487a039050986d60e45233a9'
 	 '157f32e089a7aab50732dc122e592b35' 'aebb718505664be074531c8dfaf04dfc')
 
@@ -57,12 +57,9 @@
   #Remove the session .desktop file, we have this one in gnome-session now.
   rm -rf ${startdir}/pkg/usr/share/xsessions
   
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
-
   # fix gdmsetup 
-  sed -i -e 's|^Exec=|Exec=gksu |' ${startdir}/pkg/usr/share/applications/gdmsetup.desktop
+  sed -i -e 's|^Exec=|Exec=gksu |' ${startdir}/pkg/usr/share/applications/gdmsetup.desktop || return 1
+  sed -i -e '/^TryExec=$/d' ${startdir}/pkg/usr/share/applications/gdmflexiserver-xnest.desktop || return 1
 
   mv ${startdir}/pkg/var/lib/log ${startdir}/pkg/var/log
 }
Index: extra/gnome/gdm/gdm.install
diff -u extra/gnome/gdm/gdm.install:1.12 extra/gnome/gdm/gdm.install:1.13
--- extra/gnome/gdm/gdm.install:1.12	Sat Jul  7 05:56:58 2007
+++ extra/gnome/gdm/gdm.install	Sat Aug  4 17:30:10 2007
@@ -5,7 +5,6 @@
   chown root.gdm /var/lib/gdm > /dev/null
   chmod 1770 /var/lib/gdm > /dev/null
 
-  usr/sbin/gconfpkg --install ${pkgname}
   scrollkeeper-update -q -p var/lib/scrollkeeper 
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
@@ -20,17 +19,12 @@
      opt/gnome/etc/gdm/custom.conf > etc/gdm/custom.conf
      mv opt/gnome/etc/gdm/custom.conf opt/gnome/etc/gdm/custom.conf.pacsave
   fi
-  pre_remove $1
 }
 
 post_upgrade() {
   post_install $1
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
 post_remove() {
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor