Releasing 1.15.11.15.1

4 files changed, 35 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index fbb42ce7..7f87df81 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Overview of changes in lightdm 1.15.1
+
+    * Fix default X server command set to XMir in 1.15.0.
+    * Internally merge the [SeatDefaults] and [Seat:*] sections together. The
+      previous method meant configuration snippets using a mix of old and new
+      naming would not correctly override eachother.
+    * Use IP address of XDMCP requests to contact X server if available.
+    * Add an option for XDMCP and VNC servers to only listen on one address.
+    * Fix configuration file warnings so they go to the log, not stderr.
+    * Warn if deprecated options logind-load-seats or xdg-seat are in
+      configuration.
+    * Improve IP addresses in XDMCP log messages.
+    * Fix typo in dm-tool man page.
+
 Overview of changes in lightdm 1.15.0
 
     * Deprecate [SeatDefaults] in favour of [Seat:*]
diff --git a/configure.ac b/configure.ac
index 9a7b0be9..fc01ee72 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.15.0)
+AC_INIT(lightdm, 1.15.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 aae7742b..0c827a67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+lightdm (1.15.1-0ubuntu1) wily; urgency=medium
+
+  * New upstream release:
+    - Fix default X server command set to XMir in 1.15.0.
+    - Internally merge the [SeatDefaults] and [Seat:*] sections together. The
+      previous method meant configuration snippets using a mix of old and new
+      naming would not correctly override eachother.
+    - Use IP address of XDMCP requests to contact X server if available.
+      (LP: #1481561)
+    - Add an option for XDMCP and VNC servers to only listen on one address.
+      (LP: #1390808)
+    - Fix configuration file warnings so they go to the log, not stderr.
+    - Warn if deprecated options logind-load-seats or xdg-seat are in
+      configuration. (LP: #1468057)
+    - Improve IP addresses in XDMCP log messages.
+    - Fix typo in dm-tool man page. (LP: #1470587)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 05 Aug 2015 16:53:39 +1200
+
 lightdm (1.15.0-0ubuntu1) wily; urgency=medium
 
   * New upstream release:
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 67d1c673..f50fdfc4 100644
--- a/debian/patches/04_language_handling.patch
+++ b/debian/patches/04_language_handling.patch
@@ -75,7 +75,7 @@ Index: trunk/src/seat.c
 ===================================================================
 --- trunk.orig/src/seat.c
 +++ trunk/src/seat.c
-@@ -997,7 +997,7 @@ configure_session (Session *session, Ses
+@@ -999,7 +999,7 @@ configure_session (Session *session, Ses
      }
      if (language && language[0] != '\0')
      {