Releasing 1.12.21.12.2

4 files changed, 31 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index ad5cd67e..998cd22d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Overview of changes in lightdm 1.12.2
+
+    * Fix pipe file descriptor leak for each session login / authentication
+    * Use correct syntax for DesktopNames key in session files
+    * Mock /run in tests
+
 Overview of changes in lightdm 1.12.1
 
     * Fix crash when having configuration keys defined in multiple places
diff --git a/configure.ac b/configure.ac
index f8720968..029a3ba0 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.12.1)
+AC_INIT(lightdm, 1.12.2)
 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 774733af..29cf0289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+lightdm (1.12.2-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release:
+    - Fix pipe file descriptor leak for each session login / authentication
+      (LP: #1190344)
+    - Use correct syntax for DesktopNames key in session files (LP: #1383321)
+    - Mock /run in tests
+  * debian/config-error-dialog.sh:
+    - Show warning dialog instead of interrupted login if syntax error in
+      ~/.profile etc (LP: #678421)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 13 Nov 2014 10:43:43 +1300
+
 lightdm (1.12.1-0ubuntu1) utopic; urgency=medium
 
   * New upstream release:
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 7547f919..7b4e9f53 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.12/liblightdm-gobject/language.c
 ===================================================================
---- trunk.orig/liblightdm-gobject/language.c
-+++ trunk/liblightdm-gobject/language.c
+--- 1.12.orig/liblightdm-gobject/language.c
++++ 1.12/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.12/tests/scripts/language-env.conf
 ===================================================================
---- trunk.orig/tests/scripts/language-env.conf
-+++ trunk/tests/scripts/language-env.conf
+--- 1.12.orig/tests/scripts/language-env.conf
++++ 1.12/tests/scripts/language-env.conf
 @@ -24,8 +24,8 @@ user-session=default
  #?SESSION-X-0 CONNECT-XSERVER
  
@@ -71,12 +71,12 @@ 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.12/src/seat.c
 ===================================================================
---- trunk.orig/src/seat.c
-+++ trunk/src/seat.c
-@@ -944,7 +944,7 @@ configure_session (Session *session, Ses
-         session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
+--- 1.12.orig/src/seat.c
++++ 1.12/src/seat.c
+@@ -949,7 +949,7 @@ configure_session (Session *session, Ses
+     }
      if (language && language[0] != '\0')
      {
 -        session_set_env (session, "LANG", language);