diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2016-07-28 16:44:42 +1200 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2016-07-28 16:44:42 +1200 |
commit | b5b19d4c56f8317cfd7447e6e21c88ef6b45baf3 (patch) | |
tree | 5696c9ef553e35fa3418d7ea0e1da88efa0266cb | |
parent | 4caf1acabcfe629b1f3eacda69c60fbe0ce35d0f (diff) | |
download | lightdm-git-b5b19d4c56f8317cfd7447e6e21c88ef6b45baf3.tar.gz |
Refresh debian/patches
-rw-r--r-- | debian/patches/04_language_handling.patch | 20 | ||||
-rw-r--r-- | debian/patches/autologin-session-workaround.patch | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch index 327934ed..e278c249 100644 --- a/debian/patches/04_language_handling.patch +++ b/debian/patches/04_language_handling.patch @@ -2,10 +2,10 @@ Description: Adjustments due to handling of languages Forwarded: not-needed Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com> -Index: trunk/liblightdm-gobject/language.c +Index: 1.18/liblightdm-gobject/language.c =================================================================== ---- trunk.orig/liblightdm-gobject/language.c -+++ trunk/liblightdm-gobject/language.c +--- 1.18.orig/liblightdm-gobject/language.c ++++ 1.18/liblightdm-gobject/language.c @@ -40,7 +40,7 @@ static GList *languages = NULL; static void update_languages (void) @@ -56,10 +56,10 @@ Index: trunk/liblightdm-gobject/language.c return language; } -Index: trunk/tests/scripts/language-env.conf +Index: 1.18/tests/scripts/language-env.conf =================================================================== ---- trunk.orig/tests/scripts/language-env.conf -+++ trunk/tests/scripts/language-env.conf +--- 1.18.orig/tests/scripts/language-env.conf ++++ 1.18/tests/scripts/language-env.conf @@ -24,8 +24,8 @@ user-session=default #?SESSION-X-0 CONNECT-XSERVER @@ -71,11 +71,11 @@ Index: trunk/tests/scripts/language-env.conf #?*SESSION-X-0 READ-ENV NAME=GDM_LANG #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU -Index: trunk/src/seat.c +Index: 1.18/src/seat.c =================================================================== ---- trunk.orig/src/seat.c -+++ trunk/src/seat.c -@@ -1020,7 +1020,7 @@ configure_session (Session *session, Ses +--- 1.18.orig/src/seat.c ++++ 1.18/src/seat.c +@@ -1010,7 +1010,7 @@ configure_session (Session *session, Ses } if (language && language[0] != '\0') { diff --git a/debian/patches/autologin-session-workaround.patch b/debian/patches/autologin-session-workaround.patch index 297b760c..f1cea827 100644 --- a/debian/patches/autologin-session-workaround.patch +++ b/debian/patches/autologin-session-workaround.patch @@ -2,11 +2,11 @@ Description: Workaround faulty setting from Ubuntu user-setup package Author: Robert Ancell <robert.ancell@canonical.com> Bug: https://bugs.launchpad.net/bugs/1484083 -Index: trunk/src/seat.c +Index: 1.18/src/seat.c =================================================================== ---- trunk.orig/src/seat.c -+++ trunk/src/seat.c -@@ -1050,7 +1050,12 @@ create_user_session (Seat *seat, const g +--- 1.18.orig/src/seat.c ++++ 1.18/src/seat.c +@@ -1040,7 +1040,12 @@ create_user_session (Seat *seat, const g if (autostart) { const gchar *autologin_session_name = seat_get_string_property (seat, "autologin-session"); |