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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-06 05:29:47 +0000 (Thu, 06 Oct 2011)
New Revision: 6091

Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
Log:
* debian/patches:
  - 05_dont-add-pkglibexecdir-path refreshed for new upstream release.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2011-10-05 20:30:10 UTC (rev 6090)
+++ goodies/trunk/lightdm/debian/changelog	2011-10-06 05:29:47 UTC (rev 6091)
@@ -1,9 +1,11 @@
-lightdm (1.0.1-1) UNRELEASED; urgency=low
+lightdm (1.0.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/control:
     - add recommends on policykit-1 to greeters.                closes: #643292
   * debian/lightdm-autologin.pam added, fix startup.            closes: #643844
+  * debian/patches:
+    - 05_dont-add-pkglibexecdir-path refreshed for new upstream release.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 05 Oct 2011 22:15:58 +0200
 

Modified: goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch	2011-10-05 20:30:10 UTC (rev 6090)
+++ goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch	2011-10-06 05:29:47 UTC (rev 6091)
@@ -1,16 +1,22 @@
-Index: lightdm-1.0.1/src/session.c
+Index: lightdm-1.0.2/src/session.c
 ===================================================================
---- lightdm-1.0.1.orig/src/session.c	2011-10-05 22:15:10.864382047 +0200
-+++ lightdm-1.0.1/src/session.c	2011-10-05 22:15:22.708609110 +0200
-@@ -310,19 +310,6 @@
-     process_set_command (PROCESS (session), absolute_command);
-     g_free (absolute_command);
+--- lightdm-1.0.2.orig/src/session.c	2011-10-06 07:28:51.660678486 +0200
++++ lightdm-1.0.2/src/session.c	2011-10-06 07:28:58.712733068 +0200
+@@ -216,26 +216,6 @@
+     }
+ }
  
--    /* Insert our own utility directory to PATH
--     * This is to provide gdmflexiserver which provides backwards compatibility with GDM.
--     * Must be done after set_env_from_authentication because that often sets PATH.
--     * This can be removed when this is no longer required.
--     */
+-/* Insert our own utility directory to PATH
+- * This is to provide gdmflexiserver which provides backwards compatibility
+- * with GDM.
+- * Must be done after set_env_from_authentication because PAM sets PATH.
+- * This can be removed when this is no longer required.
+- */
+-static void
+-insert_utility_path (Session *session)
+-{
+-    const gchar *orig_path;
+-
 -    orig_path = session_get_env (session, "PATH");
 -    if (orig_path)
 -    {
@@ -18,7 +24,16 @@
 -        session_set_env (session, "PATH", path);
 -        g_free (path);
 -    }
+-}
 -
-     pam_session_open (session->priv->authentication);
+ gboolean
+ session_start (Session *session)
+ {
+@@ -435,7 +415,6 @@
+     pam_session_setup (session->priv->authentication);
+     set_env_from_authentication (session, session->priv->authentication);
+     set_locale (session);
+-    insert_utility_path (session);
  
-     /* Open ConsoleKit session */
+     PROCESS_CLASS (session_parent_class)->run (process);
+ }