[arch-commits] Commit in kdebase-workspace/repos (5 files)

[Pierre Schmitz]

    Date: Tuesday, July 29, 2008 @ 19:16:04
  Author: pierre
Revision: 7301

Merged revisions 7232-7300 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdebase-workspace/trunk

........
  r7294 | pierre | 2008-07-29 13:46:41 +0000 (Di, 29 Jul 2008) | 1 line
  
  moving kdm rc.d script from kde-common to kdebase-workspace (FS#11029)
........
  r7295 | pierre | 2008-07-29 13:59:12 +0000 (Di, 29 Jul 2008) | 1 line
  
  Linking kde session files to /etc/X11/sessions (FS#11047)
........
  r7299 | pierre | 2008-07-29 21:39:55 +0000 (Di, 29 Jul 2008) | 1 line
  
  added pam profiles (FS#11056)
........
  r7300 | pierre | 2008-07-29 22:46:50 +0000 (Di, 29 Jul 2008) | 1 line
  
  upgpkg: kdebase-workspace 4.1.0-4
........

Added:
  kdebase-workspace/repos/extra-x86_64/kde-np.pam
    (from rev 7300, kdebase-workspace/trunk/kde-np.pam)
  kdebase-workspace/repos/extra-x86_64/kde.pam
    (from rev 7300, kdebase-workspace/trunk/kde.pam)
  kdebase-workspace/repos/extra-x86_64/kdm
    (from rev 7300, kdebase-workspace/trunk/kdm)
Modified:
  kdebase-workspace/repos/extra-x86_64/	(properties)
  kdebase-workspace/repos/extra-x86_64/PKGBUILD

------------+
 PKGBUILD   |   22 +++++++++++++++++-----
 kde-np.pam |    7 +++++++
 kde.pam    |    7 +++++++
 kdm        |   37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 5 deletions(-)


Property changes on: kdebase-workspace/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kdebase-workspace/trunk:1-7231
   + /kdebase-workspace/trunk:1-7300

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-29 22:46:50 UTC (rev 7300)
+++ extra-x86_64/PKGBUILD	2008-07-29 23:16:04 UTC (rev 7301)
@@ -3,22 +3,27 @@
 
 pkgname=kdebase-workspace
 pkgver=4.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde')
-depends=('kdelibs' 'kdebase-runtime' 'libcaptury' 'libxxf86misc' 'libxcomposite'
+depends=('kdelibs' 'kdebase-runtime' 'libcaptury' 'libxxf86misc' 'libxcomposite' 'libxres'
 	 'libusb' 'libxss' 'lm_sensors' 'libxinerama' 'libxklavier' 'qimageblitz')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'kdemultimedia')
 optdepends=('kdemultimedia')
-replaces=('kdmtheme')
+replaces=('kdmtheme' 'kde-common')
+conflicts=('kde-common')
 options=('docs')
 backup=('usr/share/config/kdm/kdmrc')
 source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2"
-        'kdm-zsh-profile.patch')
-md5sums=('d8dbe16f5807536a429bbf9fd33e82a5' '40f5556820d52a14e9d9722a5a8a491e')
+        'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam')
+md5sums=('d8dbe16f5807536a429bbf9fd33e82a5'
+         '40f5556820d52a14e9d9722a5a8a491e'
+         '5d80164932e0d44d8b802d3929a004ab'
+         '10a490653b002e6f9e7476ff9d37c011'
+         '552337fd9a3982d809ea16c7f0033d42')
 
 build() {
 	cd $srcdir/${pkgname}-${pkgver}
@@ -32,4 +37,11 @@
 		-DWITH_Xmms=OFF
 	make
 	make DESTDIR=$pkgdir install
+
+	install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
+	install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
+	install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np
+	ln -sf xscreensaver ${pkgdir}/etc/pam.d/kscreensaver
+	install -d -m755 ${pkgdir}/etc/X11/sessions/
+	ln -sf /usr/share/apps/kdm/sessions/kde{,-safe}.desktop ${pkgdir}/etc/X11/sessions/
 }

Copied: kdebase-workspace/repos/extra-x86_64/kde-np.pam (from rev 7300, kdebase-workspace/trunk/kde-np.pam)
===================================================================
--- extra-x86_64/kde-np.pam	                        (rev 0)
+++ extra-x86_64/kde-np.pam	2008-07-29 23:16:04 UTC (rev 7301)
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth		required	pam_nologin.so
+auth		required	pam_permit.so
+account		required	pam_unix.so
+password	required	pam_unix.so
+session		required	pam_unix.so
+session		required	pam_limits.so
\ No newline at end of file

Copied: kdebase-workspace/repos/extra-x86_64/kde.pam (from rev 7300, kdebase-workspace/trunk/kde.pam)
===================================================================
--- extra-x86_64/kde.pam	                        (rev 0)
+++ extra-x86_64/kde.pam	2008-07-29 23:16:04 UTC (rev 7301)
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth		required	pam_unix.so
+auth		required	pam_nologin.so
+account		required	pam_unix.so
+password	required	pam_unix.so
+session		required	pam_unix.so
+session		required	pam_limits.so
\ No newline at end of file

Copied: kdebase-workspace/repos/extra-x86_64/kdm (from rev 7300, kdebase-workspace/trunk/kdm)
===================================================================
--- extra-x86_64/kdm	                        (rev 0)
+++ extra-x86_64/kdm	2008-07-29 23:16:04 UTC (rev 7301)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/kdm`
+case "$1" in
+  start)
+    stat_busy "Starting KDE Desktop Manager"
+    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      echo $PID > /var/run/kdm.pid
+      add_daemon kdm
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping KDE Desktop Manager"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon kdm
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0