summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS9
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog13
-rw-r--r--debian/patches/04_language_handling.patch20
4 files changed, 33 insertions, 11 deletions
diff --git a/NEWS b/NEWS
index 327fbe3a..e7991966 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Overview of changes in lightdm 1.11.3
+
+ * Fix Mir sessions broken with unity-system-compositor 0.3.
+ * Add back Vala bindings for LightDM.Greeter.connect_sync - just mark as
+ deprecated.
+ * Put unity-system-compositor's mir_socket under /run rather than /tmp.
+ * Fix building with clang (3.5) and -Werror.
+ * Correct section name in default users.conf file.
+
Overview of changes in lightdm 1.11.2
* Add liblightdm method to get user UID
diff --git a/configure.ac b/configure.ac
index aadc9277..f7ca3ea2 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.11.2)
+AC_INIT(lightdm, 1.11.3)
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 137240ce..a9e0c431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+lightdm (1.11.3-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release:
+ - Fix Mir sessions broken with unity-system-compositor 0.3.
+ - Add back Vala bindings for LightDM.Greeter.connect_sync - just mark as
+ deprecated.
+ - Put unity-system-compositor's mir_socket under /run rather than /tmp.
+ (LP: #1325995)
+ - Fix building with clang (3.5) and -Werror.
+ - Correct section name in default users.conf file.
+
+ -- Robert Ancell <robert.ancell@canonical.com> Thu, 05 Jun 2014 16:07:14 +1200
+
lightdm (1.11.2-0ubuntu3) utopic; urgency=high
* No change rebuild against new dh_installinit, to call update-rc.d at
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 8c6f9dbc..a2177351 100644
--- a/debian/patches/04_language_handling.patch
+++ b/debian/patches/04_language_handling.patch
@@ -4,9 +4,9 @@ Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
Index: trunk/liblightdm-gobject/language.c
===================================================================
---- trunk.orig/liblightdm-gobject/language.c 2014-03-18 10:43:32.473863308 +1300
-+++ trunk/liblightdm-gobject/language.c 2014-03-18 10:43:32.469863307 +1300
-@@ -40,7 +40,7 @@
+--- trunk.orig/liblightdm-gobject/language.c
++++ trunk/liblightdm-gobject/language.c
+@@ -40,7 +40,7 @@ static GList *languages = NULL;
static void
update_languages (void)
{
@@ -15,7 +15,7 @@ Index: trunk/liblightdm-gobject/language.c
gchar *stdout_text = NULL, *stderr_text = NULL;
gint exit_status;
gboolean result;
-@@ -161,15 +161,39 @@
+@@ -161,15 +161,39 @@ lightdm_get_language (void)
{
const gchar *lang;
GList *link;
@@ -58,9 +58,9 @@ Index: trunk/liblightdm-gobject/language.c
Index: trunk/tests/scripts/language-env.conf
===================================================================
---- trunk.orig/tests/scripts/language-env.conf 2014-03-18 10:43:32.473863308 +1300
-+++ trunk/tests/scripts/language-env.conf 2014-03-18 10:43:32.469863307 +1300
-@@ -24,8 +24,8 @@
+--- trunk.orig/tests/scripts/language-env.conf
++++ trunk/tests/scripts/language-env.conf
+@@ -24,8 +24,8 @@ user-session=default
#?SESSION-X-0 CONNECT-XSERVER
# Check environment variables
@@ -73,9 +73,9 @@ Index: trunk/tests/scripts/language-env.conf
Index: trunk/src/seat.c
===================================================================
---- trunk.orig/src/seat.c 2014-03-18 10:43:32.473863308 +1300
-+++ trunk/src/seat.c 2014-03-18 10:43:32.469863307 +1300
-@@ -867,7 +867,7 @@
+--- trunk.orig/src/seat.c
++++ trunk/src/seat.c
+@@ -955,7 +955,7 @@ configure_session (Session *session, Ses
session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
if (language && language[0] != '\0')
{