Releasing 1.16.61.16.6

5 files changed, 36 insertions, 15 deletions

diff --git a/NEWS b/NEWS
index e0f59ecb..9104bbc1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Overview of changes in lightdm 1.16.6
+
+    * 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.16.5
 
     * Handle trailing whitespace on boolean values in configuration.
diff --git a/configure.ac b/configure.ac
index 661236cc..6b5752b7 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.16.5)
+AC_INIT(lightdm, 1.16.6)
 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 9c1ad7a2..b35e2439 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+lightdm (1.16.6-0ubuntu1) wily; 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 15:46:15 +1300
+
 lightdm (1.16.5-0ubuntu1) wily; urgency=medium
 
   * New upstream release:
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 09d56244..4335d609 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.16/liblightdm-gobject/language.c
 ===================================================================
---- trunk.orig/liblightdm-gobject/language.c
-+++ trunk/liblightdm-gobject/language.c
+--- 1.16.orig/liblightdm-gobject/language.c
++++ 1.16/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.16/tests/scripts/language-env.conf
 ===================================================================
---- trunk.orig/tests/scripts/language-env.conf
-+++ trunk/tests/scripts/language-env.conf
+--- 1.16.orig/tests/scripts/language-env.conf
++++ 1.16/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.16/src/seat.c
 ===================================================================
---- trunk.orig/src/seat.c
-+++ trunk/src/seat.c
-@@ -1003,7 +1003,7 @@ configure_session (Session *session, Ses
+--- 1.16.orig/src/seat.c
++++ 1.16/src/seat.c
+@@ -1017,7 +1017,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 1d977d7b..04b3de50 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.16/src/seat.c
 ===================================================================
---- trunk.orig/src/seat.c
-+++ trunk/src/seat.c
-@@ -1033,7 +1033,12 @@ create_user_session (Seat *seat, const g
+--- 1.16.orig/src/seat.c
++++ 1.16/src/seat.c
+@@ -1047,7 +1047,12 @@ create_user_session (Seat *seat, const g
      if (autostart)
      {
          const gchar *autologin_session_name = seat_get_string_property (seat, "autologin-session");