[Pkg-xfce-commits] r6056 - in goodies/trunk/lightdm/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Wed Sep 28 11:22:02 UTC 2011
Author: corsac
Date: 2011-09-28 11:22:02 +0000 (Wed, 28 Sep 2011)
New Revision: 6056
Modified:
goodies/trunk/lightdm/debian/changelog
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/04_default-gtk-greeter-config.patch
goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
Log:
* debian/patches:
- all patches refreshed
Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog 2011-09-28 10:19:56 UTC (rev 6055)
+++ goodies/trunk/lightdm/debian/changelog 2011-09-28 11:22:02 UTC (rev 6056)
@@ -1,6 +1,8 @@
lightdm (1.0.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/patches:
+ - all patches refreshed
-- Yves-Alexis Perez <corsac at debian.org> Wed, 28 Sep 2011 12:19:56 +0200
Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch 2011-09-28 10:19:56 UTC (rev 6055)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch 2011-09-28 11:22:02 UTC (rev 6056)
@@ -2,19 +2,19 @@
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.6/src/session.c
+Index: lightdm-1.0.0/src/session.c
===================================================================
---- lightdm-0.9.6.orig/src/session.c 2011-09-11 07:48:18.000000000 +0200
-+++ lightdm-0.9.6/src/session.c 2011-09-15 10:30:54.498966614 +0200
-@@ -194,7 +194,10 @@
- pam_session_open (session->priv->authentication);
+--- lightdm-1.0.0.orig/src/session.c 2011-09-28 04:46:15.000000000 +0200
++++ lightdm-1.0.0/src/session.c 2011-09-28 13:20:42.530765164 +0200
+@@ -269,7 +269,10 @@
+ g_debug ("Launching session");
user = pam_session_get_user (session->priv->authentication);
-- process_set_env (PROCESS (session), "PATH", "/usr/local/bin:/usr/bin:/bin");
+- session_set_env (session, "PATH", "/usr/local/bin:/usr/bin:/bin");
+ if (user_get_uid (user) == 0)
-+ process_set_env (PROCESS (session), "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
++ session_set_env (session, "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
+ else
-+ process_set_env (PROCESS (session), "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
- process_set_env (PROCESS (session), "USER", user_get_name (user));
- process_set_env (PROCESS (session), "USERNAME", user_get_name (user)); // FIXME: Is this required?
- process_set_env (PROCESS (session), "HOME", user_get_home_directory (user));
++ session_set_env (session, "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
+ session_set_env (session, "USER", user_get_name (user));
+ session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required?
+ session_set_env (session, "HOME", user_get_home_directory (user));
Modified: goodies/trunk/lightdm/debian/patches/02_default-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-09-28 10:19:56 UTC (rev 6055)
+++ goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-09-28 11:22:02 UTC (rev 6056)
@@ -8,11 +8,11 @@
* don't show userlist
=== modified file 'data/lightdm.conf'
-Index: lightdm-0.9.5/data/lightdm.conf
+Index: lightdm-1.0.0/data/lightdm.conf
===================================================================
---- lightdm-0.9.5.orig/data/lightdm.conf 2011-09-05 04:41:55.000000000 +0200
-+++ lightdm-0.9.5/data/lightdm.conf 2011-09-07 09:23:02.784668233 +0200
-@@ -59,11 +59,11 @@
+--- lightdm-1.0.0.orig/data/lightdm.conf 2011-09-20 05:41:07.000000000 +0200
++++ lightdm-1.0.0/data/lightdm.conf 2011-09-28 13:17:00.709048867 +0200
+@@ -61,11 +61,11 @@
#xdmcp-port=177
#xdmcp-key=
#greeter-session=example-gtk-gnome
Modified: goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch 2011-09-28 10:19:56 UTC (rev 6055)
+++ goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch 2011-09-28 11:22:02 UTC (rev 6056)
@@ -4,11 +4,11 @@
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.6/src/xserver-local.c
+Index: lightdm-1.0.0/src/xserver-local.c
===================================================================
---- lightdm-0.9.6.orig/src/xserver-local.c 2011-09-15 08:56:23.000000000 +0200
-+++ lightdm-0.9.6/src/xserver-local.c 2011-09-15 10:31:02.015093674 +0200
-@@ -98,7 +98,7 @@
+--- lightdm-1.0.0.orig/src/xserver-local.c 2011-09-28 04:36:58.000000000 +0200
++++ lightdm-1.0.0/src/xserver-local.c 2011-09-28 13:17:05.105082902 +0200
+@@ -139,7 +139,7 @@
g_debug ("X server %s will replace Plymouth", xserver_get_address (XSERVER (self)));
self->priv->replacing_plymouth = TRUE;
self->priv->vt = active_vt;
Modified: goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch 2011-09-28 10:19:56 UTC (rev 6055)
+++ goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch 2011-09-28 11:22:02 UTC (rev 6056)
@@ -1,14 +1,15 @@
-Index: lightdm-0.9.4/greeters/gtk/lightdm-gtk-greeter.conf
+Index: lightdm-1.0.0/greeters/gtk/lightdm-gtk-greeter.conf
===================================================================
---- lightdm-0.9.4.orig/greeters/gtk/lightdm-gtk-greeter.conf 2011-07-22 05:24:36.000000000 +0200
-+++ lightdm-0.9.4/greeters/gtk/lightdm-gtk-greeter.conf 2011-09-07 09:21:05.291942506 +0200
-@@ -8,10 +8,10 @@
+--- lightdm-1.0.0.orig/greeters/gtk/lightdm-gtk-greeter.conf 2011-09-20 03:45:23.000000000 +0200
++++ lightdm-1.0.0/greeters/gtk/lightdm-gtk-greeter.conf 2011-09-28 13:18:07.865571415 +0200
+@@ -8,11 +8,11 @@
# xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
#
[greeter]
-#background=
++background=/usr/share/images/desktop-base/desktop-background
+ #show-language-selector=false
-#theme-name=
-+background=/usr/share/images/desktop-base/desktop-background
+theme-name=Adwaita
#font-name=
-#xft-antialias=
Modified: goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch 2011-09-28 10:19:56 UTC (rev 6055)
+++ goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch 2011-09-28 11:22:02 UTC (rev 6056)
@@ -1,24 +1,24 @@
-Index: lightdm-0.9.6/src/session.c
+Index: lightdm-1.0.0/src/session.c
===================================================================
---- lightdm-0.9.6.orig/src/session.c 2011-09-15 10:30:54.498966614 +0200
-+++ lightdm-0.9.6/src/session.c 2011-09-15 10:31:07.439185287 +0200
-@@ -204,19 +204,6 @@
- process_set_env (PROCESS (session), "SHELL", user_get_shell (user));
- set_env_from_authentication (session, session->priv->authentication);
+--- lightdm-1.0.0.orig/src/session.c 2011-09-28 12:21:52.000000000 +0200
++++ lightdm-1.0.0/src/session.c 2011-09-28 13:18:55.821939827 +0200
+@@ -297,19 +297,6 @@
+ process_set_command (PROCESS (session), absolute_command);
+ g_free (absolute_command);
- /* 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");
+- orig_path = session_get_env (session, "PATH");
- if (orig_path)
- {
- gchar *path = g_strdup_printf ("%s:%s", PKGLIBEXEC_DIR, orig_path);
-- process_set_env (PROCESS (session), "PATH", path);
+- session_set_env (session, "PATH", path);
- g_free (path);
- }
-
- if (session->priv->cookie)
- process_set_env (PROCESS (session), "XDG_SESSION_COOKIE", session->priv->cookie);
+ pam_session_open (session->priv->authentication);
+ /* Open ConsoleKit session */
More information about the Pkg-xfce-commits
mailing list