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

[Ionut Biru]

    Date: Thursday, April 29, 2010 @ 16:07:49
  Author: ibiru
Revision: 78998

upgpkg: gdm 2.30.2-2
they changed the way desktop files are generated now. files .in.in should be modified and not .in

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

-------------------------------------------+
 04_fix_external_program_directories.patch |   22 +++++++++++-----------
 PKGBUILD                                  |    4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

Modified: 04_fix_external_program_directories.patch
===================================================================
--- 04_fix_external_program_directories.patch	2010-04-29 19:09:40 UTC (rev 78997)
+++ 04_fix_external_program_directories.patch	2010-04-29 20:07:49 UTC (rev 78998)
@@ -1,6 +1,6 @@
 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
++++ gdm-2.30.2/daemon/gdm-server.c	2010-04-29 22:55:49.631648355 +0300
 @@ -127,7 +127,7 @@
          g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
  
@@ -10,33 +10,33 @@
                                     server->priv->display_name);
  
          g_debug ("GdmServer: Running helper %s", command);
-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
+diff -Nur gdm-2.30.2.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.30.2/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+--- gdm-2.30.2.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-03-17 23:27:16.000000000 +0200
++++ gdm-2.30.2/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-04-29 22:53:54.984878068 +0300
 @@ -1,8 +1,8 @@
  [Desktop Entry]
  Type=Application
  _Name=GNOME Settings Daemon
--TryExec=/usr/libexec/gnome-settings-daemon
--Exec=/usr/libexec/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
+-TryExec=@LIBEXECDIR@/gnome-settings-daemon
+-Exec=@LIBEXECDIR@/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 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
+diff -Nur gdm-2.30.2.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.30.2/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
+--- gdm-2.30.2.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2010-03-26 15:28:03.000000000 +0200
++++ gdm-2.30.2/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2010-04-29 22:54:24.638396328 +0300
 @@ -1,5 +1,5 @@
  [Desktop Entry]
  Type=Application
  _Name=PolicyKit Authentication Agent
--Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+-Exec=@LIBEXECDIR@/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
++++ gdm-2.30.2/gui/simple-chooser/gdm-chooser-session.c	2010-04-29 22:57:08.691626507 +0300
 @@ -131,7 +131,7 @@
          ret = FALSE;
  

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-29 19:09:40 UTC (rev 78997)
+++ PKGBUILD	2010-04-29 20:07:49 UTC (rev 78998)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gdm
 pkgver=2.30.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=(i686 x86_64)
 license=('GPL')
@@ -22,7 +22,7 @@
         gdm-autologin.pam
         gdm)
 sha256sums=('884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5'
-            '7a8c4327280c9c8a872042ddf2d3aff8741d8385d317f4b83d768d69b249282e'
+            'cb585c39c6671387b5a25f21a99c97e3a20eaf4188fea1b62871681a1ebf8bff'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')