[Pkg-xfce-commits] r5930 - in goodies/trunk/lightdm/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-08-09 20:26:55 +0000 (Tue, 09 Aug 2011)
New Revision: 5930

Added:
   goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/lightdm.install
   goodies/trunk/lightdm/debian/patches/series
Log:
  - 05_dont-add-pkglibexecdir-path added, don't add /usr/lib/lightdm/lightdm
    to the PATH, it's ugly.
* debian/lightdm.install:
  - don't install gdmflexiserver script for now until the PATH issue is
    solved.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2011-08-09 19:41:59 UTC (rev 5929)
+++ goodies/trunk/lightdm/debian/changelog	2011-08-09 20:26:55 UTC (rev 5930)
@@ -4,6 +4,11 @@
   * debian/patches:
     - 01_set-default-path refreshed.
     - 05_always-export-XAUTHORITY dropped, included upstream. 
+    - 05_dont-add-pkglibexecdir-path added, don't add /usr/lib/lightdm/lightdm
+      to the PATH, it's ugly.
+  * debian/lightdm.install:
+    - don't install gdmflexiserver script for now until the PATH issue is
+      solved.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Aug 2011 20:55:24 +0200
 

Modified: goodies/trunk/lightdm/debian/lightdm.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.install	2011-08-09 19:41:59 UTC (rev 5929)
+++ goodies/trunk/lightdm/debian/lightdm.install	2011-08-09 20:26:55 UTC (rev 5930)
@@ -6,4 +6,5 @@
 etc/lightdm/users.conf
 etc/lightdm/lightdm.conf
 etc/lightdm/keys.conf
+usr/lib/lightdm/lightdm/gdmflexiserver /dev/null
 debian/lightdm-xsession.desktop /usr/share/xsessions

Added: goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch	                        (rev 0)
+++ goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch	2011-08-09 20:26:55 UTC (rev 5930)
@@ -0,0 +1,23 @@
+Index: lightdm-0.9.3/src/display.c
+===================================================================
+--- lightdm-0.9.3.orig/src/display.c	2011-08-09 22:23:49.615974286 +0200
++++ lightdm-0.9.3/src/display.c	2011-08-09 22:23:57.380022642 +0200
+@@ -613,18 +613,6 @@
+     process_set_env (PROCESS (session), "DESKTOP_SESSION", session_name); // FIXME: Apparently deprecated?
+     process_set_env (PROCESS (session), "GDMSESSION", session_name); // FIXME: Not cross-desktop
+ 
+-    /* Insert our own utility directory to PATH
+-     * This is to provide gdmflexiserver which provides backwards compatibility with GDM.
+-     * This can be removed when this is no longer required.
+-     */
+-    orig_path = process_get_env (PROCESS (session), "PATH");
+-    if (orig_path)
+-    {
+-        path = g_strdup_printf ("%s:%s", PKGLIBEXEC_DIR, orig_path);
+-        process_set_env (PROCESS (session), "PATH", path);
+-        g_free (path);
+-    }
+-
+     process_set_log_file (PROCESS (session), log_filename);
+ 
+     /* Open ConsoleKit session */

Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series	2011-08-09 19:41:59 UTC (rev 5929)
+++ goodies/trunk/lightdm/debian/patches/series	2011-08-09 20:26:55 UTC (rev 5930)
@@ -2,3 +2,4 @@
 02_default-config.patch
 03_quit-plymouth.patch
 04_default-gtk-greeter-config.patch
+05_dont-add-pkglibexecdir-path.patch