Merge lp:~unit193/xubuntu-default-settings/session-fix into lp:~xubuntu-dev/xubuntu-default-settings/trunk

[Unit 193]

[lp:~unit193/xubuntu-default-settings/session-fix]

455. By Unit 193 <unit193@Sigma> on 2013-12-10

Added in LP: 1259525, and missed the file we're actually installing.

456. By Unit 193 <unit193@Sigma> on 2013-12-10

Remove leading slash.

[Micah Gersten (micahg)]

Since this is blocking people from logging in, I'm taking this now, but someone should speak with the lightdm team and see if there's a cleanish way to clean up the config without the lightdm-set-defaults tool

review: Approve

=== added file 'debian/10-xubuntu.conf'
--- debian/10-xubuntu.conf	1970-01-01 00:00:00 +0000
+++ debian/10-xubuntu.conf	2013-12-10 21:10:24 +0000
@@ -0,0 +1,2 @@
+[SeatDefaults]
+user-session=xubuntu

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-20 19:44:00 +0000
+++ debian/changelog	2013-12-10 21:10:24 +0000
@@ -1,3 +1,10 @@
+xubuntu-default-settings (14.04.0) trusty; urgency=low
+
+  * Use /etc/lightdm.d/10-xubuntu.conf to set session, now that
+    lightdm-set-defaults is gone. (LP: 1259525)
+
+ -- Unit 193 <[e-mail]>  Sun, 08 Dec 2013 13:53:27 -0500
+
 xubuntu-default-settings (13.10.5) saucy; urgency=low
 
   * New wallpaper for saucy (lp: #1228098):

=== modified file 'debian/xubuntu-default-settings.install'
--- debian/xubuntu-default-settings.install	2011-11-19 19:05:13 +0000
+++ debian/xubuntu-default-settings.install	2013-12-10 21:10:24 +0000
@@ -1,2 +1,3 @@
 debian/tmp/etc
 debian/tmp/usr
+debian/10-xubuntu.conf	etc/lightdm/lightdm.conf.d/

=== modified file 'debian/xubuntu-default-settings.postinst'
--- debian/xubuntu-default-settings.postinst	2012-02-12 01:05:16 +0000
+++ debian/xubuntu-default-settings.postinst	2013-12-10 21:10:24 +0000
@@ -2,15 +2,6 @@
 
 set -e
 
-case "$1" in
-  configure|upgrade)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=xubuntu || true
-      /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
-    fi
-    ;;
-esac
-
 if [ "$1" = "configure" ] ; then
   update-alternatives --install /etc/lightdm/lightdm-gtk-greeter.conf \
     lightdm-gtk-greeter-config-derivative \

=== removed file 'debian/xubuntu-default-settings.postrm'
--- debian/xubuntu-default-settings.postrm	2012-02-12 01:05:16 +0000
+++ debian/xubuntu-default-settings.postrm	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-  remove|purge)
-    if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
-      /usr/lib/lightdm/lightdm-set-defaults --remove --session=xubuntu || true
-      /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
-    fi
-    ;;
-esac
-
-#DEBHELPER#