Releasing 1.7.171.7.17

4 files changed, 25 insertions, 10 deletions

diff --git a/NEWS b/NEWS
index d0df8291..1f89f353 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Overview of changes in lightdm 1.7.17
+
+    * surfaceflinger: Set XDG_VTNR=0 if VTs are not available
+    * Allow compiling of liblightdm-qt without liblightdm-gobject
+    * Add missing documentation for xremote seat options.
+
 Overview of changes in lightdm 1.7.16
 
     * Fix ConsoleKit support broken in 1.7.5
diff --git a/configure.ac b/configure.ac
index 045598aa..9ea2ba05 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.7.16)
+AC_INIT(lightdm, 1.7.17)
 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 f7737496..46209595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lightdm (1.7.17-0ubuntu1) saucy; urgency=low
+
+  * New upstream release:
+    - surfaceflinger: Set XDG_VTNR=0 if VTs are not available
+    - Allow compiling of liblightdm-qt without liblightdm-gobject
+    - Add missing documentation for xremote seat options.
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 25 Sep 2013 12:06:25 +1200
+
 lightdm (1.7.16-0ubuntu1) saucy; urgency=low
 
   * New upstream release:
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index f71def47..19fa06a9 100644
--- a/debian/patches/04_language_handling.patch
+++ b/debian/patches/04_language_handling.patch
@@ -4,8 +4,8 @@ Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
 
 Index: trunk/liblightdm-gobject/language.c
 ===================================================================
---- trunk.orig/liblightdm-gobject/language.c	2013-08-25 13:11:15.911273679 +1200
-+++ trunk/liblightdm-gobject/language.c	2013-08-25 13:11:15.903273679 +1200
+--- trunk.orig/liblightdm-gobject/language.c	2013-09-25 12:08:11.120803355 +1200
++++ trunk/liblightdm-gobject/language.c	2013-09-25 12:08:11.112803355 +1200
 @@ -40,7 +40,7 @@
  static void
  update_languages (void)
@@ -17,8 +17,8 @@ Index: trunk/liblightdm-gobject/language.c
      gboolean result;
 Index: trunk/tests/scripts/language-env.conf
 ===================================================================
---- trunk.orig/tests/scripts/language-env.conf	2013-08-25 13:11:15.911273679 +1200
-+++ trunk/tests/scripts/language-env.conf	2013-08-25 13:11:15.903273679 +1200
+--- trunk.orig/tests/scripts/language-env.conf	2013-09-25 12:08:11.120803355 +1200
++++ trunk/tests/scripts/language-env.conf	2013-09-25 12:08:11.112803355 +1200
 @@ -22,8 +22,8 @@
  #?SESSION-X-0 CONNECT-XSERVER
  
@@ -32,9 +32,9 @@ Index: trunk/tests/scripts/language-env.conf
  
 Index: trunk/src/seat.c
 ===================================================================
---- trunk.orig/src/seat.c	2013-08-25 13:11:15.911273679 +1200
-+++ trunk/src/seat.c	2013-08-25 13:11:15.907273679 +1200
-@@ -820,7 +820,7 @@
+--- trunk.orig/src/seat.c	2013-09-25 12:08:11.120803355 +1200
++++ trunk/src/seat.c	2013-09-25 12:08:11.112803355 +1200
+@@ -849,7 +849,7 @@
              session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
          if (language && language[0] != '\0')
          {
@@ -43,8 +43,8 @@ Index: trunk/src/seat.c
              session_set_env (session, "GDM_LANG", language);
          }
          session_set_username (session, username);
-@@ -976,7 +976,7 @@
-     session_set_env (session, "GDMSESSION", session_name);
+@@ -1008,7 +1008,7 @@
+         session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
      if (language && language[0] != '\0')
      {
 -        session_set_env (session, "LANG", language);