From a9e1c9e9f89ffc3687032799af47f7f281236fb7 Mon Sep 17 00:00:00 2001 From: corsac Date: Thu, 5 Mar 2015 20:47:34 +0000 Subject: [PATCH] * New upstream release. * debian/patches: - 01_set-default-path and 06_change-user-dirs refreshed for new release. - 03_use-desktopnames-properties dropped, included upstream. git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8847 0c9b3bff-18ee-0310-b944-d1aa2700132f --- debian/changelog | 9 + debian/patches/01_set-default-path.patch | 4 +- .../03_use-desktopnames-properties.patch | 201 ------------------ debian/patches/06_change-user-dirs.patch | 4 +- debian/patches/series | 1 - debian/watch | 2 +- 6 files changed, 14 insertions(+), 207 deletions(-) delete mode 100644 debian/patches/03_use-desktopnames-properties.patch diff --git a/debian/changelog b/debian/changelog index 92f1b17..de4f72b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +lightdm (1.12.2-1) UNRELEASED; urgency=medium + + * New upstream release. + * debian/patches: + - 01_set-default-path and 06_change-user-dirs refreshed for new release. + - 03_use-desktopnames-properties dropped, included upstream. + + -- Yves-Alexis Perez Thu, 05 Mar 2015 21:10:01 +0100 + lightdm (1.10.3-3) unstable; urgency=medium * debian/patches: diff --git a/debian/patches/01_set-default-path.patch b/debian/patches/01_set-default-path.patch index 1a3cfdf..bf5a7c5 100644 --- a/debian/patches/01_set-default-path.patch +++ b/debian/patches/01_set-default-path.patch @@ -4,7 +4,7 @@ Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277 Description: Fix default PATH environment variable --- a/src/seat.c +++ b/src/seat.c -@@ -274,7 +274,10 @@ run_script (Seat *seat, DisplayServer *d +@@ -306,7 +306,10 @@ run_script (Seat *seat, DisplayServer *d process_set_env (script, "PATH", g_getenv ("PATH")); } else @@ -18,7 +18,7 @@ Description: Fix default PATH environment variable { --- a/src/session-child.c +++ b/src/session-child.c -@@ -354,7 +354,10 @@ session_child_run (int argc, char **argv +@@ -410,7 +410,10 @@ session_child_run (int argc, char **argv else { /* Set POSIX variables */ diff --git a/debian/patches/03_use-desktopnames-properties.patch b/debian/patches/03_use-desktopnames-properties.patch deleted file mode 100644 index 29c6db5..0000000 --- a/debian/patches/03_use-desktopnames-properties.patch +++ /dev/null @@ -1,201 +0,0 @@ ---- lightdm/src/seat.c 2014-09-30 03:33:38 +0000 -+++ lightdm/src/seat.c 2014-10-20 14:28:16 +0000 -@@ -848,14 +848,19 @@ - static void - configure_session (Session *session, SessionConfig *config, const gchar *session_name, const gchar *language) - { -- const gchar *desktop_name; -+ gchar **desktop_names; - - session_set_config (session, config); - session_set_env (session, "DESKTOP_SESSION", session_name); - session_set_env (session, "GDMSESSION", session_name); -- desktop_name = session_config_get_desktop_name (config); -- if (desktop_name) -- session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name); -+ desktop_names = session_config_get_desktop_names (config); -+ if (desktop_names) -+ { -+ gchar *value; -+ value = g_strjoinv (":", desktop_names); -+ session_set_env (session, "XDG_CURRENT_DESKTOP", value); -+ g_free (value); -+ } - if (language && language[0] != '\0') - { - session_set_env (session, "LANG", language); - ---- lightdm/src/session-config.c 2014-09-12 00:04:28 +0000 -+++ lightdm/src/session-config.c 2014-10-20 14:28:16 +0000 -@@ -16,8 +16,8 @@ - /* Session type */ - gchar *session_type; - -- /* Desktop name */ -- gchar *desktop_name; -+ /* Desktop names */ -+ gchar **desktop_names; - - /* Command to run */ - gchar *command; -@@ -53,7 +53,20 @@ - config->priv->session_type = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-Session-Type", NULL); - if (!config->priv->session_type) - config->priv->session_type = g_strdup ("x"); -- config->priv->desktop_name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-DesktopName", NULL); -+ -+ config->priv->desktop_names = g_key_file_get_string_list (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "DesktopNames", NULL, NULL); -+ if (!config->priv->desktop_names) -+ { -+ gchar *name; -+ -+ name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-DesktopName", NULL); -+ if (name) -+ { -+ config->priv->desktop_names = g_malloc (sizeof (gchar *) * 2); -+ config->priv->desktop_names[0] = name; -+ config->priv->desktop_names[1] = NULL; -+ } -+ } - config->priv->compositor_command = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-System-Compositor-Command", NULL); - - g_key_file_free (desktop_file); -@@ -75,11 +88,11 @@ - return config->priv->session_type; - } - --const gchar * --session_config_get_desktop_name (SessionConfig *config) -+gchar ** -+session_config_get_desktop_names (SessionConfig *config) - { - g_return_val_if_fail (config != NULL, NULL); -- return config->priv->desktop_name; -+ return config->priv->desktop_names; - } - - const gchar * -@@ -101,7 +114,7 @@ - SessionConfig *self = SESSION_CONFIG (object); - - g_free (self->priv->session_type); -- g_free (self->priv->desktop_name); -+ g_strfreev (self->priv->desktop_names); - g_free (self->priv->command); - g_free (self->priv->compositor_command); - - ---- lightdm/src/session-config.h 2014-09-12 00:04:28 +0000 -+++ lightdm/src/session-config.h 2014-10-20 14:28:16 +0000 -@@ -42,7 +42,7 @@ - - const gchar *session_config_get_session_type (SessionConfig *config); - --const gchar *session_config_get_desktop_name (SessionConfig *config); -+gchar **session_config_get_desktop_names (SessionConfig *config); - - const gchar *session_config_get_compositor_command (SessionConfig *config); - - ---- lightdm/tests/Makefile.am 2014-09-30 03:33:38 +0000 -+++ lightdm/tests/Makefile.am 2014-10-20 14:28:16 +0000 -@@ -56,6 +56,7 @@ - test-login-guest-session-config \ - test-group-membership \ - test-xdg-current-desktop \ -+ test-xdg-current-desktop-legacy \ - test-xdg-seat \ - test-language-env \ - test-session-stdout \ -@@ -339,6 +340,7 @@ - data/sessions/mir.desktop \ - data/sessions/mir-container.desktop \ - data/sessions/named.desktop \ -+ data/sessions/named-legacy.desktop \ - data/sessions/surfaceflinger.desktop \ - scripts/0-additional.conf \ - scripts/1-additional.conf \ -@@ -543,6 +545,7 @@ - scripts/vnc-open-file-descriptors.conf \ - scripts/xauthority.conf \ - scripts/xdg-current-desktop.conf \ -+ scripts/xdg-current-desktop-legacy.conf \ - scripts/xdg-seat.conf \ - scripts/xdmcp-client.conf \ - scripts/xdmcp-server-login.conf \ - -=== added file 'tests/data/sessions/named-legacy.desktop' ---- lightdm/tests/data/sessions/named-legacy.desktop 1970-01-01 00:00:00 +0000 -+++ lightdm/tests/data/sessions/named-legacy.desktop 2014-10-20 14:28:16 +0000 -@@ -0,0 +1,5 @@ -+[Desktop Entry] -+Name=Test Session -+Comment=LightDM test session -+Exec=test-session -+X-LightDM-DesktopName=TestDesktop - -=== modified file 'tests/data/sessions/named.desktop' ---- lightdm/tests/data/sessions/named.desktop 2013-08-19 00:21:19 +0000 -+++ lightdm/tests/data/sessions/named.desktop 2014-10-20 14:28:16 +0000 -@@ -2,4 +2,4 @@ - Name=Test Session - Comment=LightDM test session - Exec=test-session --X-LightDM-DesktopName=TestDesktop -+DesktopNames=TestDesktop1;TestDesktop2; - -=== added file 'tests/scripts/xdg-current-desktop-legacy.conf' ---- lightdm/tests/scripts/xdg-current-desktop-legacy.conf 1970-01-01 00:00:00 +0000 -+++ lightdm/tests/scripts/xdg-current-desktop-legacy.conf 2014-10-20 14:28:16 +0000 -@@ -0,0 +1,30 @@ -+# -+# Check XDG_CURRENT_DESKTOP is set for sessions that support it using the legacy key name -+# -+ -+[SeatDefaults] -+autologin-user=have-password1 -+user-session=named-legacy -+ -+#?*START-DAEMON -+#?RUNNER DAEMON-START -+ -+# X server starts -+#?XSERVER-0 START VT=7 SEAT=seat0 -+ -+# Daemon connects when X server is ready -+#?*XSERVER-0 INDICATE-READY -+#?XSERVER-0 INDICATE-READY -+#?XSERVER-0 ACCEPT-CONNECT -+ -+# Session starts -+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=named-legacy USER=have-password1 -+#?LOGIN1 ACTIVATE-SESSION SESSION=c0 -+#?XSERVER-0 ACCEPT-CONNECT -+#?SESSION-X-0 CONNECT-XSERVER -+ -+# Cleanup -+#?*STOP-DAEMON -+#?SESSION-X-0 TERMINATE SIGNAL=15 -+#?XSERVER-0 TERMINATE SIGNAL=15 -+#?RUNNER DAEMON-EXIT STATUS=0 - -=== modified file 'tests/scripts/xdg-current-desktop.conf' ---- lightdm/tests/scripts/xdg-current-desktop.conf 2014-03-17 18:33:02 +0000 -+++ lightdm/tests/scripts/xdg-current-desktop.conf 2014-10-20 14:28:16 +0000 -@@ -18,7 +18,7 @@ - #?XSERVER-0 ACCEPT-CONNECT - - # Session starts --#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=named USER=have-password1 -+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop1:TestDesktop2 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=named USER=have-password1 - #?LOGIN1 ACTIVATE-SESSION SESSION=c0 - #?XSERVER-0 ACCEPT-CONNECT - #?SESSION-X-0 CONNECT-XSERVER - -=== added file 'tests/test-xdg-current-desktop-legacy' ---- lightdm/tests/test-xdg-current-desktop-legacy 1970-01-01 00:00:00 +0000 -+++ lightdm/tests/test-xdg-current-desktop-legacy 2014-10-20 14:28:16 +0000 -@@ -0,0 +1,2 @@ -+#!/bin/sh -+./src/dbus-env ./src/test-runner xdg-current-desktop-legacy test-gobject-greeter - diff --git a/debian/patches/06_change-user-dirs.patch b/debian/patches/06_change-user-dirs.patch index ae2f1f0..f13c8bd 100644 --- a/debian/patches/06_change-user-dirs.patch +++ b/debian/patches/06_change-user-dirs.patch @@ -1,6 +1,6 @@ --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -78,7 +78,7 @@ lightdm_CFLAGS = \ +@@ -74,7 +74,7 @@ lightdm_CFLAGS = \ $(LIGHTDM_CFLAGS) \ -I"$(top_srcdir)/common" \ -DSBIN_DIR=\"$(sbindir)\" \ @@ -11,7 +11,7 @@ -DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \ --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -476,7 +476,7 @@ lightdm_CFLAGS = \ +@@ -470,7 +470,7 @@ lightdm_CFLAGS = \ $(LIGHTDM_CFLAGS) \ -I"$(top_srcdir)/common" \ -DSBIN_DIR=\"$(sbindir)\" \ diff --git a/debian/patches/series b/debian/patches/series index 4d88677..c9f9a54 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 01_set-default-path.patch 02_fix-apparmor-profile.patch -03_use-desktopnames-properties.patch 05_debianize-pam-files.patch 06_change-user-dirs.patch diff --git a/debian/watch b/debian/watch index affe0f4..1e9bbd7 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 opts=pgpsigurlmangle=s/$/.asc/ \ -https://launchpad.net/lightdm/1.10 \ +https://launchpad.net/lightdm/1.12 \ https://launchpad.net/lightdm/.*/lightdm-(\d\.\d+\.\d+)\.tar\.(?:gz|bz2|xz) -- 2.39.2