[arch-commits] Commit in gdm/trunk (2 files)

Thu Apr 29 13:51:49 UTC 2010

Date: Thursday, April 29, 2010 @ 09:51:48
  Author: ibiru
Revision: 78926

upgpkg: gdm 2.30.2-1
update to 2.30.2

Modified:
  gdm/trunk/04_fix_external_program_directories.patch
  gdm/trunk/PKGBUILD

-------------------------------------------+
 04_fix_external_program_directories.patch |   42 ++++++++++++++--------------
 PKGBUILD                                  |   10 +++---
 2 files changed, 26 insertions(+), 26 deletions(-)

Modified: 04_fix_external_program_directories.patch
===================================================================

--- 04_fix_external_program_directories.patch	2010-04-29 13:46:46 UTC (rev 78925)
+++ 04_fix_external_program_directories.patch	2010-04-29 13:51:48 UTC (rev 78926)
@@ -1,7 +1,6 @@
-# Description: Fix location of external programs.
-diff -Nur -x '*.orig' -x '*~' gdm-2.27.90/daemon/gdm-server.c gdm-2.27.90.new/daemon/gdm-server.c
---- gdm-2.27.90/daemon/gdm-server.c	2009-08-25 05:31:18.000000000 +1000
-+++ gdm-2.27.90.new/daemon/gdm-server.c	2009-08-25 14:35:12.000000000 +1000
+diff -Nur gdm-2.30.2.orig/daemon/gdm-server.c gdm-2.30.2/daemon/gdm-server.c
+--- gdm-2.30.2.orig/daemon/gdm-server.c	2010-04-26 20:08:42.000000000 +0300
++++ gdm-2.30.2/daemon/gdm-server.c	2010-04-29 16:34:52.396858517 +0300
 @@ -127,7 +127,7 @@
          g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
  
@@ -11,23 +10,33 @@
                                     server->priv->display_name);
  
          g_debug ("GdmServer: Running helper %s", command);
-diff -Nur -x '*.orig' -x '*~' gdm-2.27.90/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.27.90.new/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
---- gdm-2.27.90/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2009-08-25 05:31:18.000000000 +1000
-+++ gdm-2.27.90.new/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2009-08-25 14:35:12.000000000 +1000
+diff -Nur gdm-2.30.2.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in gdm-2.30.2/data/greeter-autostart/gnome-settings-daemon.desktop.in
+--- gdm-2.30.2.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in	2010-04-27 16:51:57.000000000 +0300
++++ gdm-2.30.2/data/greeter-autostart/gnome-settings-daemon.desktop.in	2010-04-29 16:36:04.916992754 +0300
 @@ -1,8 +1,8 @@
  [Desktop Entry]
  Type=Application
  _Name=GNOME Settings Daemon
--TryExec=@LIBEXECDIR@/gnome-settings-daemon
--Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
+-TryExec=/usr/libexec/gnome-settings-daemon
+-Exec=/usr/libexec/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
 +TryExec=/usr/bin/gnome-settings-daemon
 +Exec=/usr/bin/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
  OnlyShowIn=GNOME;
  X-GNOME-Autostart-Phase=Initialization
  X-GNOME-Autostart-Notify=true
-diff -Nur -x '*.orig' -x '*~' gdm-2.27.90/gui/simple-chooser/gdm-chooser-session.c gdm-2.27.90.new/gui/simple-chooser/gdm-chooser-session.c
---- gdm-2.27.90/gui/simple-chooser/gdm-chooser-session.c	2009-08-25 05:31:18.000000000 +1000
-+++ gdm-2.27.90.new/gui/simple-chooser/gdm-chooser-session.c	2009-08-25 14:35:12.000000000 +1000
+diff -Nur gdm-2.30.2.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in gdm-2.30.2/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in
+--- gdm-2.30.2.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in	2010-04-27 16:51:57.000000000 +0300
++++ gdm-2.30.2/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in	2010-04-29 16:38:35.533474550 +0300
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+ Type=Application
+ _Name=PolicyKit Authentication Agent
+-Exec=/usr/libexec/polkit-gnome-authentication-agent-1
++Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+ OnlyShowIn=GNOME;
+diff -Nur gdm-2.30.2.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.30.2/gui/simple-chooser/gdm-chooser-session.c
+--- gdm-2.30.2.orig/gui/simple-chooser/gdm-chooser-session.c	2010-03-17 23:27:16.000000000 +0200
++++ gdm-2.30.2/gui/simple-chooser/gdm-chooser-session.c	2010-04-29 16:37:54.803452184 +0300
 @@ -131,7 +131,7 @@
          ret = FALSE;
  
@@ -37,12 +46,3 @@
          if (error != NULL) {
                  g_warning ("Error starting settings daemon: %s", error->message);
                  g_error_free (error);
---- gdm-2.29.92/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.orig	2010-03-11 21:20:46.601321566 +0200
-+++ gdm-2.29.92/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in	2010-03-11 21:21:16.765676813 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
- Type=Application
- _Name=PolicyKit Authentication Agent
--Exec=/usr/lib/polkit-gnome-authentication-agent-1
-+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
- OnlyShowIn=GNOME;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-29 13:46:46 UTC (rev 78925)
+++ PKGBUILD	2010-04-29 13:51:48 UTC (rev 78926)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gdm
-pkgver=2.30.0
+pkgver=2.30.2
 pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=(i686 x86_64)
@@ -10,8 +10,8 @@
 backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
 groups=('gnome-extra')
 options=('!libtool')
-depends=('libcanberra>=0.23' 'libxklavier>=5.0' 'tcp_wrappers' 'gnome-session>=2.29.92' 'upower>=0.9.1')
-makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'xorg-server' 'gnome-panel>=2.29.92')
+depends=('libcanberra>=0.23' 'libxklavier>=5.0' 'tcp_wrappers' 'gnome-session>=2.30.0' 'upower>=0.9.2')
+makedepends=('intltool' 'gnome-doc-utils>=0.20.1' 'xorg-server' 'gnome-panel>=2.30.0')
 optdepends=('gnome-panel: needed for user switch applet')
 conflicts=('fast-user-switch-applet')
 replaces=('fast-user-switch-applet')
@@ -21,8 +21,8 @@
         gdm.pam
         gdm-autologin.pam
         gdm)
-sha256sums=('ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15'
-            '1c494fbd9a03a29ee94ba180e79a2a9fc3d11516bf5767faa53230c5939b8e09'
+sha256sums=('884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5'
+            '7a8c4327280c9c8a872042ddf2d3aff8741d8385d317f4b83d768d69b249282e'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')


