summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2015-11-20 16:06:59 +1300
committerRobert Ancell <robert.ancell@canonical.com>2015-11-20 16:06:59 +1300
commit23c2c07161caddc15f0fa133f20d23feb3a0246d (patch)
tree6eb9df363ee8d14c07645cd60dea3a199527cf39
parent65227ce37a23df71ba34cce5ba819f8be81f7003 (diff)
downloadlightdm-git-lightdm-1-14.tar.gz
Releasing 1.14.41.14.4lightdm-1-14
-rw-r--r--NEWS9
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog12
-rw-r--r--debian/patches/04_language_handling.patch20
4 files changed, 32 insertions, 11 deletions
diff --git a/NEWS b/NEWS
index 6341451d..fd5679f4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Overview of changes in lightdm 1.14.4
+
+ * Handle XDMCP Request packet with no addresses.
+ * Don't start LightDM if the XDMCP server is configured with a key that
+ doesn't exist.
+ * Add IP addresses to XDMCP log messages.
+ * Refactor XDMCP error handling.
+ * Add more tests.
+
Overview of changes in lightdm 1.14.3
* Handle trailing whitespace on boolean values in configuration.
diff --git a/configure.ac b/configure.ac
index ad0f7720..53136949 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.14.3)
+AC_INIT(lightdm, 1.14.4)
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 a103db65..c708b04e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+lightdm (1.14.4-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release:
+ - Handle XDMCP Request packet with no addresses. (LP: #1516831)
+ - Don't start LightDM if the XDMCP server is configured with a key that
+ doesn't exist. (LP: #1517685)
+ - Add IP addresses to XDMCP log messages.
+ - Refactor XDMCP error handling.
+ - Add more tests.
+
+ -- Robert Ancell <robert.ancell@canonical.com> Fri, 20 Nov 2015 16:01:15 +1300
+
lightdm (1.14.3-0ubuntu1) vivid; urgency=medium
* New upstream release:
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 67d1c673..f6076b3d 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.14/liblightdm-gobject/language.c
===================================================================
---- trunk.orig/liblightdm-gobject/language.c
-+++ trunk/liblightdm-gobject/language.c
+--- 1.14.orig/liblightdm-gobject/language.c
++++ 1.14/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.14/tests/scripts/language-env.conf
===================================================================
---- trunk.orig/tests/scripts/language-env.conf
-+++ trunk/tests/scripts/language-env.conf
+--- 1.14.orig/tests/scripts/language-env.conf
++++ 1.14/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.14/src/seat.c
===================================================================
---- trunk.orig/src/seat.c
-+++ trunk/src/seat.c
-@@ -997,7 +997,7 @@ configure_session (Session *session, Ses
+--- 1.14.orig/src/seat.c
++++ 1.14/src/seat.c
+@@ -1013,7 +1013,7 @@ configure_session (Session *session, Ses
}
if (language && language[0] != '\0')
{