[26515] in Source-Commits
Re: /svn/athena r25598 - in trunk/debathena/config/lightdm-config/debian:
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Mon Jul 2 11:35:53 2012
Date: Mon, 2 Jul 2012 11:35:50 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201206301629.q5UGTGYH022188@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1207021135260.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
ACK, with r25602.
-Ben
On Sat, 30 Jun 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-06-30 12:29:16 -0400 (Sat, 30 Jun 2012)
> New Revision: 25598
>
> Added:
> trunk/debathena/config/lightdm-config/debian/lightdm.conf.debathena
> Removed:
> trunk/debathena/config/lightdm-config/debian/README
> Modified:
> trunk/debathena/config/lightdm-config/debian/changelog
> trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.config
> trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.install
> trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst
> trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.prerm
> trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.templates
> trunk/debathena/config/lightdm-config/debian/po/templates.pot
> trunk/debathena/config/lightdm-config/debian/rules
> Log:
> In lightdm-config:
> * Switch to config-package-dev instead of trying to place nice with what
> the user has installed, because we need to clobber some additional
> lightdm.conf settings; remove now-unused debconf templates
> * Set user-authority-in-system-dir=true in lightdm.conf (Trac: #1161)
>
>
> Modified: trunk/debathena/config/lightdm-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/changelog 2012-06-30 14:31:13 UTC (rev 25597)
> +++ trunk/debathena/config/lightdm-config/debian/changelog 2012-06-30 16:29:16 UTC (rev 25598)
> @@ -1,3 +1,12 @@
> +debathena-lightdm-config (1.3) unstable; urgency=low
> +
> + * Switch to config-package-dev instead of trying to place nice with what
> + the user has installed, because we need to clobber some additional
> + lightdm.conf settings; remove now-unused debconf templates
> + * Set user-authority-in-system-dir=true in lightdm.conf (Trac: #1161)
> +
> + -- Jonathan Reed <jdreed@mit.edu> Sat, 30 Jun 2012 12:29:34 -0400
> +
> debathena-lightdm-config (1.2) unstable; urgency=low
>
> * Support kiosk browsing
>
> Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.config
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.config 2012-06-30 14:31:13 UTC (rev 25597)
> +++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.config 2012-06-30 16:29:16 UTC (rev 25598)
> @@ -8,7 +8,3 @@
> db_input high debathena-lightdm-config/force_lightdm || true
> db_go
> fi
> -
> -# Ask the user whether or not to force the greeter
> -db_input high debathena-lightdm-config/force_greeter || true
> -db_go
>
> Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.install
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.install 2012-06-30 14:31:13 UTC (rev 25597)
> +++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.install 2012-06-30 16:29:16 UTC (rev 25598)
> @@ -11,4 +11,4 @@
> debian/debathena7.png usr/share/debathena-lightdm-config
> debian/debathena8.png usr/share/debathena-lightdm-config
> debian/debathena-lightdm-greeter.desktop usr/share/xgreeters
> -
> +debian/lightdm.conf.debathena etc/lightdm
>
> Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst 2012-06-30 14:31:13 UTC (rev 25597)
> +++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst 2012-06-30 16:29:16 UTC (rev 25598)
> @@ -20,9 +20,6 @@
> # Source debconf library.
> . /usr/share/debconf/confmodule
>
> -GREETER="debathena-lightdm-greeter"
> -SET_DEFAULTS="/usr/lib/lightdm/lightdm-set-defaults"
> -
> case "$1" in
> configure)
> db_get debathena-lightdm-config/force_lightdm
> @@ -30,18 +27,6 @@
> db_set shared/default-x-display-manager "lightdm"
> echo "/usr/sbin/lightdm" > /etc/X11/default-display-manager
> fi
> - # First, set it anyway with --keep-old since maybe they don't
> - # have a greeter set
> - [ -x "$SET_DEFAULTS" ] && \
> - "$SET_DEFAULTS" -k -g "$GREETER" || true
> - if ! grep -qxF "greeter-session=$GREETER" /etc/lightdm/lightdm.conf; then
> - # OK, they were using something else
> - db_get debathena-lightdm-config/force_greeter
> - if [ "$RET" = "true" ]; then
> - "$SET_DEFAULTS" -g "$GREETER" || true
> - fi
> - fi
> -
> ;;
>
> abort-upgrade|abort-remove|abort-deconfigure)
>
> Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.prerm
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.prerm 2012-06-30 14:31:13 UTC (rev 25597)
> +++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.prerm 2012-06-30 16:29:16 UTC (rev 25598)
> @@ -16,38 +16,8 @@
> # for details, see http://www.debian.org/doc/debian-policy/ or
> # the debian-policy package
>
> -# Source debconf library.
> -. /usr/share/debconf/confmodule
> -
> -GREETER="debathena-lightdm-greeter"
> -SET_DEFAULTS="/usr/lib/lightdm/lightdm-set-defaults"
> -
> -set_useful_greeter () {
> - GREETER_DIR=/usr/share/xgreeters
> - if [ -f "${GREETER_DIR}/unity-greeter.desktop" ]; then
> - "$SET_DEFAULTS" -g unity-greeter || true
> - elif [ -f "${GREETER_DIR}/lightdm-gtk-greeter.desktop" ]; then
> - "$SET_DEFAULTS" -g lightdm-gtk-greeter.desktop || true
> - else
> - GREETER=$(basename $(echo $(ls $GREETER_DIR/*.desktop | grep -v debathena) | cut -d ' ' -f 1) | sed -e 's/\.desktop$//')
> - if [ -n "$GREETER" ]; then
> - "$SET_DEFAULTS" -g "$GREETER" || true
> - fi
> - fi
> -}
> -
> -
> case "$1" in
> remove|deconfigure)
> - # Because this returns 4 when it doesn't remove the value
> - # because why not
> - "$SET_DEFAULTS" -r -g "$GREETER" || true
> - if ! grep -q "^greeter-session" /etc/lightdm/lightdm.conf || \
> - grep -qxF "greeter-session=" /etc/lightdm/lightdm.conf; then
> - db_input high debathena-lightdm-config/uninstall || true
> - db_go
> - set_useful_greeter
> - fi
> ;;
>
> upgrade)
>
> Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.templates
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.templates 2012-06-30 14:31:13 UTC (rev 25597)
> +++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.templates 2012-06-30 16:29:16 UTC (rev 25598)
> @@ -10,31 +10,3 @@
> You can always change your mind later by editing
> /etc/X11/default-display-manager or running "dpkg-reconfigure lightdm"
>
> -Template: debathena-lightdm-config/force_greeter
> -Type: boolean
> -Default: true
> -_Description: Do you want to use the Debathena LightDM greeter?
> - The Debathena LightDM greeter is a greeter for the LightDM display
> - manager. It configures your workstation's login screen to look like
> - those in the public Athena clusters.
> - .
> - The Debathena team _strongly encourages_ the use of the Debathena
> - greeter. If you choose to use another greeter, you are strongly
> - encouraged to read the instructions at
> - /usr/share/doc/debathena-lightdm-config/README or other users may have
> - difficulty logging in.
> - .
> - If you have no LightDM greeter set, the debathena-lightdm-greeter will
> - be selected regardless of the answer to this question.
> -
> -Template: debathena-lightdm-config/uninstall
> -Type: note
> -_Description: A new greeter will be selected for you
> - LightDM won't function without a greeter. Since you're uninstalling
> - (or deconfiguring) this package, a new one will be selected
> - automatically, in the following order of preference:
> - - unity-greeter
> - - lightdm-gtk-greeter
> - - the first greeter found in /usr/share/xgreeters
> - .
> - You can change the greeter with /usr/lib/lightdm/lightdm-set-defaults
>
> Added: trunk/debathena/config/lightdm-config/debian/lightdm.conf.debathena
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/lightdm.conf.debathena (rev 0)
> +++ trunk/debathena/config/lightdm-config/debian/lightdm.conf.debathena 2012-06-30 16:29:16 UTC (rev 25598)
> @@ -0,0 +1,6 @@
> +[LightDM]
> +user-authority-in-system-dir=true
> +
> +[SeatDefaults]
> +user-session=ubuntu
> +greeter-session=debathena-lightdm-greeter
>
> Modified: trunk/debathena/config/lightdm-config/debian/po/templates.pot
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/po/templates.pot 2012-06-30 14:31:13 UTC (rev 25597)
> +++ trunk/debathena/config/lightdm-config/debian/po/templates.pot 2012-06-30 16:29:16 UTC (rev 25598)
> @@ -8,7 +8,7 @@
> msgstr ""
> "Project-Id-Version: PACKAGE VERSION\n"
> "Report-Msgid-Bugs-To: debathena-lightdm-config@packages.debian.org\n"
> -"POT-Creation-Date: 2012-05-30 10:35-0400\n"
> +"POT-Creation-Date: 2012-06-30 12:07-0400\n"
> "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: LANGUAGE <LL@li.org>\n"
> @@ -39,58 +39,3 @@
> "You can always change your mind later by editing /etc/X11/default-display-"
> "manager or running \"dpkg-reconfigure lightdm\""
> msgstr ""
> -
> -#. Type: boolean
> -#. Description
> -#: ../debathena-lightdm-config.templates:2001
> -msgid "Do you want to use the Debathena LightDM greeter?"
> -msgstr ""
> -
> -#. Type: boolean
> -#. Description
> -#: ../debathena-lightdm-config.templates:2001
> -msgid ""
> -"The Debathena LightDM greeter is a greeter for the LightDM display manager. "
> -"It configures your workstation's login screen to look like those in the "
> -"public Athena clusters."
> -msgstr ""
> -
> -#. Type: boolean
> -#. Description
> -#: ../debathena-lightdm-config.templates:2001
> -msgid ""
> -"The Debathena team _strongly encourages_ the use of the Debathena greeter. "
> -"If you choose to use another greeter, you are strongly encouraged to read "
> -"the instructions at /usr/share/doc/debathena-lightdm-config/README or other "
> -"users may have difficulty logging in."
> -msgstr ""
> -
> -#. Type: boolean
> -#. Description
> -#: ../debathena-lightdm-config.templates:2001
> -msgid ""
> -"If you have no LightDM greeter set, the debathena-lightdm-greeter will be "
> -"selected regardless of the answer to this question."
> -msgstr ""
> -
> -#. Type: note
> -#. Description
> -#: ../debathena-lightdm-config.templates:3001
> -msgid "A new greeter will be selected for you"
> -msgstr ""
> -
> -#. Type: note
> -#. Description
> -#: ../debathena-lightdm-config.templates:3001
> -msgid ""
> -"LightDM won't function without a greeter. Since you're uninstalling (or "
> -"deconfiguring) this package, a new one will be selected automatically, in "
> -"the following order of preference: - unity-greeter - lightdm-gtk-greeter - "
> -"the first greeter found in /usr/share/xgreeters"
> -msgstr ""
> -
> -#. Type: note
> -#. Description
> -#: ../debathena-lightdm-config.templates:3001
> -msgid "You can change the greeter with /usr/lib/lightdm/lightdm-set-defaults"
> -msgstr ""
>
> Modified: trunk/debathena/config/lightdm-config/debian/rules
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/rules 2012-06-30 14:31:13 UTC (rev 25597)
> +++ trunk/debathena/config/lightdm-config/debian/rules 2012-06-30 16:29:16 UTC (rev 25598)
> @@ -1,4 +1,8 @@
> #!/usr/bin/make -f
>
> +DEB_DIVERT_EXTENSION = .debathena
> +DEB_DIVERT_FILES_debathena-lightdm-config += \
> + /etc/lightdm/lightdm.conf.debathena
> +
> include /usr/share/cdbs/1/rules/debhelper.mk
> -
> +include /usr/share/cdbs/1/rules/config-package.mk
>
>
