[26340] in Source-Commits
/svn/athena r25529 - in trunk/debathena/config/lightdm-config/debian: . po
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed May 30 10:40:20 2012
Date: Wed, 30 May 2012 10:40:18 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205301440.q4UEeI9o010703@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-30 10:40:18 -0400 (Wed, 30 May 2012)
New Revision: 25529
Added:
trunk/debathena/config/lightdm-config/debian/README
Modified:
trunk/debathena/config/lightdm-config/debian/control.in
trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.config
trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst
trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.templates
trunk/debathena/config/lightdm-config/debian/po/templates.pot
Log:
Depend on lightdm 1.0.6 or later
Encourage the user to use lightdm via debconf if they're using another dm
Added: trunk/debathena/config/lightdm-config/debian/README
===================================================================
--- trunk/debathena/config/lightdm-config/debian/README (rev 0)
+++ trunk/debathena/config/lightdm-config/debian/README 2012-05-30 14:40:18 UTC (rev 25529)
@@ -0,0 +1,11 @@
+README for debathena-lightdm-config
+
+debathena-lightdm-config ships a lightdm greeter called
+debathena-lightdm-greeter in /usr/share/xgreeters. If you choose to use
+this greeter, or if you accepted all the default responses when
+installing the package, no further action is required. If you choose to
+use an alternative greeter (e.g. unity-greeter), you'll need to
+configure lightdm to allow manual logins, and you are encouraged to hide
+the user list. For more information, see
+- /usr/lib/lightdm/lightdm-set-defaults
+- /usr/share/doc/lightdm/lightdm.conf.gz
Modified: trunk/debathena/config/lightdm-config/debian/control.in
===================================================================
--- trunk/debathena/config/lightdm-config/debian/control.in 2012-05-30 01:29:33 UTC (rev 25528)
+++ trunk/debathena/config/lightdm-config/debian/control.in 2012-05-30 14:40:18 UTC (rev 25529)
@@ -7,9 +7,10 @@
Package: debathena-lightdm-config
Architecture: all
-Depends: lightdm,
+Depends: lightdm (>> 1.0.6),
python, python-gobject,
gir1.2-lightdm-1, gir1.2-glib-2.0, gir1.2-gtk-3.0,
${misc:Depends}
Description: Lightdm configuration for Debathena
- This package configures the lightdm display manager.
+ This package installs a lightdm greeter for Debathena, and strongly
+ encourages the user to use lightdm and the aforementioned greeter.
Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.config
===================================================================
--- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.config 2012-05-30 01:29:33 UTC (rev 25528)
+++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.config 2012-05-30 14:40:18 UTC (rev 25529)
@@ -3,6 +3,12 @@
# Source debconf library.
. /usr/share/debconf/confmodule
+db_get shared/default-x-display-manager || true
+if [ "$RET" != "lightdm" ]; then
+ 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.postinst
===================================================================
--- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst 2012-05-30 01:29:33 UTC (rev 25528)
+++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst 2012-05-30 14:40:18 UTC (rev 25529)
@@ -25,6 +25,11 @@
case "$1" in
configure)
+ db_get debathena-lightdm-config/force_lightdm
+ if [ "$RET" = "true" ]; then
+ 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" ] && \
Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.templates
===================================================================
--- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.templates 2012-05-30 01:29:33 UTC (rev 25528)
+++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.templates 2012-05-30 14:40:18 UTC (rev 25529)
@@ -1,3 +1,15 @@
+Template: debathena-lightdm-config/force_lightdm
+Type: boolean
+Default: true
+_Description: Do you want to use lightdm?
+ LightDM is a display manager, like xdm or gdm. You are not currently
+ using lightdm, yet you're installing this package. You are strongly
+ encouraged to use LightDM as your display manager for the best
+ Debathena experience.
+ .
+ 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
@@ -12,8 +24,8 @@
/usr/share/doc/debathena-lightdm-config/README or other users may have
difficulty logging in.
.
- If you have no greeter set, the debathena-lightdm-greeter will be
- selected regardless of the answer to this question.
+ 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
Modified: trunk/debathena/config/lightdm-config/debian/po/templates.pot
===================================================================
--- trunk/debathena/config/lightdm-config/debian/po/templates.pot 2012-05-30 01:29:33 UTC (rev 25528)
+++ trunk/debathena/config/lightdm-config/debian/po/templates.pot 2012-05-30 14:40:18 UTC (rev 25529)
@@ -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-14 11:05-0400\n"
+"POT-Creation-Date: 2012-05-30 10:35-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"
@@ -20,13 +20,36 @@
#. Type: boolean
#. Description
#: ../debathena-lightdm-config.templates:1001
-msgid "Do you want to use the Debathena LightDM greeter?"
+msgid "Do you want to use lightdm?"
msgstr ""
#. Type: boolean
#. Description
#: ../debathena-lightdm-config.templates:1001
msgid ""
+"LightDM is a display manager, like xdm or gdm. You are not currently using "
+"lightdm, yet you're installing this package. You are strongly encouraged to "
+"use LightDM as your display manager for the best Debathena experience."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../debathena-lightdm-config.templates:1001
+msgid ""
+"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."
@@ -34,7 +57,7 @@
#. Type: boolean
#. Description
-#: ../debathena-lightdm-config.templates:1001
+#: ../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 "
@@ -44,21 +67,21 @@
#. Type: boolean
#. Description
-#: ../debathena-lightdm-config.templates:1001
+#: ../debathena-lightdm-config.templates:2001
msgid ""
-"If you have no greeter set, the debathena-lightdm-greeter will be selected "
-"regardless of the answer to this question."
+"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:2001
+#: ../debathena-lightdm-config.templates:3001
msgid "A new greeter will be selected for you"
msgstr ""
#. Type: note
#. Description
-#: ../debathena-lightdm-config.templates:2001
+#: ../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 "
@@ -68,6 +91,6 @@
#. Type: note
#. Description
-#: ../debathena-lightdm-config.templates:2001
+#: ../debathena-lightdm-config.templates:3001
msgid "You can change the greeter with /usr/lib/lightdm/lightdm-set-defaults"
msgstr ""
