- 02_default-config removed, replaced by a config snippet.

* debian/01_debian.conf:
  - add config snippet for Debian specific config
* debian/lightdm.install:
  - install 01_debian.conf to /usr/share/lightdm/lightdm.conf.d/

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8049 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/01_debian.conf b/debian/01_debian.conf
new file mode 100644 (file)
index 0000000..12e70d2
--- /dev/null
+++ b/debian/01_debian.conf
@@ -0,0 +1,12 @@
+# Debian specific defaults
+#
+# - use lightdm-greeter session greeter, points to the etc-alternatives managed
+# greeter
+# - hide users list by default, we don't want to expose them
+# - use Debian specific session wrapper, to gain support for
+# /etc/X11/Xsession.d scripts
+
+[SeatDefaults]
+greeter-session=lightdm-greeter
+greeter-hide-users=true
+session-wrapper=/etc/X11/Xsession

diff --git a/debian/changelog b/debian/changelog
index 5eb51183b4ce0da47e9b2adec672282a6bfccad1..48b356276228b0940b1addb4e99d1b92f69e3a1c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,11 @@ lightdm (1.8.5-1) UNRELEASED; urgency=low
 
   * New upstream bugfix release.
   * debian/patches:
-    - 02_default-config refreshed.
+    - 02_default-config removed, replaced by a config snippet.
+  * debian/01_debian.conf:
+    - add config snippet for Debian specific config
+  * debian/lightdm.install:
+    - install 01_debian.conf to /usr/share/lightdm/lightdm.conf.d/
 
  -- Yves-Alexis Perez <corsac@debian.org>  Thu, 07 Nov 2013 07:23:22 +0100
 

diff --git a/debian/lightdm.install b/debian/lightdm.install
index 9694d5f779abc8bf06168bcf8d1f212b788565a7..ce53a44206b1958834713b09900d5cb0c5cc71b1 100644 (file)
--- a/debian/lightdm.install
+++ b/debian/lightdm.install
@@ -12,5 +12,6 @@ etc/lightdm/keys.conf
 etc/apparmor.d/lightdm-guest-session
 etc/pam.d
 debian/lightdm-xsession.desktop /usr/share/xsessions
+debian/01_debian.conf /usr/share/lightdm/lightdm.conf.d
 usr/lib/*/lightdm/lightdm-set-defaults
 usr/lib/*/lightdm/lightdm-guest-session-wrapper

diff --git a/debian/patches/02_default-config.patch b/debian/patches/02_default-config.patch
deleted file mode 100644 (file)
index 5b1beeb..0000000
--- a/debian/patches/02_default-config.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Yves-Alexis Perez <corsac@debian.org>
-Author: Lionel Le Folgoc <mrpouit@gmail.com>
-Description: adapt config to Debian
-Especially:
-
-* use X11 session wrapper
-* start on vt7
-* don't show userlist
-
-Forwarded: not-needed
-
-=== modified file 'data/lightdm.conf'
---- a/data/lightdm.conf
-+++ b/data/lightdm.conf
-@@ -84,15 +84,15 @@
- #xdmcp-key=
- #unity-compositor-command=unity-system-compositor
- #unity-compositor-timeout=60
--#greeter-session=example-gtk-gnome
--#greeter-hide-users=false
-+greeter-session=lightdm-greeter
-+greeter-hide-users=true
- #greeter-allow-guest=true
- #greeter-show-manual-login=false
- #greeter-show-remote-login=true
- #user-session=default
- #allow-guest=true
- #guest-session=UNIMPLEMENTED
--#session-wrapper=lightdm-session
-+session-wrapper=/etc/X11/Xsession
- #greeter-wrapper=
- #guest-wrapper=
- #display-setup-script=

diff --git a/debian/patches/series b/debian/patches/series
index 977c68a77231f47a93961ddd14dec3e55e6841c2..6f698f588475f95475a95eab03a2e142fa857faa 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_set-default-path.patch
-02_default-config.patch
 04_dont-add-pkglibexecdir-path.patch
 05_debianize-pam-files.patch