tags 269265 patch
thanks
Hello, with the help of notorious Debian developer Frank Lichtenheld we
recreated my preliminary patch. This one is against kdebase-3.2.2 and ready
to be tested.
Please try to get this into sarge ;-)
-Malte
diff -Naur kdebase-3.2.2.non-original/debian/control kdebase-3.2.2/debian/control
--- kdebase-3.2.2.non-original/debian/control 2004-09-14 18:24:56.000000000 +0200
+++ kdebase-3.2.2/debian/control 2004-09-14 18:29:53.000000000 +0200
@@ -396,7 +396,7 @@
Package: ksmserver
Section: kde
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, sed (>> 4)
Replaces: kdebase (<< 4:3.0.0), kwin (<< 4:3.2.0)
Description: KDE Session Manager
KDE is a powerful Open Source graphical desktop environment
diff -Naur kdebase-3.2.2.non-original/startkde kdebase-3.2.2/startkde
--- kdebase-3.2.2.non-original/startkde 2003-10-14 17:55:21.000000000 +0200
+++ kdebase-3.2.2/startkde 2004-09-14 20:43:29.000000000 +0200
@@ -3,6 +3,23 @@
# DEFAULT KDE STARTUP SCRIPT ( KDE-3.2 )
#
+# sed_magic changes some configuration files to KDE3.2 syntax
+
+function sed_magic () {
+
+ KICKERFILE=$HOME/.kde3/share/config/kickerrc
+
+ grep "file:/usr/share/applnk" $KICKERFILE | \
+ sed -e 's#^.*file:/usr/share/applnk/##g' | \
+ while read filename; do
+ newfile=$(find /usr/share/applications -name $(basename "$filename"))
+ if [ -n "$newfile" ]; then
+ sed -i -e "s#file:/usr/share/applnk/$filename#file:$newfile#g" $KICKERFILE
+ fi
+ done
+
+}
+
# When the X server dies we get a HUP signal from xinit. We must ignore it
# because we still need to do some cleanup.
trap 'echo GOT SIGHUP' HUP
@@ -30,9 +47,35 @@
# The user's personal KDE directory is usually ~/.kde, but this setting
# may be overridden by setting KDEHOME.
-kdehome=$HOME/.kde
+kdehome=$HOME/.kde3
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^\~/,$HOME/,"`
+if test "$kdehome" == "$HOME/.kde3" ; then
+
+ if test -d "$HOME/.kde3" ; then
+ echo "continuing normal bootup.. debug: NOT!"
+ else
+ echo -n "Directory .kde3 does not exist, "
+ echo "creating it now from .kde."
+
+ if test -d "$HOME/.kde" ; then
+
+ cp -a "$HOME/.kde" "$HOME/.kde3"
+
+ if test $? -eq 0 ; then
+ sed_magic;
+ else
+ echo "Copy did not work - doing normal startup"
+ #FIXME: cleanup?
+ fi
+
+ fi
+ fi
+else
+ echo -n "Found modified KDEHOME, I am afraid to touch this - "
+ echo "normal startup."
+fi
+
# Activate the kde font directories.
#
# There are 4 directories that may be used for supplying fonts for KDE.
