* debian/patches:

  - 05_debianize-pam-files edited, don't log an error if
  libpam-gnome-keyring is not installed.                      closes: #683508

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

diff --git a/debian/changelog b/debian/changelog
index d4938c3693ac4781c1ae6c5ed3cab7b2e619fe6a..96f69fda9c3d0100c5843d760fa272ac3eb2c9dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lightdm (1.10.2-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 05_debianize-pam-files edited, don't log an error if
+    libpam-gnome-keyring is not installed.                      closes: #683508
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 28 Sep 2014 21:48:53 +0200
+
 lightdm (1.10.2-1) unstable; urgency=medium
 
   * debian/patches:

diff --git a/debian/patches/05_debianize-pam-files.patch b/debian/patches/05_debianize-pam-files.patch
index 3eac65834548297b52c3336648180fcb6abd9dde..b2dd80648c6fb2f72c980a933a82ccfa4d5c1fb9 100644 (file)
--- a/debian/patches/05_debianize-pam-files.patch
+++ b/debian/patches/05_debianize-pam-files.patch
@@ -17,7 +17,7 @@
  
 -# Check account is active, change password if required
 -account   required pam_unix.so
-+auth  optional pam_gnome_keyring.so
++-auth  optional pam_gnome_keyring.so
  
 -# Allow password to be changed
 -password  required pam_unix.so
@@ -44,7 +44,7 @@
 +# When the module is present, "required" would be sufficient (When SELinux
 +# is disabled, this returns success.)
 +
-+session optional        pam_gnome_keyring.so auto_start
++-session optional        pam_gnome_keyring.so auto_start
 +
 +@include common-password
 --- a/data/pam/lightdm-greeter