xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 315
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Sat 2011-08-13 19:46:09 +0200
message:
  * debian/control: bump minimal required lightdm version for
    lightdm-set-defaults.
  * usr/share/xubuntu/lightdm: dropped, probably not needed anymore, we'll
    see.
  * debian/postinst,debian/postrm: set xubuntu as the default session and
    lightdm-gtk-greeter as the default greeter if they aren't set already.
    Remove them on uninstall. (thanks Didier!)
  * debian/preinst,debian/prerm,debian/postinst: clean up the alternatives
    introduced in the previous upload.
removed:
  debian/prerm
  usr/share/xubuntu/lightdm/
  usr/share/xubuntu/lightdm/lightdm.conf
modified:
  debian/changelog
  debian/control
  debian/postinst
  debian/postrm
  debian/preinst


--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk

Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-01 17:47:33 +0000
+++ debian/changelog	2011-08-13 17:46:09 +0000
@@ -1,3 +1,17 @@
+xubuntu-default-settings (11.10.3) UNRELEASED; urgency=low
+
+  * debian/control: bump minimal required lightdm version for
+    lightdm-set-defaults.
+  * usr/share/xubuntu/lightdm: dropped, probably not needed anymore, we'll
+    see.
+  * debian/postinst,debian/postrm: set xubuntu as the default session and
+    lightdm-gtk-greeter as the default greeter if they aren't set already.
+    Remove them on uninstall. (thanks Didier!)
+  * debian/preinst,debian/prerm,debian/postinst: clean up the alternatives
+    introduced in the previous upload.
+
+ -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Sat, 13 Aug 2011 19:31:57 +0200
+
 xubuntu-default-settings (11.10.2) oneiric; urgency=low
 
   * debian/postinst,debian/prerm: set up alternatives for lightdm.conf and

=== modified file 'debian/control'
--- debian/control	2011-08-01 17:30:39 +0000
+++ debian/control	2011-08-13 17:46:09 +0000
@@ -11,7 +11,7 @@
 Package: xubuntu-default-settings
 Architecture: all
 Depends: ${misc:Depends}, xubuntu-artwork (>= 11.04.0~), ttf-droid,
- lightdm (>= 0.9.2-0ubuntu1), x11-common (>= 1:7.6+7ubuntu2)
+ lightdm (>= 0.9.3-0ubuntu2), x11-common (>= 1:7.6+7ubuntu2)
 Recommends: xfce4-utils
 Description: default settings for the Xubuntu desktop
  This package contains the default settings used by Xubuntu.

=== modified file 'debian/postinst'
--- debian/postinst	2011-08-01 17:30:39 +0000
+++ debian/postinst	2011-08-13 17:46:09 +0000
@@ -44,9 +44,11 @@
 fi
 
 case "$1" in
-  configure)
-    update-alternatives --install /etc/lightdm/lightdm.conf lightdm-config-derivative /usr/share/xubuntu/lightdm/lightdm.conf 50
-    update-alternatives --install /usr/share/xsessions/default.desktop default-xsession-derivative /usr/share/xsessions/xubuntu.desktop 50
+  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
 

=== modified file 'debian/postrm'
--- debian/postrm	2011-07-02 13:25:35 +0000
+++ debian/postrm	2011-08-13 17:46:09 +0000
@@ -43,4 +43,13 @@
     /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc "$LASTVER" -- "$@"
 fi
 
+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#

=== modified file 'debian/preinst'
--- debian/preinst	2011-07-02 13:25:35 +0000
+++ debian/preinst	2011-08-13 17:46:09 +0000
@@ -43,4 +43,13 @@
     /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc "$LASTVER" -- "$@"
 fi
 
+case "$1" in
+  upgrade)
+    if dpkg --compare-versions "$2" eq "11.10.2"; then
+      update-alternatives --remove lightdm-config-derivative /usr/share/xubuntu/lightdm/lightdm.conf
+      update-alternatives --remove default-xsession-derivative /usr/share/xsessions/xubuntu.desktop
+    fi
+    ;;
+esac
+
 #DEBHELPER#

