diff options
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/04_language_handling.patch | 68 | ||||
| -rw-r--r-- | debian/patches/05_translate_debian_files.patch | 3 | ||||
| -rw-r--r-- | debian/patches/autologin-session-workaround.patch | 2 |
6 files changed, 50 insertions, 40 deletions
@@ -1,3 +1,9 @@ +Overview of changes in lightdm 1.25.1 + + * Fixes for VNC and XDMCP connections + * Use AccountsService extension system for extended greeter information + * Modernise code style + Overview of changes in lightdm 1.25.0 * Support moc being called moc-qt5 (e.g. Fedora) diff --git a/configure.ac b/configure.ac index e7ea5348..711db441 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.25.0) +AC_INIT(lightdm, 1.25.1) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) diff --git a/debian/changelog b/debian/changelog index a92bcd0e..3aa2c290 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +lightdm (1.25.1-0ubuntu1) bionic; urgency=medium + + * New upstream release: + - Fixes for VNC and XDMCP connections + * Use AccountsService extension system for extended greeter information + - Modernise code style + + -- Robert Ancell <robert.ancell@canonical.com> Thu, 18 Jan 2018 09:43:40 +1300 + lightdm (1.25.0-0ubuntu1) bionic; urgency=medium * New upstream release: diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch index 17e0dae2..137e9fe3 100644 --- a/debian/patches/04_language_handling.patch +++ b/debian/patches/04_language_handling.patch @@ -6,49 +6,43 @@ Index: lightdm/liblightdm-gobject/language.c =================================================================== --- lightdm.orig/liblightdm-gobject/language.c +++ lightdm/liblightdm-gobject/language.c -@@ -60,7 +60,7 @@ static GList *languages = NULL; - static void - update_languages (void) - { -- gchar *command = "locale -a"; -+ gchar *command = "/usr/share/language-tools/language-options"; +@@ -63,7 +63,7 @@ update_languages (void) + if (have_languages) + return; + +- const gchar *command = "locale -a"; ++ const gchar *command = "/usr/share/language-tools/language-options"; g_autofree gchar *stdout_text = NULL; g_autofree gchar *stderr_text = NULL; gint exit_status; -@@ -168,15 +168,39 @@ lightdm_get_language (void) +@@ -150,14 +150,30 @@ get_locale_name (const gchar *code) + LightDMLanguage * + lightdm_get_language (void) { - const gchar *lang; - GList *link; +- const gchar *lang = g_getenv ("LANG"); +- if (!lang) +- return NULL; + static const gchar *short_lang = NULL; -+ -+ if (short_lang) -+ goto match; - - lang = g_getenv ("LANG"); - if (!lang) - return NULL; - -+ /* Convert to a short form language code */ -+ gchar *command = g_strconcat ("/usr/share/language-tools/language-validate ", lang, NULL); -+ gchar *out; -+ GError *error = NULL; -+ if (g_spawn_command_line_sync (command, &out, NULL, NULL, &error)) ++ if (!short_lang) + { -+ short_lang = g_strdup (g_strchomp (out)); -+ g_free (out); -+ g_free (command); -+ } -+ else -+ { -+ g_warning ("Failed to run '%s': %s", command, error->message); -+ g_error_free (error); -+ g_free (command); -+ return NULL; -+ } -+ -+match: ++ const gchar *lang = g_getenv ("LANG"); ++ if (!lang) ++ return NULL; + - for (link = lightdm_get_languages (); link; link = link->next) ++ /* Convert to a short form language code */ ++ g_autofree gchar *command = g_strconcat ("/usr/share/language-tools/language-validate ", lang, NULL); ++ g_autofree gchar *out = NULL; ++ g_autoptr(GError) error = NULL; ++ if (g_spawn_command_line_sync (command, &out, NULL, NULL, &error)) ++ short_lang = g_strdup (g_strchomp (out)); ++ else ++ { ++ g_warning ("Failed to run '%s': %s", command, error->message); ++ return NULL; ++ } ++ } + + for (GList *link = lightdm_get_languages (); link; link = link->next) { LightDMLanguage *language = link->data; - if (lightdm_language_matches (language, lang)) @@ -75,7 +69,7 @@ Index: lightdm/src/seat.c =================================================================== --- lightdm.orig/src/seat.c +++ lightdm/src/seat.c -@@ -1008,7 +1008,7 @@ configure_session (Session *session, Ses +@@ -944,7 +944,7 @@ configure_session (Session *session, Ses } if (language && language[0] != '\0') { diff --git a/debian/patches/05_translate_debian_files.patch b/debian/patches/05_translate_debian_files.patch index 5c322aa8..4a9156d8 100644 --- a/debian/patches/05_translate_debian_files.patch +++ b/debian/patches/05_translate_debian_files.patch @@ -5,12 +5,13 @@ Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com> --- lightdm.orig/po/POTFILES.in 2014-09-30 05:00:39.000000000 +0200 +++ lightdm/po/POTFILES.in 2014-10-19 18:08:09.576134427 +0200 -@@ -1,5 +1,8 @@ +@@ -1,6 +1,9 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. [encoding: UTF-8] +debian/config-error-dialog.sh +debian/guest-account.sh +debian/guest-session-auto.sh + data/org.freedesktop.DisplayManager.AccountsService.policy.in src/lightdm.c src/dm-tool.c diff --git a/debian/patches/autologin-session-workaround.patch b/debian/patches/autologin-session-workaround.patch index 25878e46..476225c1 100644 --- a/debian/patches/autologin-session-workaround.patch +++ b/debian/patches/autologin-session-workaround.patch @@ -6,7 +6,7 @@ Index: lightdm/src/seat.c =================================================================== --- lightdm.orig/src/seat.c +++ lightdm/src/seat.c -@@ -1039,7 +1039,12 @@ create_user_session (Seat *seat, const g +@@ -968,7 +968,12 @@ create_user_session (Seat *seat, const g if (autostart) { const gchar *autologin_session_name = seat_get_string_property (seat, "autologin-session"); |