Date: Wednesday, March 7, 2012 @ 11:12:38 Author: andrea Revision: 152487
db-move: moved kdebase-workspace from [staging] to [extra] (i686) Added: kdebase-workspace/repos/extra-i686/PKGBUILD (from rev 152457, kdebase-workspace/repos/staging-i686/PKGBUILD) kdebase-workspace/repos/extra-i686/fixpath.patch (from rev 152457, kdebase-workspace/repos/staging-i686/fixpath.patch) kdebase-workspace/repos/extra-i686/kde-np.pam (from rev 152457, kdebase-workspace/repos/staging-i686/kde-np.pam) kdebase-workspace/repos/extra-i686/kde.pam (from rev 152457, kdebase-workspace/repos/staging-i686/kde.pam) kdebase-workspace/repos/extra-i686/kdebase-workspace.install (from rev 152457, kdebase-workspace/repos/staging-i686/kdebase-workspace.install) kdebase-workspace/repos/extra-i686/kdm (from rev 152457, kdebase-workspace/repos/staging-i686/kdm) kdebase-workspace/repos/extra-i686/kdm-xinitrd.patch (from rev 152457, kdebase-workspace/repos/staging-i686/kdm-xinitrd.patch) kdebase-workspace/repos/extra-i686/kscreensaver.pam (from rev 152457, kdebase-workspace/repos/staging-i686/kscreensaver.pam) kdebase-workspace/repos/extra-i686/terminate-server.patch (from rev 152457, kdebase-workspace/repos/staging-i686/terminate-server.patch) Deleted: kdebase-workspace/repos/extra-i686/PKGBUILD kdebase-workspace/repos/extra-i686/fixpath.patch kdebase-workspace/repos/extra-i686/kde-np.pam kdebase-workspace/repos/extra-i686/kde.pam kdebase-workspace/repos/extra-i686/kdebase-workspace.install kdebase-workspace/repos/extra-i686/kdm kdebase-workspace/repos/extra-i686/kdm-xinitrd.patch kdebase-workspace/repos/extra-i686/kscreensaver.pam kdebase-workspace/repos/extra-i686/terminate-server.patch kdebase-workspace/repos/staging-i686/ ---------------------------+ PKGBUILD | 161 ++++++++++++++++++++++---------------------- fixpath.patch | 68 +++++++++--------- kde-np.pam | 16 ++-- kde.pam | 16 ++-- kdebase-workspace.install | 50 ++++++------- kdm | 72 +++++++++---------- kdm-xinitrd.patch | 36 ++++----- kscreensaver.pam | 2 terminate-server.patch | 22 +++--- 9 files changed, 222 insertions(+), 221 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-03-07 16:12:35 UTC (rev 152486) +++ extra-i686/PKGBUILD 2012-03-07 16:12:38 UTC (rev 152487) @@ -1,80 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=kdebase-workspace -_pkgname=kde-workspace -pkgver=4.8.0 -pkgrel=2 -pkgdesc="KDE Base Workspace" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde') -# note on libxdamage: -# not detected by namcap because libgl depends on it -# but nvidia providing libgl does not depend on libxdamage -depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' - 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' - 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' - 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst') -makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') -optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') -replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' - 'kdebase-kinfocenter') -conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' - 'kdebase-kinfocenter') -install="${pkgname}.install" -backup=('usr/share/config/kdm/kdmrc' - 'etc/pam.d/kde' - 'etc/pam.d/kde-np' - 'etc/pam.d/kscreensaver') -options=('emptydirs') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${_pkgname}-${pkgver}.tar.xz" - 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('4c471b159315b084c65196b0c93c34981a9105c5' - '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - 'e4198a443703f749b58a4fec88362fced1b45789' - '264e395c2c44cdda5a242c6dee649afab44cd6e5' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') - -build() { - cd "${srcdir}"/${_pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/kdm-xinitrd.patch - patch -p0 -i "${srcdir}"/fixpath.patch - patch -p0 -i "${srcdir}"/terminate-server.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${_pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF \ - -DWITH_libgps=OFF \ - -DWITH_OpenGLES=ON \ - -DKWIN_BUILD_WITH_OPENGLES=ON \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package() { - cd "${srcdir}"/build - 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 - install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver - install -d -m755 "${pkgdir}"/usr/share/xsessions/ - ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/ - install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} - - install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm -} Copied: kdebase-workspace/repos/extra-i686/PKGBUILD (from rev 152457, kdebase-workspace/repos/staging-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-03-07 16:12:38 UTC (rev 152487) @@ -0,0 +1,81 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=kdebase-workspace +_pkgname=kde-workspace +pkgver=4.8.1 +pkgrel=1 +pkgdesc="KDE Base Workspace" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde') +# note on libxdamage: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxdamage +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' + 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' + 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' + 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst' + 'xorg-xrandr') +makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') +optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +install="${pkgname}.install" +backup=('usr/share/config/kdm/kdmrc' + 'etc/pam.d/kde' + 'etc/pam.d/kde-np' + 'etc/pam.d/kscreensaver') +options=('emptydirs') +source=("http://download.kde.org/stable/${pkgver}/src/xz/${_pkgname}-${pkgver}.tar.xz" + 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('675df4befd736e770e3029af8d38800c9018e888' + '5db3a245201bd4a50e65aa2ef583cf5490e4f646' + 'e4198a443703f749b58a4fec88362fced1b45789' + '264e395c2c44cdda5a242c6dee649afab44cd6e5' + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'd7b5883f7e65c6839b1f65f94d58026673dd0226' + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + 'd509dac592bd8b310df27991b208c95b6d907514') + +build() { + cd "${srcdir}"/${_pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/kdm-xinitrd.patch + patch -p0 -i "${srcdir}"/fixpath.patch + patch -p0 -i "${srcdir}"/terminate-server.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xmms=OFF \ + -DWITH_Googlegadgets=OFF \ + -DWITH_libgps=OFF \ + -DWITH_OpenGLES=ON \ + -DKWIN_BUILD_WITH_OPENGLES=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}"/build + 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 + install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver + install -d -m755 "${pkgdir}"/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/ + install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} + + install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm +} Deleted: extra-i686/fixpath.patch =================================================================== --- extra-i686/fixpath.patch 2012-03-07 16:12:35 UTC (rev 152486) +++ extra-i686/fixpath.patch 2012-03-07 16:12:38 UTC (rev 152487) @@ -1,34 +0,0 @@ ---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 -+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 -@@ -34,22 +34,6 @@ - MALLOC_CHECK_=2 - export MALLOC_CHECK_ - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`$bindir/kde4-config --qt-binaries` -- if [ -n "$qbindir" ]; then -- case $PATH in -- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; -- *) PATH=$qbindir:$PATH; export PATH;; -- esac -- fi -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --fi -- - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage -@@ -206,7 +190,7 @@ - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --libpath=`kde4-config --path lib | tr : '\n'` -+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') - - for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do - for file in "$prefix"*.sh; do Copied: kdebase-workspace/repos/extra-i686/fixpath.patch (from rev 152457, kdebase-workspace/repos/staging-i686/fixpath.patch) =================================================================== --- extra-i686/fixpath.patch (rev 0) +++ extra-i686/fixpath.patch 2012-03-07 16:12:38 UTC (rev 152487) @@ -0,0 +1,34 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -34,22 +34,6 @@ + MALLOC_CHECK_=2 + export MALLOC_CHECK_ + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do Deleted: extra-i686/kde-np.pam =================================================================== --- extra-i686/kde-np.pam 2012-03-07 16:12:35 UTC (rev 152486) +++ extra-i686/kde-np.pam 2012-03-07 16:12:38 UTC (rev 152487) @@ -1,8 +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 --session optional pam_systemd.so Copied: kdebase-workspace/repos/extra-i686/kde-np.pam (from rev 152457, kdebase-workspace/repos/staging-i686/kde-np.pam) =================================================================== --- extra-i686/kde-np.pam (rev 0) +++ extra-i686/kde-np.pam 2012-03-07 16:12:38 UTC (rev 152487) @@ -0,0 +1,8 @@ +#%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 +-session optional pam_systemd.so Deleted: extra-i686/kde.pam =================================================================== --- extra-i686/kde.pam 2012-03-07 16:12:35 UTC (rev 152486) +++ extra-i686/kde.pam 2012-03-07 16:12:38 UTC (rev 152487) @@ -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 --session optional pam_systemd.so Copied: kdebase-workspace/repos/extra-i686/kde.pam (from rev 152457, kdebase-workspace/repos/staging-i686/kde.pam) =================================================================== --- extra-i686/kde.pam (rev 0) +++ extra-i686/kde.pam 2012-03-07 16:12:38 UTC (rev 152487) @@ -0,0 +1,8 @@ +#%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 +-session optional pam_systemd.so Deleted: extra-i686/kdebase-workspace.install =================================================================== --- extra-i686/kdebase-workspace.install 2012-03-07 16:12:35 UTC (rev 152486) +++ extra-i686/kdebase-workspace.install 2012-03-07 16:12:38 UTC (rev 152487) @@ -1,25 +0,0 @@ -post_install() { - groupadd -g 135 kdm &>/dev/null - useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null - chown -R 135:135 var/lib/kdm &>/dev/null - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - update-desktop-database -q -} - -post_upgrade() { - getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null - getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null - chown -R 135:135 var/lib/kdm &>/dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_remove() { - if getent passwd kdm >/dev/null 2>&1; then - userdel kdm - fi - if getent group kdm >/dev/null 2>&1; then - groupdel kdm - fi - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} Copied: kdebase-workspace/repos/extra-i686/kdebase-workspace.install (from rev 152457, kdebase-workspace/repos/staging-i686/kdebase-workspace.install) =================================================================== --- extra-i686/kdebase-workspace.install (rev 0) +++ extra-i686/kdebase-workspace.install 2012-03-07 16:12:38 UTC (rev 152487) @@ -0,0 +1,25 @@ +post_install() { + groupadd -g 135 kdm &>/dev/null + useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null + getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_remove() { + if getent passwd kdm >/dev/null 2>&1; then + userdel kdm + fi + if getent group kdm >/dev/null 2>&1; then + groupdel kdm + fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} Deleted: extra-i686/kdm =================================================================== --- extra-i686/kdm 2012-03-07 16:12:35 UTC (rev 152486) +++ extra-i686/kdm 2012-03-07 16:12:38 UTC (rev 152487) @@ -1,36 +0,0 @@ -#!/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 - 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 Copied: kdebase-workspace/repos/extra-i686/kdm (from rev 152457, kdebase-workspace/repos/staging-i686/kdm) =================================================================== --- extra-i686/kdm (rev 0) +++ extra-i686/kdm 2012-03-07 16:12:38 UTC (rev 152487) @@ -0,0 +1,36 @@ +#!/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 + 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 Deleted: extra-i686/kdm-xinitrd.patch =================================================================== --- extra-i686/kdm-xinitrd.patch 2012-03-07 16:12:35 UTC (rev 152486) +++ extra-i686/kdm-xinitrd.patch 2012-03-07 16:12:38 UTC (rev 152487) @@ -1,18 +0,0 @@ ---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 -+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 -@@ -742,6 +742,15 @@ - "[ -f /etc/xprofile ] && . /etc/xprofile\n" - "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" - "\n" -+"# run all system xinitrc shell scripts.\n" -+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" -+" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" -+" if [ -x \"$i\" ]; then\n" -+" . \"$i\"\n" -+" fi\n" -+" done\n" -+"fi\n" -+"\n" - "if [ -d /etc/X11/Xresources ]; then\n" - " for i in /etc/X11/Xresources/*; do\n" - " [ -f $i ] && xrdb -merge $i\n" Copied: kdebase-workspace/repos/extra-i686/kdm-xinitrd.patch (from rev 152457, kdebase-workspace/repos/staging-i686/kdm-xinitrd.patch) =================================================================== --- extra-i686/kdm-xinitrd.patch (rev 0) +++ extra-i686/kdm-xinitrd.patch 2012-03-07 16:12:38 UTC (rev 152487) @@ -0,0 +1,18 @@ +--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 ++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 +@@ -742,6 +742,15 @@ + "[ -f /etc/xprofile ] && . /etc/xprofile\n" + "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" + "\n" ++"# run all system xinitrc shell scripts.\n" ++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" ++" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" ++" if [ -x \"$i\" ]; then\n" ++" . \"$i\"\n" ++" fi\n" ++" done\n" ++"fi\n" ++"\n" + "if [ -d /etc/X11/Xresources ]; then\n" + " for i in /etc/X11/Xresources/*; do\n" + " [ -f $i ] && xrdb -merge $i\n" Deleted: extra-i686/kscreensaver.pam =================================================================== --- extra-i686/kscreensaver.pam 2012-03-07 16:12:35 UTC (rev 152486) +++ extra-i686/kscreensaver.pam 2012-03-07 16:12:38 UTC (rev 152487) @@ -1 +0,0 @@ -auth required pam_unix_auth.so Copied: kdebase-workspace/repos/extra-i686/kscreensaver.pam (from rev 152457, kdebase-workspace/repos/staging-i686/kscreensaver.pam) =================================================================== --- extra-i686/kscreensaver.pam (rev 0) +++ extra-i686/kscreensaver.pam 2012-03-07 16:12:38 UTC (rev 152487) @@ -0,0 +1 @@ +auth required pam_unix_auth.so Deleted: extra-i686/terminate-server.patch =================================================================== --- extra-i686/terminate-server.patch 2012-03-07 16:12:35 UTC (rev 152486) +++ extra-i686/terminate-server.patch 2012-03-07 16:12:38 UTC (rev 152487) @@ -1,11 +0,0 @@ ---- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 -+++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 -@@ -1448,7 +1448,7 @@ - - Key: TerminateServer - Type: bool --Default: false -+Default: true - User: core - Instance: #:*/! - Merge: xdm Copied: kdebase-workspace/repos/extra-i686/terminate-server.patch (from rev 152457, kdebase-workspace/repos/staging-i686/terminate-server.patch) =================================================================== --- extra-i686/terminate-server.patch (rev 0) +++ extra-i686/terminate-server.patch 2012-03-07 16:12:38 UTC (rev 152487) @@ -0,0 +1,11 @@ +--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 ++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 +@@ -1448,7 +1448,7 @@ + + Key: TerminateServer + Type: bool +-Default: false ++Default: true + User: core + Instance: #:*/! + Merge: xdm