=== removed file 'debian/prerm'
--- debian/prerm	2011-08-01 17:41:02 +0000
+++ debian/prerm	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-  remove)
-    update-alternatives --remove lightdm-config-derivative /usr/share/xubuntu/lightdm/lightdm.conf
-    update-alternatives --remove default-xsession-derivative /usr/share/xsessions/xubuntu.desktop
-    ;;
-esac
-
-#DEBHELPER#

=== removed directory 'usr/share/xubuntu/lightdm'
=== removed file 'usr/share/xubuntu/lightdm/lightdm.conf'
--- usr/share/xubuntu/lightdm/lightdm.conf	2011-08-01 17:30:39 +0000
+++ usr/share/xubuntu/lightdm/lightdm.conf	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-#
-# General configuration
-#
-# start-default-seat = True to always start one seat if none are defined in the configuration
-# greeter-user = User to run greeter as
-# minimum-display-number = Minimum display number to use for X servers
-# minimum-vt = First VT to run displays on
-# user-authority-in-system-dir = True if session authority should be in the system location
-# guest-account-script = Script to be run to setup guest account
-# log-directory = Directory to log information to
-# run-directory = Directory to put running state in
-# cache-directory = Directory to cache to
-#
-[LightDM]
-#start-default-seat=true
-#greeter-user=lightdm
-#minimum-display-number=0
-#minimum-vt=7
-#user-authority-in-system-dir=false
-#guest-account-script=guest-account
-#log-directory=/var/log/lightdm
-#run-directory=/var/run/lightdm
-#cache-directory=/var/cache/lightdm
-
-#
-# Seat defaults
-#
-# xserver-command = X server command to run
-# xserver-layout = Layout to pass to X server
-# xserver-config = Config file to pass to X server
-# xdmcp-manager = XDMCP manager to connect to
-# xdmcp-port = XDMCP UDP/IP port to communicate on
-# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
-# xsessions-directory = Directory to find X sessions
-# xgreeters-directory = Directory to find X greeters
-# greeter-session = Session to load for greeter
-# greeter-hide-users = True to hide the user list
-# user-session = Session to load for users
-# allow-guest = True if guest login is allowed
-# guest-session = Session to load for guests (overrides user-session)
-# session-wrapper = Wrapper script to run session with
-# autologin-guest = True to log in as guest by default
-# autologin-user = User to log in with by default (overrides autologin-guest)
-# autologin-user-timeout = Number of seconds to wait before loading default user
-# autologin-session = Session to load for automatic login (overrides user-session)
-#
-[SeatDefaults]
-#xserver-command=X
-#xserver-layout=
-#xserver-config=
-#xdmcp-manager=
-#xdmcp-port=177
-#xdmcp-key=
-#xsessions-directory=/usr/share/xsessions
-#xgreeters-directory=/usr/share/xgreeters
-#greeter-session=example-gtk-gnome
-#greeter-hide-users=false
-#user-session=default
-allow-guest=false
-#guest-session=UNIMPLEMENTED
-#session-wrapper=lightdm-session
-autologin-guest=false
-#autologin-user=
-#autologin-user-timeout=0
-#autologin-session=UNIMPLEMENTED
-
-#
-# Seat configuration
-#
-# Each seat must start with "Seat:".
-# Uses settings from [SeatDefaults], any of these can be overriden by setting them in this section.
-#
-#[Seat:0]
-
-#
-# XDMCP Server configuration
-#
-# enabled = True if XDMCP connections should be allowed
-# port = UDP/IP port to listen for connections on
-# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
-#
-# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
-# it can be a word and the first 7 characters are used as the key.
-#
-[XDMCPServer]
-#enabled=false
-#port=177
-#key=