commit kdebase3-SuSE

2 Apr 2006

Hello community,

here is the log from the commit of package kdebase3-SuSE
checked in at Sun Apr 2 11:43:21 CEST 2006.

--------

--- KDE/kdebase3-SuSE/kdebase3-SuSE.changes	2006-03-30 13:54:37.000000000 +0200
+++ kdebase3-SuSE/kdebase3-SuSE.changes	2006-03-31 17:51:24.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Mar 31 17:51:03 CEST 2006 - dmueller@suse.de
+
+- fix wallpaper upgrade bug (#162169) 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase3-SuSE.spec ++++++
--- /var/tmp/diff_new_pack.bFG5mb/_old	2006-04-02 11:42:03.000000000 +0200
+++ /var/tmp/diff_new_pack.bFG5mb/_new	2006-04-02 11:42:03.000000000 +0200
@@ -31,7 +31,7 @@
 PreReq:         %fillup_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Version:        10.1
-Release:        43
+Release:        44
 Source0:        kdebase-SuSE-%{version}.tar.bz2
 Source2:        kdebase3-SuSE-displaymanager.fillup
 Source3:        kdebase3-SuSE-windowmanager.fillup
@@ -185,6 +185,8 @@
 /var/lib/kde-profiles
 
 %changelog -n kdebase3-SuSE
+* Fri Mar 31 2006 - dmueller@suse.de
+- fix wallpaper upgrade bug (#162169)
 * Thu Mar 30 2006 - stbinner@suse.de
 - update kdm and kthememanager screenshots/definitions (#156165)
 * Mon Mar 27 2006 - stbinner@suse.de

++++++ kdebase-SuSE-10.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/env/startkde.update.sh new/kdebase-SuSE/config-files/opt/kde3/env/startkde.update.sh
--- old/kdebase-SuSE/config-files/opt/kde3/env/startkde.update.sh	2006-03-20 18:01:11.000000000 +0100
+++ new/kdebase-SuSE/config-files/opt/kde3/env/startkde.update.sh	2006-03-31 17:36:56.000000000 +0200
@@ -8,12 +8,14 @@
    
      kdesktopfile="$HOME/.kde/share/config/kdesktoprc"
      if [ ! -e "$HOME/.skel/kdebase3.wallpaper101" -a -e "$kdesktopfile" ]; then
-	 if grep -q "[Desktop0]" "$kdesktopfile"; then
+	 if ! fgrep -q "[Desktop0]" "$kdesktopfile"; then
 		WALLPAPER=$(/opt/kde3/bin/startkde.pick_wallpaper)
 		echo "[Desktop0]" >> "$kdesktopfile"
 		echo "Wallpaper=$WALLPAPER" >> "$kdesktopfile"
 	 else
-	        wallpaper=`sed -n -e '/^\[Desktop0\]/,/^\[/ s,^Wallpaper=\(.*\),\1,p' "$kdesktopfile"`
+	        w=`sed -n -e '/^\[Desktop0\]/,/^\[/ s,^Wallpaper=\(.*\),\1,p' "$kdesktopfile"`
+                # expand $HOME and other stuff
+		eval "wallpaper=\"$w\""
 	        if [ ! -e "$wallpaper" ]; then
 		      WALLPAPER=$(/opt/kde3/bin/startkde.pick_wallpaper)
 		      sed -e "/^\[Desktop0\]/,/^\[/ s,^Wallpaper=\(.*\),Wallpaper=$WALLPAPER," "$kdesktopfile" > "$kdesktopfile.new" && \




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)