[arch-commits] Commit in kde-common/trunk (13 files)

Pierre Schmitz pierre at archlinux.org
Wed Jul 23 18:51:04 EDT 2008


    Date: Wednesday, July 23, 2008 @ 18:51:04
  Author: pierre
Revision: 6115

upgpkg: kde-common 4.1.0-1
    updating to 4.1.0

Modified:
  kde-common/trunk/PKGBUILD
  kde-common/trunk/kdm
Deleted:
  kde-common/trunk/agent-shutdown.sh
  kde-common/trunk/agent-startup.sh
  kde-common/trunk/arch-menu.tar
  kde-common/trunk/etc.pam
  kde-common/trunk/kde-common.install
  kde-common/trunk/kde-dbus.conf
  kde-common/trunk/kde-defaults.tar
  kde-common/trunk/kde.pam
  kde-common/trunk/kde.profile
  kde-common/trunk/kde.tcsh
  kde-common/trunk/kdm.kdmrc

--------------------+
 PKGBUILD           |   78 +++++++----------------------------------------
 agent-shutdown.sh  |   13 -------
 agent-startup.sh   |   19 -----------
 etc.pam            |    7 ----
 kde-common.install |   26 ---------------
 kde-dbus.conf      |    5 ---
 kde.pam            |    8 ----
 kde.profile        |   14 --------
 kde.tcsh           |   14 --------
 kdm                |    4 +-
 kdm.kdmrc          |   83 ---------------------------------------------------
 11 files changed, 14 insertions(+), 257 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-23 22:21:02 UTC (rev 6114)
+++ PKGBUILD	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,71 +1,17 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# $ Id: $
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kde-common
-pkgver=3.5.9
-kdever=3.5.9 # if minor is 0, then without .0
-pkgrel=2
-pkgdesc="Daemon scripts and misc configs for KDE"
-arch=(i686 x86_64)
-license=('GPL2')
+pkgver=4.1.0
+pkgrel=1
+pkgdesc="KDE kdm rc.d-script"
+arch=('i686' 'x86_64')
+license=('GPL')
 url="http://www.kde.org"
-groups=('kde')
-depends=('bash' 'archlinux-menus')
-backup=('opt/kde/share/config/kdm/kdmrc' 'opt/kde/share/config/kdm/backgroundrc' \
-  'etc/pam.d/kde-np' 'etc/pam.d/kde')
-install=kde-common.install
-source=(kdm etc.pam kde-defaults.tar kde.profile kde.tcsh \
-	agent-shutdown.sh agent-startup.sh kdm.kdmrc kde.pam kde-dbus.conf)
+depends=('bash')
+source=('kdm')
+md5sums=('5d80164932e0d44d8b802d3929a004ab')
 
 build() {
-  # Add kdm startup script to /etc/rc.d and a pam script
-  install -D -m755 -o root -g root $startdir/src/kdm $startdir/pkg/etc/rc.d/kdm
-  install -D -m644 -o root -g root $startdir/src/etc.pam $startdir/pkg/etc/pam.d/kde-np
-  install -D -m644 -o root -g root $startdir/src/kde.pam $startdir/pkg/etc/pam.d/kde
-
-  # Add a kde profile
-  install -D -m755 $startdir/src/kde.profile $startdir/pkg/etc/profile.d/kde.sh
-
-  # Add a tcsh kde profile
-  install -D -m755 $startdir/src/kde.tcsh $startdir/pkg/etc/profile.d/kde.csh
-
-  # Add a dbus config file
-  install -d -m755 ${startdir}/pkg/opt/kde/share/dbus-1/services
-  touch ${startdir}/pkg/opt/kde/share/dbus-1/services/.keep 
-  install -D -m644 $startdir/src/kde-dbus.conf $startdir/pkg/etc/dbus-1/session.d/kde.conf
-
-  # Adding new defaults for kde
-  install -D -m 644 $startdir/src/kcmnspluginrc $startdir/pkg/opt/kde/share/config/kcmnspluginrc
-  install -D -m 644 $startdir/src/kdeglobals 	$startdir/pkg/opt/kde/share/config/kdeglobals
-  install -D -m 644 $startdir/src/kdesktoprc 	$startdir/pkg/opt/kde/share/config/kdesktoprc
-  install -D -m 644 $startdir/src/konquerorrc 	$startdir/pkg/opt/kde/share/config/konquerorrc
-
-  # Adding KDM config
-  install -D -m 644 $startdir/src/kdm.kdmrc $startdir/pkg/opt/kde/share/config/kdm/kdmrc
-
-  # Adding startup/shutdown agents for ssh and gpg-agent
-  install -m644 -D $startdir/src/agent-startup.sh $startdir/pkg/opt/kde/env/agent-startup.sh
-  install -m755 -D $startdir/src/agent-shutdown.sh $startdir/pkg/opt/kde/shutdown/agent-shutdown.sh
-
-  # fixup kde icons for gnome
-  mkdir -p $startdir/pkg/opt/kde/share/icons/gnome/{128x128,64x64,32x32,16x16,48x48,22x22,scalable}
-  mkdir -p $startdir/pkg/opt/kde/share/icons/crystalsvg/{128x128/apps,64x64/apps,32x32/apps,16x16/apps,48x48/apps,22x22/apps,scalable/apps}
-  cd $startdir/pkg/opt/kde/share/icons/gnome/
-  for i in * 
-  do cd $i
-  ln -sf ../../crystalsvg/$i/apps/ apps
-  cd ..
-  done
-}
-
-md5sums=('31c5c02fc1bdc65dc3d86c9a0c89a48a'
-         '39ee0904b253dc5d80d693f1f04cdd8f'
-         'f18d247f62f331bb85e521f29a6044f2'
-         'a6fa157bd78625b8e62d73ff3b037f06'
-         '253960d9ebf4f9cb002199b793845e03'
-         '18e8d01124b19f7df2937c06e177bf7f'
-         'c963ef6e37c9051119972a58c67f05fb'
-         'c3312a87b1dd5bbacf1ba02874c95c67'
-         '89128638fc255594830e38e1d60c8e89'
-         'd08b320ab4f7508fb8d6b841117fb6fa')
-
+	install -D -m755 -o root -g root $startdir/src/kdm $startdir/pkg/etc/rc.d/kdm
+}
\ No newline at end of file

