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

Yves-Alexis Perez corsac at alioth.debian.org
Thu Aug 25 04:11:59 UTC 2011 

Author: corsac
Date: 2011-08-25 16:11:59 +0000 (Thu, 25 Aug 2011)
New Revision: 5942

Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/lightdm.install
   goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
   goodies/trunk/lightdm/debian/patches/02_default-config.patch
   goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch
   goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
Log:
  - 01_set-default-path, 02_default-config, 03_quit-plymouth refreshed.
* debian/lightdm.install
  - install lightdm-set-default and dm-tool there.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2011-08-19 12:12:04 UTC (rev 5941)
+++ goodies/trunk/lightdm/debian/changelog	2011-08-25 16:11:59 UTC (rev 5942)
@@ -1,14 +1,16 @@
-lightdm (0.9.3-1) UNRELEASED; urgency=low
+lightdm (0.9.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/patches:
-    - 01_set-default-path refreshed.
+    - 01_set-default-path, 02_default-config, 03_quit-plymouth 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/rules:
     - don't install gdmflexiserver script for now until the PATH issue is
       solved.
+  * debian/lightdm.install
+    - install lightdm-set-default and dm-tool there.
 
  -- 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-19 12:12:04 UTC (rev 5941)
+++ goodies/trunk/lightdm/debian/lightdm.install	2011-08-25 16:11:59 UTC (rev 5942)
@@ -1,3 +1,4 @@
+usr/bin/dm-tool
 usr/sbin/lightdm
 usr/share/man
 usr/share/locale
@@ -7,3 +8,4 @@
 etc/lightdm/lightdm.conf
 etc/lightdm/keys.conf
 debian/lightdm-xsession.desktop /usr/share/xsessions
+usr/lib/lightdm/lightdm-set-defaults

Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2011-08-19 12:12:04 UTC (rev 5941)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2011-08-25 16:11:59 UTC (rev 5942)
@@ -2,12 +2,12 @@
 Author: Lionel Le Folgoc <mrpouit at gmail.com>
 Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
 Description: Fix default PATH environment variable
-Index: lightdm-0.9.3/src/session.c
+Index: lightdm-0.9.4/src/session.c
 ===================================================================
---- lightdm-0.9.3.orig/src/session.c	2011-08-08 09:34:42.000000000 +0200
-+++ lightdm-0.9.3/src/session.c	2011-08-09 21:38:31.987026176 +0200
-@@ -179,7 +179,10 @@
-     g_debug ("Launching session");
+--- lightdm-0.9.4.orig/src/session.c	2011-08-18 02:32:54.000000000 +0200
++++ lightdm-0.9.4/src/session.c	2011-08-25 17:50:11.183345425 +0200
+@@ -200,7 +200,10 @@
+     pam_session_open (session->priv->authentication);
  
      user = pam_session_get_user (session->priv->authentication);
 -    process_set_env (PROCESS (session), "PATH", "/usr/local/bin:/usr/bin:/bin");

Modified: goodies/trunk/lightdm/debian/patches/02_default-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/02_default-config.patch	2011-08-19 12:12:04 UTC (rev 5941)
+++ goodies/trunk/lightdm/debian/patches/02_default-config.patch	2011-08-25 16:11:59 UTC (rev 5942)
@@ -8,13 +8,13 @@
 * don't show userlist
 
 === modified file 'data/lightdm.conf'
-Index: lightdm-0.9.0/data/lightdm.conf
+Index: lightdm-0.9.4/data/lightdm.conf
 ===================================================================
---- lightdm-0.9.0.orig/data/lightdm.conf	2011-07-24 09:23:56.000000000 +0200
-+++ lightdm-0.9.0/data/lightdm.conf	2011-07-25 07:51:02.771167808 +0200
+--- lightdm-0.9.4.orig/data/lightdm.conf	2011-08-16 09:34:04.000000000 +0200
++++ lightdm-0.9.4/data/lightdm.conf	2011-08-25 17:50:16.171381802 +0200
 @@ -54,11 +54,11 @@
- #xsessions-directory=/usr/share/xsessions
- #xgreeters-directory=/usr/share/xgreeters
+ #xdmcp-port=177
+ #xdmcp-key=
  #greeter-session=example-gtk-gnome
 -#greeter-hide-users=false
 -#user-session=default

Modified: goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch	2011-08-19 12:12:04 UTC (rev 5941)
+++ goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch	2011-08-25 16:11:59 UTC (rev 5942)
@@ -4,10 +4,10 @@
 plymouth has been deactivated before, so just quit it for now.
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632737
 Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/799069
-Index: lightdm-0.9.0/src/xserver-local.c
+Index: lightdm-0.9.4/src/xserver-local.c
 ===================================================================
---- lightdm-0.9.0.orig/src/xserver-local.c	2011-07-25 07:55:08.527604600 +0200
-+++ lightdm-0.9.0/src/xserver-local.c	2011-07-25 07:55:14.207707242 +0200
+--- lightdm-0.9.4.orig/src/xserver-local.c	2011-07-25 13:36:24.000000000 +0200
++++ lightdm-0.9.4/src/xserver-local.c	2011-08-25 17:50:19.955409416 +0200
 @@ -115,7 +115,7 @@
              g_debug ("X server %s will replace Plymouth", xserver_get_address (XSERVER (self)));
              self->priv->replacing_plymouth = TRUE;

Modified: goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch	2011-08-19 12:12:04 UTC (rev 5941)
+++ goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch	2011-08-25 16:11:59 UTC (rev 5942)
@@ -1,23 +1,24 @@
-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
+diff --git a/src/session.c b/src/session.c
+index 4372195..52af4e8 100644
+--- a/src/session.c
++++ b/src/session.c
+@@ -207,19 +207,6 @@ session_start (Session *session)
+     process_set_env (PROCESS (session), "SHELL", user_get_shell (user));
+     set_env_from_authentication (session, session->priv->authentication);
  
 -    /* 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.
 -     */
 -    orig_path = process_get_env (PROCESS (session), "PATH");
 -    if (orig_path)
 -    {
--        path = g_strdup_printf ("%s:%s", PKGLIBEXEC_DIR, orig_path);
+-        gchar *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);
+     if (session->priv->cookie)
+         process_set_env (PROCESS (session), "XDG_SESSION_COOKIE", session->priv->cookie);
  
-     /* Open ConsoleKit session */

More information about the Pkg-xfce-commits mailing list