Merge lp:~noskcaj/ubuntu/wily/lightdm-gtk-greeter/merge into lp:ubuntu/wily/lightdm-gtk-greeter

[Jackson Doak]

Merge from debian to fix a gtk3.16 related VT issue

[Martin Pitt (pitti)]

Thanks! Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-16 20:20:00 +0000
+++ debian/changelog	2015-06-22 22:05:32 +0000
@@ -1,3 +1,37 @@
+lightdm-gtk-greeter (2.0.1-2ubuntu1) wily; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/01_ubuntu.conf
+      + Renamed from lightdm-gtk-greeter-ubuntu.conf
+      + Removed unneeded comments
+    - debian/control, debian/rules:
+      + Add Indicators support.
+    - debian/control:
+      + Build-Depends on liblightdm-gobject-1-dev instead on
+        liblightdm-gobject-dev as it's non-existing in archive.
+    - debian/copyright:
+      + Update copyright for lightdm-gtk-greeter, it's been a long time
+        since lightdm housed all of the greeters
+    - debian/01_ubuntu.conf,
+      debian/lightdm-gtk-greeter.{post,pre}{inst,rm},
+      debian/60-lightdm-gtk-greeter.conf:
+      + Install and remove Ubuntu conf files.
+    - debian/lightdm-gtk-greeter.{preinst,prerm,postinstpostrm}
+      + Migrate post-1.0.0 configuration to conf.d/01_ubuntu.conf
+      + Do not use update-alternatives for lightdm-gtk-greeter config
+    - debian/rules
+      + Install lightdm and lightdm-gtk-greeter configuration
+
+ -- Jackson Doak <[e-mail]>  Tue, 23 Jun 2015 07:55:21 +1000
+
+lightdm-gtk-greeter (2.0.1-2) unstable; urgency=medium
+
+  * debian/rules:
+    - use --enable-kill-on-sigterm for configure, prevents spawning new VTs
+      when using GTK 3.16.
+
+ -- Yves-Alexis Perez <[e-mail]>  Sun, 21 Jun 2015 11:12:26 +0200
+
 lightdm-gtk-greeter (2.0.1-1ubuntu1) wily; urgency=low
 
   [ Sean Davis ]

=== modified file 'debian/rules'
--- debian/rules	2015-06-16 20:20:00 +0000
+++ debian/rules	2015-06-22 22:05:32 +0000
@@ -4,7 +4,7 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-silent-rules
+	dh_auto_configure -- --disable-silent-rules --enable-kill-on-sigterm
 
 override_dh_install:
 	dh_install debian/60-lightdm-gtk-greeter.conf usr/share/lightdm/lightdm.conf.d/