From 8c601a5d8803d9ee7244df6112e68e308fd460c8 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Wed, 22 Jan 2014 16:51:15 +1300
Subject: [PATCH] Releasing 1.9.6

---
 NEWS             | 12 ++++++++++++
 configure.ac     |  2 +-
 debian/changelog | 23 +++++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 4e15577b..693aad74 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Overview of changes in lightdm 1.9.6
+
+    * Support Mir sessions in xlocal seats by starting a unity system compositor
+      for each session.
+    * Add --screen and --fullscreen options to "dm-tool add-nested-seat"
+    * Don't try to compile liblightdm-qt if liblightdm-gobject will not be
+      compiled.
+    * Stop greeters warning if sessions directories not present or lightdm.conf
+      doesn't exist - this is valid.
+    * Fix log name for Mir display servers
+    * Fix double removal of source IDs
+
 Overview of changes in lightdm 1.9.5
 
     * In the unity seat, if we don't have proper VT support, fake VT 0 instead
diff --git a/configure.ac b/configure.ac
index b12ae291..4c0d0895 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.9.5)
+AC_INIT(lightdm, 1.9.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 2ab340de..cd8aabc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+lightdm (1.9.6-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release:
+    - Support Mir sessions in xlocal seats by starting a unity system compositor
+      for each session.
+    - Add --screen and --fullscreen options to "dm-tool add-nested-seat"
+    - Don't try to compile liblightdm-qt if liblightdm-gobject will not be
+      compiled.
+    - Stop greeters warning if sessions directories not present or lightdm.conf
+      doesn't exist - this is valid.
+    - Fix log name for Mir display servers
+    - Fix double removal of source IDs
+  * debian/guest-account:
+  * debian/guest-session-auto.sh:
+  * debian/lightdm.install:
+  * debian/rules:
+    - Warn users about the temporary nature of a guest session. (LP: #435930)
+  * debian/lightdm.install:
+  * debian/lightdm.maintscript:
+    - Move configuration from /etc to /usr/share so dpkg doesn't keep it around.
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 22 Jan 2014 15:51:29 +1300
+
 lightdm (1.9.5-0ubuntu1) trusty; urgency=low
 
   * New upstream release:
-- 
2.39.2