Deleted: agent-shutdown.sh
===================================================================
--- agent-shutdown.sh	2008-07-23 22:21:02 UTC (rev 6114)
+++ agent-shutdown.sh	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# This file is executed at kde shutdown.
-# Uncomment the following lines to kill the agents
-# that were started at session startup.
-
-if [ "${GPG_AGENT_INFO}" ]; then
-  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
-fi
-#
-if [ "${SSH_AGENT_PID}" ]; then
-  ssh-agent -k
-fi

Deleted: agent-startup.sh
===================================================================
--- agent-startup.sh	2008-07-23 22:21:02 UTC (rev 6114)
+++ agent-startup.sh	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,19 +0,0 @@
-# Agents startup file
-#
-# This file is sourced at kde startup, so that
-# the environment variables set here are available
-# throughout the session.
-
-# Uncomment the following lines to start gpg-agent
-# and/or ssh-agent at kde startup.
-# If you do so, do not forget to uncomment the respective
-# lines in KDEDIR/shutdown/agent-shutdown.sh to
-# properly kill the agents when the session ends.
-
-if [ -x /usr/bin/gpg-agent ]; then
-  eval "$(/usr/bin/gpg-agent --daemon)"
-fi 
-#
-if [ -x /usr/bin/ssh-agent ]; then
-  eval "$(/usr/bin/ssh-agent -s)"
-fi

Deleted: arch-menu.tar
===================================================================
(Binary files differ)

Deleted: etc.pam
===================================================================
--- etc.pam	2008-07-23 22:21:02 UTC (rev 6114)
+++ etc.pam	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,7 +0,0 @@
-#%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

Deleted: kde-common.install
===================================================================
--- kde-common.install	2008-07-23 22:21:02 UTC (rev 6114)
+++ kde-common.install	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,26 +0,0 @@
-post_install() {
-  cat << EOF
-For more info on KDE please have a look at:
-'http://wiki.archlinux.org/index.php/KDE'
-EOF
- if ! [ `grep '/opt/kde/lib' etc/ld.so.conf` ]; then
-    echo "/opt/kde/lib" >>etc/ld.so.conf
-    sbin/ldconfig -r .
- fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  cat etc/ld.so.conf | grep -v '/opt/kde/lib' >/tmp/.packde
-  mv /tmp/.packde etc/ld.so.conf
-  chmod 644 etc/ld.so.conf
-  sbin/ldconfig -r .
-}
-
-op=$1
-shift
-
-$op $*

Deleted: kde-dbus.conf
===================================================================
--- kde-dbus.conf	2008-07-23 22:21:02 UTC (rev 6114)
+++ kde-dbus.conf	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,5 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig> 
-  <servicedir>/opt/kde/share/dbus-1/services</servicedir>
-</busconfig>

Deleted: kde-defaults.tar
===================================================================
(Binary files differ)

Deleted: kde.pam
===================================================================
--- kde.pam	2008-07-23 22:21:02 UTC (rev 6114)
+++ kde.pam	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,8 +0,0 @@
-#%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

Deleted: kde.profile
===================================================================
--- kde.profile	2008-07-23 22:21:02 UTC (rev 6114)
+++ kde.profile	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,14 +0,0 @@
-export KDEDIR=/opt/kde 
-export KDEDIRS=$KDEDIR:/usr
-export PATH=$PATH:$KDEDIR/bin 
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDEDIR/lib/pkgconfig
-if [ ! -z $XDG_DATA_DIRS ]; then 
-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:$KDEDIR/share 
-else 
-  export XDG_DATA_DIRS=$KDEDIR/share 
-fi 
-if [ ! -z $XDG_CONFIG_DIRS ]; then 
-  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$KDEDIR/etc/xdg 
-else 
-  export XDG_CONFIG_DIRS=$KDEDIR/etc/xdg 
-fi 

