File project.diff of Package kdebase4-workspace

--- kdebase4-workspace.changes.orig
+++ kdebase4-workspace.changes
@@ -33,6 +33,25 @@ Mon Mar 15 15:23:28 UTC 2010 - llunak@no
 - update kdm theme fixes for bnc#533189
 
 -------------------------------------------------------------------
+Thu Mar 11 15:58:31 UTC 2010 - eich@suse.de
+
+- Improve script that does the linking to the bootsplash file:
+  test for existence of SUSEBackground.jpg file to avoid conflicts
+  with older versions of the kdebase4-openSUSE_11.2 package.
+
+-------------------------------------------------------------------
+Thu Mar 11 15:47:56 UTC 2010 - eich@suse.de
+
+- Create link to /etc/bootsplash/themes/$THEME/images/sient-800x600.jpg
+  for Background.jpg if this file exists.
+
+-------------------------------------------------------------------
+Tue Mar  9 15:45:41 UTC 2010 - eich@suse.de
+
+- Modify read_sysconfig to check wether KMS is enabled and set
+  -nr (as noroot) instead of -br (for black root) as command line parameter.
+
+-------------------------------------------------------------------
 Fri Mar  5 17:18:04 UTC 2010 - llunak@novell.com
 
 - fix problems when fingerprint support is enabled (bnc#533189)
--- kdm-sysconfig-values.diff.orig
+++ kdm-sysconfig-values.diff
@@ -618,7 +618,7 @@ Index: kdm/kfrontend/read_sysconfig.sh
 ===================================================================
 --- /dev/null
 +++ kdm/kfrontend/read_sysconfig.sh
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,175 @@
 +#!/bin/bash
 +#
 +# Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg, Germany.
@@ -698,6 +698,21 @@ Index: kdm/kfrontend/read_sysconfig.sh
 +  fi
 +fi
 +if [ -n "$DISPLAYMANAGER_KDM_THEME" -a -d "/usr/share/kde4/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME" ]; then
++  unset bootsplash
++  if [ -e /usr/share/kde4/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME/SUSEBackground.jpg ]
++  then
++    ln -sf /usr/share/kde4/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME/SUSEBackground.jpg \
++       /usr/share/kde4/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME/Background.jpg
++    if [ -d /etc/bootsplash/themes -a -f /etc/sysconfig/bootsplash ]
++    then
++      source /etc/sysconfig/bootsplash
++      bootsplash=/etc/bootsplash/themes/$THEME/images/silent-800x600.jpg
++      if [ -e $bootsplash ]
++      then
++	  ln -sf $bootsplash /usr/share/kde4/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME/Background.jpg
++      fi
++    fi
++  fi	  
 +  echo "Theme=/usr/share/kde4/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME"
 +  echo "UseTheme=true"
 +  echo "UseBackground=false"
@@ -760,7 +775,12 @@ Index: kdm/kfrontend/read_sysconfig.sh
 +	;;
 +   x)
 +        # empty value - younger than 11.0
-+        echo "ServerCmd=/usr/bin/X -br"
++	server_opt="-br"
++	if [ -e /proc/fb ]
++	then
++	    cat /proc/fb | grep -q drm && server_opt="-nr"
++	fi
++        echo "ServerCmd=/usr/bin/X $server_opt"
 +        ;;
 +   *)
 +	echo "#Unknown X server - leaving X"
openSUSE Build Service is sponsored by