maj kdebase3#3.5.10-3

4 files changed, 26 insertions, 11 deletions

diff --git a/kde3/kdebase3/.footprint b/kde3/kdebase3/.footprint
index 746473538..b8c2cb63c 100644
--- a/kde3/kdebase3/.footprint
+++ b/kde3/kdebase3/.footprint
@@ -1372,6 +1372,7 @@ drwxr-xr-x	root/root	opt/kde/share/apps/kdisplay/color-schemes/
 -rw-r--r--	root/root	opt/kde/share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
 drwxr-xr-x	root/root	opt/kde/share/apps/kdm/
 drwxr-xr-x	root/root	opt/kde/share/apps/kdm/pics/
+-rw-r--r--	root/root	opt/kde/share/apps/kdm/pics/NuTyX_logo_attapu.png
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/pics/kdelogo-crystal.png
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/pics/kdelogo.png
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/pics/shutdown.jpg
@@ -1420,7 +1421,6 @@ drwxr-xr-x	root/root	opt/kde/share/apps/kdm/sessions/
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/cde.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/ctwm.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/cwwm.desktop
--rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/ede.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/enlightenment.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/evilwm.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/fluxbox.desktop
@@ -1434,7 +1434,6 @@ drwxr-xr-x	root/root	opt/kde/share/apps/kdm/sessions/
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/kde.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/larswm.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/lwm.desktop
--rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/lxde.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/matchbox.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/metacity.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/mwm.desktop
@@ -4150,6 +4149,7 @@ drwxr-xr-x	root/root	opt/kde/share/wallpapers/
 -rw-r--r--	root/root	opt/kde/share/wallpapers/KDE34.png.desktop
 -rw-r--r--	root/root	opt/kde/share/wallpapers/No-Ones-Laughing-3.jpg
 -rw-r--r--	root/root	opt/kde/share/wallpapers/No-Ones-Laughing-3.jpg.desktop
+-rw-r--r--	root/root	opt/kde/share/wallpapers/NuTyX_Wall_attapu.jpg
 -rw-r--r--	root/root	opt/kde/share/wallpapers/Time-For-Lunch-2.jpg
 -rw-r--r--	root/root	opt/kde/share/wallpapers/Time-For-Lunch-2.jpg.desktop
 -rw-r--r--	root/root	opt/kde/share/wallpapers/Totally-New-Product-1.jpg
diff --git a/kde3/kdebase3/.md5sum b/kde3/kdebase3/.md5sum
index b308242b7..d75c0e491 100644
--- a/kde3/kdebase3/.md5sum
+++ b/kde3/kdebase3/.md5sum
@@ -1,7 +1,7 @@
+ac26e92ce2f7b5999f4f0f8b62d08aa3  NuTyX_Wall_attapu.jpg
+928861b9bb026cedab2520d7147e9e62  NuTyX_logo_attapu.png
 ddef5b7f94c94003ab2d42216964d471  Xsession
-304ef605ca6fc78f538ef38f7ae93b26  ede.desktop
 b6a3905317132b9f414145fe4a4e3e57  kdebase-3.5.10-crypto-1.patch
 57e813bc02c31a347cee69800b4f4f56  kdebase-3.5.10-gcc44-1.patch
 88237188271fbf1e6bcd40180a75d953  kdebase-3.5.10.tar.bz2
-eec002811e6fc3cf3fda2b717b68c43e  kdm
-48803caf97653dfcffb68b5ed9a184fd  lxde.desktop
+dcdaf9af7bef1bc7fdaefea80728bfe3  kdm
diff --git a/kde3/kdebase3/Pkgfile b/kde3/kdebase3/Pkgfile
index 89dfce5c4..d575a3a1a 100644
--- a/kde3/kdebase3/Pkgfile
+++ b/kde3/kdebase3/Pkgfile
@@ -6,14 +6,20 @@
 
 name=kdebase3
 version=3.5.10
