xubuntu-dev team mailing list archive

[Unit 193 <unit193@xxxxxxxxx>]

Unit 193 has proposed merging lp:~unit193/xubuntu-default-settings/session-fix into lp:xubuntu-default-settings.

Requested reviews:
  Xubuntu Developers (xubuntu-dev)

For more details, see:
https://code.launchpad.net/~unit193/xubuntu-default-settings/session-fix/+merge/198177
-- 
https://code.launchpad.net/~unit193/xubuntu-default-settings/session-fix/+merge/198177
Your team Xubuntu Developers is requested to review the proposed merge of lp:~unit193/xubuntu-default-settings/session-fix into lp:xubuntu-default-settings.

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-20 19:44:00 +0000
+++ debian/changelog	2013-12-08 19:08:57 +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.
+
+ -- Unit 193 <unit193@xxxxxxxxxx>  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-08 19:08:57 +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-08 19:08:57 +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#