02_default-config.patch refreshed.

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

diff --git a/debian/changelog b/debian/changelog
index cb56a9206f1054fc0fada945dc3cdf368409ff78..24dec6accc7ba00fcaca9b9f77b88ebdc112789e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lightdm (1.1.5-1) UNRELEASED; urgency=low
+lightdm (1.1.7-1) UNRELEASED; urgency=low
 
   [ Yves-Alexis Perez ]
   * New upstream development release.
@@ -17,6 +17,7 @@ lightdm (1.1.5-1) UNRELEASED; urgency=low
   * debian/watch updated for new tarballs location.
   * debian/patches:
     - 01_set-default-path refreshed.
+    - 02_default-config.patch refreshed.
     - 04_default-gtk-greeter-config dropped since lightm-gtk-greeter has been
       moved to standalone package.
     - 05_dont-add-pkglibexecdir-path dropped.

diff --git a/debian/patches/02_default-config.patch b/debian/patches/02_default-config.patch
index a8a221b524013c8796054804e832eea1832ebe81..22e80f854c83eac29cdd44542df24d3bb88c4a5a 100644 (file)
--- a/debian/patches/02_default-config.patch
+++ b/debian/patches/02_default-config.patch
@@ -10,11 +10,11 @@ Especially:
 Forwarded: not-needed
 
 === modified file 'data/lightdm.conf'
-Index: lightdm-1.0.1/data/lightdm.conf
+Index: lightdm-1.1.7/data/lightdm.conf
 ===================================================================
---- lightdm-1.0.1.orig/data/lightdm.conf       2011-09-28 09:11:35.000000000 +0200
-+++ lightdm-1.0.1/data/lightdm.conf    2011-10-05 22:15:15.872478075 +0200
-@@ -56,16 +56,16 @@
+--- lightdm-1.1.7.orig/data/lightdm.conf       2012-03-08 05:53:30.000000000 +0100
++++ lightdm-1.1.7/data/lightdm.conf    2012-03-09 08:09:49.675647981 +0100
+@@ -58,18 +58,18 @@
  #xserver-command=X
  #xserver-layout=
  #xserver-config=
@@ -25,8 +25,10 @@ Index: lightdm-1.0.1/data/lightdm.conf
  #xdmcp-key=
  #greeter-session=example-gtk-gnome
 -#greeter-hide-users=false
--#user-session=default
 +greeter-hide-users=true
+ #greeter-show-guest=true
+ #greeter-show-manual-login=false
+-#user-session=default
 +user-session=lightdm-xsession
  #allow-guest=true
  #guest-session=UNIMPLEMENTED