[Pkg-xfce-commits] r6002 - in goodies/trunk/lightdm/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Wed Sep 7 07:26:20 UTC 2011
Author: corsac
Date: 2011-09-07 07:26:20 +0000 (Wed, 07 Sep 2011)
New Revision: 6002
Removed:
goodies/trunk/lightdm/debian/patches/06_fix-gtk-greeter-cancel-button.patch
Modified:
goodies/trunk/lightdm/debian/changelog
goodies/trunk/lightdm/debian/control
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
goodies/trunk/lightdm/debian/patches/series
Log:
- 01_set-default-path, 02_default-config, 03_quit-plymouth,
04_default-gtk-greeter-config refreshed.
* debian/control:
- add suggests on accountsservice.
Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog 2011-09-06 09:36:17 UTC (rev 6001)
+++ goodies/trunk/lightdm/debian/changelog 2011-09-07 07:26:20 UTC (rev 6002)
@@ -1,14 +1,12 @@
-lightdm (0.9.4-1) UNRELEASED; urgency=low
+lightdm (0.9.5-1) UNRELEASED; urgency=low
* New upstream release.
* debian/patches:
- - 01_set-default-path, 02_default-config, 03_quit-plymouth refreshed.
+ - 01_set-default-path, 02_default-config, 03_quit-plymouth,
+ 04_default-gtk-greeter-config 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.
- - 06_fix-gtk-greeter-cancel-button added, cherry-picked from upstream, fix
- cancel button in GTK+ greeter which prevented cancelling authentication
- when a wrong username was entered.
* debian/rules:
- don't install gdmflexiserver script for now until the PATH issue is
solved.
@@ -18,7 +16,8 @@
- provide a way to select the current greeter through debconf. Other
packages providing a greeter use the same templates/config to register
themselves in debconf.
- *
+ * debian/control:
+ - add suggests on accountsservice.
-- Yves-Alexis Perez <corsac at debian.org> Tue, 09 Aug 2011 20:55:24 +0200
Modified: goodies/trunk/lightdm/debian/control
===================================================================
--- goodies/trunk/lightdm/debian/control 2011-09-06 09:36:17 UTC (rev 6001)
+++ goodies/trunk/lightdm/debian/control 2011-09-07 07:26:20 UTC (rev 6002)
@@ -20,6 +20,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends},
lightdm-gtk-greeter | lightdm-qt-greeter, dbus, consolekit, adduser
Recommends: xserver-xorg
+Suggests: accountsservice
Description: simple display manager
An X display manager that:
* Has a lightweight codebase
Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch 2011-09-06 09:36:17 UTC (rev 6001)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch 2011-09-07 07:26:20 UTC (rev 6002)
@@ -2,11 +2,11 @@
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.4/src/session.c
+Index: lightdm-0.9.5/src/session.c
===================================================================
---- 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 @@
+--- lightdm-0.9.5.orig/src/session.c 2011-09-07 07:32:43.000000000 +0200
++++ lightdm-0.9.5/src/session.c 2011-09-07 09:21:36.280133903 +0200
+@@ -199,7 +199,10 @@
pam_session_open (session->priv->authentication);
user = pam_session_get_user (session->priv->authentication);
Modified: goodies/trunk/lightdm/debian/patches/02_default-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-09-06 09:36:17 UTC (rev 6001)
+++ goodies/trunk/lightdm/debian/patches/02_default-config.patch 2011-09-07 07:26:20 UTC (rev 6002)
@@ -8,11 +8,11 @@
* don't show userlist
=== modified file 'data/lightdm.conf'
-Index: lightdm-0.9.4/data/lightdm.conf
+Index: lightdm-0.9.5/data/lightdm.conf
===================================================================
---- 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 @@
+--- 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 @@
#xdmcp-port=177
#xdmcp-key=
#greeter-session=example-gtk-gnome
@@ -24,6 +24,6 @@
#guest-session=UNIMPLEMENTED
-#session-wrapper=lightdm-session
+session-wrapper=/etc/X11/Xsession
- #autologin-guest=false
- #autologin-user=
- #autologin-user-timeout=0
+ #display-setup-script=
+ #greeter-setup-script=
+ #session-setup-script=
Modified: goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch 2011-09-06 09:36:17 UTC (rev 6001)
+++ goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch 2011-09-07 07:26:20 UTC (rev 6002)
@@ -7,7 +7,7 @@
Index: lightdm-0.9.4/src/xserver-local.c
===================================================================
--- 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
++++ lightdm-0.9.4/src/xserver-local.c 2011-09-07 09:21:02.463925039 +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/04_default-gtk-greeter-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch 2011-09-06 09:36:17 UTC (rev 6001)
+++ goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch 2011-09-07 07:26:20 UTC (rev 6002)
@@ -1,7 +1,7 @@
-Index: lightdm-0.9.2/greeters/gtk/lightdm-gtk-greeter.conf
+Index: lightdm-0.9.4/greeters/gtk/lightdm-gtk-greeter.conf
===================================================================
---- lightdm-0.9.2.orig/greeters/gtk/lightdm-gtk-greeter.conf 2011-07-30 17:31:02.411250147 +0200
-+++ lightdm-0.9.2/greeters/gtk/lightdm-gtk-greeter.conf 2011-07-30 17:33:18.611915924 +0200
+--- 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 @@
# xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
#
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-06 09:36:17 UTC (rev 6001)
+++ goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch 2011-09-07 07:26:20 UTC (rev 6002)
@@ -1,8 +1,8 @@
-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)
+Index: lightdm-0.9.5/src/session.c
+===================================================================
+--- lightdm-0.9.5.orig/src/session.c 2011-09-07 09:21:36.280133903 +0200
++++ lightdm-0.9.5/src/session.c 2011-09-07 09:23:14.224738886 +0200
+@@ -209,19 +209,6 @@
process_set_env (PROCESS (session), "SHELL", user_get_shell (user));
set_env_from_authentication (session, session->priv->authentication);
Deleted: goodies/trunk/lightdm/debian/patches/06_fix-gtk-greeter-cancel-button.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/06_fix-gtk-greeter-cancel-button.patch 2011-09-06 09:36:17 UTC (rev 6001)
+++ goodies/trunk/lightdm/debian/patches/06_fix-gtk-greeter-cancel-button.patch 2011-09-07 07:26:20 UTC (rev 6002)
@@ -1,33 +0,0 @@
-Index: lightdm-0.9.4/greeters/gtk/lightdm-gtk-greeter.c
-===================================================================
---- lightdm-0.9.4.orig/greeters/gtk/lightdm-gtk-greeter.c 2011-08-16 06:33:11.000000000 +0200
-+++ lightdm-0.9.4/greeters/gtk/lightdm-gtk-greeter.c 2011-08-29 16:52:19.528140298 +0200
-@@ -110,19 +110,22 @@
- static void
- cancel_authentication (void)
- {
-+ /* If in authentication then stop that first */
-+ cancelling = FALSE;
- if (lightdm_greeter_get_in_authentication (greeter))
- {
- cancelling = TRUE;
- lightdm_greeter_cancel_authentication (greeter);
-+ return;
- }
-+
-+ /* Start a new login or return to the user list */
-+ if (lightdm_greeter_get_hide_users_hint (greeter))
-+ start_authentication (NULL);
- else
- {
-- cancelling = FALSE;
-- if (!lightdm_greeter_get_hide_users_hint (greeter))
-- {
-- gtk_widget_hide (login_box);
-- gtk_widget_grab_focus (GTK_WIDGET (user_view));
-- }
-+ gtk_widget_hide (login_box);
-+ gtk_widget_grab_focus (GTK_WIDGET (user_view));
- }
- }
-
Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series 2011-09-06 09:36:17 UTC (rev 6001)
+++ goodies/trunk/lightdm/debian/patches/series 2011-09-07 07:26:20 UTC (rev 6002)
@@ -3,4 +3,3 @@
03_quit-plymouth.patch
04_default-gtk-greeter-config.patch
05_dont-add-pkglibexecdir-path.patch
-06_fix-gtk-greeter-cancel-button.patch
More information about the Pkg-xfce-commits
mailing list