-release=2
+release=3
 source=(http://mirrors.isc.org/pub/kde/stable/3.5.10/src/kdebase-$version.tar.bz2 \
-         kdebase-3.5.10-gcc44-1.patch \
-	kdebase-3.5.10-crypto-1.patch kdm Xsession ede.desktop lxde.desktop)
+        http://nutyx.meticul.eu/files/patchs/$name/kdebase-3.5.10-gcc44-1.patch \
+	http://nutyx.meticul.eu/files/patchs/$name/kdebase-3.5.10-crypto-1.patch \
+	http://nutyx.meticul.eu/files/patchs/$name/NuTyX_logo_attapu.png \
+	http://nutyx.meticul.eu/files/patchs/$name/NuTyX_Wall_attapu.jpg \
+	kdm Xsession)
 build() {
         cd kdebase-$version
         patch -Np1 -i ../kdebase-3.5.10-gcc44-1.patch
 	patch -Np1 -i ../kdebase-3.5.10-crypto-1.patch
+#	export DO_NOT_COMPILE=kpersonalizer
+	sed -i "s/KDE34.png/NuTyX_Wall_attapu.jpg/g" \
+	kpersonalizer/keyecandypage.cpp
         ./configure     --prefix=/opt/kde \
                 --sysconfdir=/etc/kde3 \
                 --disable-debug \
@@ -28,19 +34,23 @@ XDG_DATA_DIRS=/opt/kde/share:/usr/local/share:/usr/share
 XDG_CONFIG_DIRS=/etc/kde3/xdg:/etc/xdg
 export XDG_DATA_DIRS XDG_CONFIG_DIRS
 EOF
-#       rm -rf $PKG/$KDE3_PREFIX/share/doc
         mkdir -v -p $PKG/etc/rc.d/init.d
         mkdir -v -p $PKG/etc/rc.d/rc{0,1,3,4,5,6}.d
         install -m755 ../kdm $PKG/etc/rc.d/init.d/
         install -m755 ../Xsession $PKG/opt/kde/share/config/kdm/
-        install -m644 ../{ede.desktop,lxde.desktop} $PKG/opt/kde/share/apps/kdm/sessions/
         ln -svf ../init.d/kdm $PKG/etc/rc.d/rc3.d/S40kdm
         ln -svf ../init.d/kdm $PKG/etc/rc.d/rc5.d/K10kdm
         ln -svf ../init.d/kdm $PKG/etc/rc.d/rc4.d/K10kdm
         ln -svf ../init.d/kdm $PKG/etc/rc.d/rc0.d/K10kdm
         ln -svf ../init.d/kdm $PKG/etc/rc.d/rc1.d/K10kdm
         ln -svf ../init.d/kdm $PKG/etc/rc.d/rc6.d/K10kdm
+	sed -i "s/default_blue.jpg/NuTyX_Wall_attapu.jpg/" $PKG/opt/kde/share/config/kdm/backgroundrc
+	sed -i "s/kdelogo.png/NuTyX_logo_attapu.png/" $PKG/opt/kde/share/config/kdm/kdmrc
         sed -i "s/AllowRootLogin/#\ AllowRootLogin/" $PKG/opt/kde/share/config/kdm/kdmrc
         sed -i "s@gnome-session@/usr/bin/gnome-session@" $PKG/opt/kde/share/apps/kdm/sessions/gnome.desktop
+	install -p -m 644 ../NuTyX_logo_attapu.png $PKG/opt/kde/share/apps/kdm/pics/NuTyX_logo_attapu.png
+	install -p -m 644 ../NuTyX_Wall_attapu.jpg $PKG/opt/kde/share/wallpapers/NuTyX_Wall_attapu.jpg
+	sed -i "s/KDE34.png/NuTyX_Wall_attapu.jpg/" \
+	$PKG/opt/kde/share/apps/kthememanager/themes/Plastik/Plastik.xml
 }
 
diff --git a/kde3/kdebase3/kdm b/kde3/kdebase3/kdm
index c2cb44eca..cde5d8087 100755
--- a/kde3/kdebase3/kdm
+++ b/kde3/kdebase3/kdm
@@ -14,12 +14,17 @@ case "$1" in
 		loadproc /opt/kde/bin/kdm
 		;;
 	stop)
-		boot_mesg "Stopping KDM"
 		if [ -f $pidfile ]; then
+			boot_mesg "Stopping KDM"
 			kill `cat $pidfile`
 			rm $pidfile
+		else
+			statusproc /opt/kde/bin/kdm
 		fi
 		;;
+	status)
+                statusproc /opt/kde/bin/kdm
+		;;
 	restart)
 		$0 stop
 		$0 start