Deleted: kde.tcsh
===================================================================
--- kde.tcsh	2008-07-23 22:21:02 UTC (rev 6114)
+++ kde.tcsh	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,14 +0,0 @@
-setenv KDEDIR /opt/kde
-setenv KDEDIRS /usr:$KDEDIR
-setenv PATH $KDEDIR/bin:$PATH
-setenv PKG_CONFIG_PATH $KDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH
-if ( ! $?XDG_DATA_DIRS ) then
-  setenv XDG_DATA_DIRS $KDEDIR/share
-else
-  setenv XDG_DATA_DIRS $KDEDIR/share:$XDG_DATA_DIRS
-endif
-if ( ! $?XDG_CONFIG_DIRS ) then
-  setenv XDG_CONFIG_DIRS $KDEDIR/etc/xdg
-else
-  setenv XDG_CONFIG_DIRS $KDEDIR/etc/xdg:$XDG_CONFIG_DIRS
-endif

Modified: kdm
===================================================================
--- kdm	2008-07-23 22:21:02 UTC (rev 6114)
+++ kdm	2008-07-23 22:51:04 UTC (rev 6115)
@@ -3,11 +3,11 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /opt/kde/bin/kdm`
+PID=`pidof -o %PPID /usr/bin/kdm`
 case "$1" in
   start)
     stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /opt/kde/bin/kdm &>/dev/null
+    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else

Deleted: kdm.kdmrc
===================================================================
--- kdm.kdmrc	2008-07-23 22:21:02 UTC (rev 6114)
+++ kdm.kdmrc	2008-07-23 22:51:04 UTC (rev 6115)
@@ -1,83 +0,0 @@
-[General]
-ConfigVersion=2.3
-PidFile=/var/run/kdm.pid
-StaticServers=:0
-ReserveServers=:1,:2,:3
-ServerVTs=-7
-ConsoleTTYs=vc/1,vc/2,vc/3,vc/4,vc/5,vc/6
-
-[Shutdown]
-HaltCmd=/sbin/halt
-RebootCmd=/sbin/reboot
-BootManager=Grub
-
-[X-*-Core]
-AllowNullPasswd=false
-AllowRootLogin=false
-AllowShutdown=Root
-Authorize=true
-AutoReLogin=false
-ClientLogFile=.xsession-errors-%s
-Reset=/opt/kde/share/config/kdm/Xreset
-Resources=/opt/kde/share/config/kdm/Xresources
-Session=/opt/kde/share/config/kdm/Xsession
-SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,/opt/kde/share/apps/kdm/sessions
-Setup=/opt/kde/share/config/kdm/Xsetup
-Startup=/opt/kde/share/config/kdm/Xstartup
-Xrdb=/usr/bin/xrdb
-FailsafeClient=/usr/bin/xterm
-ServerCmd=/usr/bin/X -br -nolisten tcp
-
-[X-*-Greeter]
-AntiAliasing=true
-AuthComplain=true
-BackgroundCfg=/opt/kde/share/config/kdm/backgroundrc
-ColorScheme=
-DefaultUser=
-EchoMode=OneStar
-FaceSource=PreferUser
-FailFont=Bitstream Vera Sans,10,-1,5,75,0,0,0,0,0
-FocusPasswd=false
-ForgingSeed=1097313140
-GUIStyle=
-GreetFont=Bitstream Vera Sans,16,-1,5,50,0,0,0,0,0
-GreetString=Archlinux %r (%h)
-GreeterPos=50,50
-HiddenUsers=root
-Language=
-LogoArea=None
-LogoPixmap=
-MaxShowUID=65000
-MinShowUID=500
-PreselectUser=None
-SelectedUsers=
-ShowUsers=NotHidden
-SortUsers=true
-StdFont=Bitstream Vera Sans,10,-1,5,50,0,0,0,0,0
-UseBackground=true
-UserCompletion=false
-UserList=true
-AllowConsole=true
-
-[X-:*-Core]
-AllowNullPasswd=true
-AllowShutdown=All
-AllowRootLogin=true
-NoPassEnable=false
-NoPassUsers=
-
-[X-:*-Greeter]
-AllowClose=true
-FocusPasswd=true
-LoginMode=DefaultLocal
-PreselectUser=Previous
-
-[X-:0-Core]
-AutoLoginEnable=false
-AutoLoginUser=
-ClientLogFile=.xsession-errors
-
-[Xdmcp]
-Enable=false
-Willing=/opt/kde/share/config/kdm/Xwilling
-Xaccess=/opt/kde/share/config/kdm/Xaccess





More information about the arch-commits mailing list