------------------------------------------------------------ revno: 312 committer: Lionel Le Folgoc <[email protected]> branch nick: xubuntu-default-settings timestamp: Mon 2011-08-01 19:30:39 +0200 message: * debian/postinst,debian/prerm: set up alternatives for lightdm.conf and default.desktop. * debian/control: depends on the proper revisions of x11-common and lightdm for the features we use, and drop gdm from recommends. * usr/share/xubuntu/lightdm/lightdm.conf: added, disables guest session. added: debian/prerm usr/share/xubuntu/lightdm/ usr/share/xubuntu/lightdm/lightdm.conf modified: debian/changelog debian/control debian/postinst
-- 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-07-24 22:03:28 +0000 +++ debian/changelog 2011-08-01 17:30:39 +0000 @@ -1,3 +1,13 @@ +xubuntu-default-settings (11.10.2) UNRELEASED; urgency=low + + * debian/postinst,debian/prerm: set up alternatives for lightdm.conf and + default.desktop. + * debian/control: depends on the proper revisions of x11-common and lightdm + for the features we use, and drop gdm from recommends. + * usr/share/xubuntu/lightdm/lightdm.conf: added, disables guest session. + + -- Lionel Le Folgoc <[email protected]> Mon, 01 Aug 2011 19:20:22 +0200 + xubuntu-default-settings (11.10.1) oneiric; urgency=low * debian/{preinst,postint,postrm}: cleanup, remove natty-specific code, and === modified file 'debian/control' --- debian/control 2011-07-02 13:40:13 +0000 +++ debian/control 2011-08-01 17:30:39 +0000 @@ -10,7 +10,8 @@ Package: xubuntu-default-settings Architecture: all -Depends: ${misc:Depends}, xubuntu-artwork (>= 11.04.0~), ttf-droid -Recommends: xfce4-utils, lightdm | gdm +Depends: ${misc:Depends}, xubuntu-artwork (>= 11.04.0~), ttf-droid, + lightdm (>= 0.9.2-0ubuntu1), 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-07-02 13:25:35 +0000 +++ debian/postinst 2011-08-01 17:30:39 +0000 @@ -43,4 +43,11 @@ /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc "$LASTVER" -- "$@" 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 + ;; +esac + #DEBHELPER# === added file 'debian/prerm' --- debian/prerm 1970-01-01 00:00:00 +0000 +++ debian/prerm 2011-08-01 17:30:39 +0000 @@ -0,0 +1,12 @@ +#! /bin/sh + +set -e + +case "$1" in + configure) + 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# === added directory 'usr/share/xubuntu/lightdm' === added file 'usr/share/xubuntu/lightdm/lightdm.conf' --- usr/share/xubuntu/lightdm/lightdm.conf 1970-01-01 00:00:00 +0000 +++ usr/share/xubuntu/lightdm/lightdm.conf 2011-08-01 17:30:39 +0000 @@ -0,0 +1,88 @@ +# +# 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=
_______________________________________________ Mailing list: https://launchpad.net/~xubuntu-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~xubuntu-dev More help : https://help.launchpad.net/ListHelp
