* New upstream release.

* debian/patches:
  - 03_fix-pam_chauthtok-call dropped, included upstream.

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

diff --git a/debian/changelog b/debian/changelog
index b46af239489e0b500ba1ea24e74dd7d72581df50..245a49fa3ef410b03c3d6ab235c43d6ec7a539cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lightdm (1.8.7-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * debian/patches:
+    - 03_fix-pam_chauthtok-call dropped, included upstream.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Thu, 06 Feb 2014 21:25:10 +0100
+
 lightdm (1.8.6-2) unstable; urgency=medium
 
   * debian/patches:

diff --git a/debian/patches/03_fix-pam_chauthtok-call.patch b/debian/patches/03_fix-pam_chauthtok-call.patch
deleted file mode 100644 (file)
index 4317a53..0000000
--- a/debian/patches/03_fix-pam_chauthtok-call.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/session-child.c
-+++ b/src/session-child.c
-@@ -336,7 +336,7 @@ session_child_run (int argc, char **argv
-         if (authentication_result == PAM_SUCCESS)
-             authentication_result = pam_acct_mgmt (pam_handle, 0);
-         if (authentication_result == PAM_NEW_AUTHTOK_REQD)
--            authentication_result = pam_chauthtok (pam_handle, 0);
-+            authentication_result = pam_chauthtok (pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
-     }
-     else
-         authentication_result = PAM_SUCCESS;

diff --git a/debian/patches/series b/debian/patches/series
index f1b924cb7f1b0171c24417a318321d744689a6c2..52f14d8be4a1e1df155943fad5c43d3be2782844 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 01_set-default-path.patch
 02_fix-apparmor-profile.patch
-03_fix-pam_chauthtok-call.patch
 04_dont-add-pkglibexecdir-path.patch
 05_debianize-pam-files.patch
 06_allow_libpamsystemd_and_ck_together.patch