rev 3497 - trunk/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-04-06 19:11:31 +0000 (Thu, 06 Apr 2006)
New Revision: 3497

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/kcheckpass.pam
   trunk/packages/kdebase/debian/kdm-np.pam
   trunk/packages/kdebase/debian/kdm.pam
   trunk/packages/kdebase/debian/kscreensaver.pam
Log:
Revamp pam files.

SOMEONE PLEASE CHECK THIS

I'm basically copying gdm. See bug #242641 for details
(these changes don't seem to fix it, though).


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-04-06 19:10:11 UTC (rev 3496)
+++ trunk/packages/kdebase/debian/changelog	2006-04-06 19:11:31 UTC (rev 3497)
@@ -1,3 +1,19 @@
+kdebase (4:3.5.2-2) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Now that menu-xdg+menu can provide xsession .desktop files for window
+    managers, add /var/lib/menu-xdg/xsessions to kdmrc's default list of
+    places to search. Window managers should continue to provide their
+    own .desktop files, however, since they will be more customized and
+    won't force users to install the menu package. This is merely a
+    fallback. (Closes: #360919)
+
+  * Revamp /etc/pam.d/kdm and the other pam files. It should now also
+    find the new /etc/default/locale language settings. (Closes: #361089)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdebase (4:3.5.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdebase/debian/kcheckpass.pam
===================================================================
--- trunk/packages/kdebase/debian/kcheckpass.pam	2006-04-06 19:10:11 UTC (rev 3496)
+++ trunk/packages/kdebase/debian/kcheckpass.pam	2006-04-06 19:11:31 UTC (rev 3497)
@@ -1,11 +1,7 @@
 #
 # /etc/pam.d/kcheckpass - specify the PAM behaviour of kcheckpass
 #
-
-# The standard Unix authentication modules, used with
-# NIS (man nsswitch) as well as normal /etc/passwd and
-# /etc/shadow entries.
 @include common-auth
 @include common-account
- at include common-password
 @include common-session
+ at include common-password

Modified: trunk/packages/kdebase/debian/kdm-np.pam
===================================================================
--- trunk/packages/kdebase/debian/kdm-np.pam	2006-04-06 19:10:11 UTC (rev 3496)
+++ trunk/packages/kdebase/debian/kdm-np.pam	2006-04-06 19:11:31 UTC (rev 3497)
@@ -1,18 +1,10 @@
 #
-# /etc/pam.d/kdm - specify the PAM behaviour of kdm
+# /etc/pam.d/kdm - specify the PAM behaviour of kdm for passwordless logins
 #
-
-# The standard Unix authentication modules, used with
-# NIS (man nsswitch) as well as normal /etc/passwd and
-# /etc/shadow entries.
-# Remove include common-auth line for no password logins
-#@include common-auth
+auth       required     pam_nologin.so
+auth       required     pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-account
+session    required     pam_limits.so
 @include common-password
 @include common-session
-
-auth       required     pam_nologin.so
-auth       required     pam_env.so
-session    required     pam_limits.so
-
 auth       required     pam_permit.so

Modified: trunk/packages/kdebase/debian/kdm.pam
===================================================================
--- trunk/packages/kdebase/debian/kdm.pam	2006-04-06 19:10:11 UTC (rev 3496)
+++ trunk/packages/kdebase/debian/kdm.pam	2006-04-06 19:11:31 UTC (rev 3497)
@@ -1,15 +1,10 @@
 #
 # /etc/pam.d/kdm - specify the PAM behaviour of kdm
 #
-
-# The standard Unix authentication modules, used with
-# NIS (man nsswitch) as well as normal /etc/passwd and
-# /etc/shadow entries.
+auth       required     pam_nologin.so
+auth       required     pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-auth
 @include common-account
+session    required     pam_limits.so
 @include common-password
 @include common-session
-
-auth       required     pam_nologin.so
-auth       required     pam_env.so
-session    required     pam_limits.so

Modified: trunk/packages/kdebase/debian/kscreensaver.pam
===================================================================
--- trunk/packages/kdebase/debian/kscreensaver.pam	2006-04-06 19:10:11 UTC (rev 3496)
+++ trunk/packages/kdebase/debian/kscreensaver.pam	2006-04-06 19:11:31 UTC (rev 3497)
@@ -1,11 +1,7 @@
 #
 # /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver
 #
-
-# The standard Unix authentication modules, used with
-# NIS (man nsswitch) as well as normal /etc/passwd and
-# /etc/shadow entries.
 @include common-auth
 @include common-account
- at include common-password
 @include common-session
+ at include common-password