Hello community, here is the log from the commit of package gnome-session for openSUSE:11.4 checked in at Tue Feb 22 11:37:34 CET 2011.
-------- --- old-versions/11.4/all/gnome-session/gnome-session.changes 2011-02-13 17:23:10.000000000 +0100 +++ 11.4/gnome-session/gnome-session.changes 2011-02-21 18:13:37.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Feb 21 17:58:37 CET 2011 - [email protected] + +- Update gnome script to fix an issue where users from earlier + versions of openSUSE could end up with no wallpaper in 11.4: + + reset the wallpaper configured in the user config if it was + explicitly set to a default wallpaper from a previous version + of openSUSE. + + we do this only once, if + ~/.config/suse/gnome-11.4-wallpaper-migrated does not exist. + + note that we're avoiding this issue for future releases since + the default wallpaper will always keep the same name now. + + this fixes the issue highlighted in bnc#671564 comment 2. +- Also, still in gnome script: do not disable beagle on live + images, since we don't ship beagle anymore. + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.iBql8o/_old 2011-02-22 11:37:14.000000000 +0100 +++ /var/tmp/diff_new_pack.iBql8o/_new 2011-02-22 11:37:14.000000000 +0100 @@ -19,7 +19,7 @@ Name: gnome-session Version: 2.32.1 -Release: 2 +Release: 5.<RELEASE2> License: GPLv2+ Summary: Session Tools for the GNOME Desktop Url: http://www.gnome.org ++++++ gnome ++++++ --- /var/tmp/diff_new_pack.iBql8o/_old 2011-02-22 11:37:14.000000000 +0100 +++ /var/tmp/diff_new_pack.iBql8o/_new 2011-02-22 11:37:14.000000000 +0100 @@ -8,24 +8,48 @@ # https://bugzilla.novell.com/ # -# For checks that are SLE-only. -if test "x`head -n 1 /etc/SuSE-brand 2> /dev/null`" != "xopenSUSE"; then - # openSUSE <= 10.3 and SLED <= 10 modified the user GConf database to change background. - # New openSUSE obsoletes this mechanism by branding and gnome-wp-list. - # We still have to detect old modifications in the user database and remove them. - # - # This code may disappear after SLED 12: - OLD_WALLPAPER=$(gconftool-2 --get /desktop/gnome/background/picture_filename 2>/dev/null) - PICTURE_OPTIONS=$(gconftool-2 --get /desktop/gnome/background/picture_options 2>/dev/null) - if [ "$PICTURE_OPTIONS" != "none" -a \(\ - "$OLD_WALLPAPER" != "${OLD_WALLPAPER#/usr/share/wallpapers/default}" -o ! -e "$OLD_WALLPAPER" \) ] ; then - gconftool-2 -u /desktop/gnome/background/picture_filename - gconftool-2 -u /desktop/gnome/background/picture_options +if test "x$XDG_CONFIG_HOME" = "x"; then + XDG_CONFIG_HOME="$HOME/.config" +fi +SUSE_DIR="$XDG_CONFIG_HOME/suse" + +if test -e /usr/share/applications/YaST2/live-installer.desktop; then + IS_LIVE_IMAGE="yes" +else + IS_LIVE_IMAGE="no" +fi + +# openSUSE <= 10.3 and SLED <= 10 modified the user GConf database to change background. +# New openSUSE obsoletes this mechanism by branding and gnome-wp-list. +# We still have to detect old modifications in the user database and remove them. +# This code may disappear after SLED 12. +# +# We also need to fix the case where the user explicitly configured the +# background to what used to be the default background; for openSUSE <= 11.3, +# the filename was specific to each version of openSUSE. +if test "$IS_LIVE_IMAGE" != "yes" -a ! -f "$SUSE_DIR/gnome-11.4-wallpaper-migrated"; then + PICTURE_FILENAME=$(gconftool-2 --get --ignore-schema-defaults /desktop/gnome/background/picture_filename 2>/dev/null) + PICTURE_OPTIONS=$(gconftool-2 --get --ignore-schema-defaults /desktop/gnome/background/picture_options 2>/dev/null) + if test -n "$PICTURE_OPTIONS" -a -n "$PICTURE_FILENAME" -a \ + "$PICTURE_OPTIONS" != "none" -a \ + ! -e "$PICTURE_FILENAME" -a \( \ + "$PICTURE_FILENAME" != "${PICTURE_FILENAME#/usr/share/wallpapers/default}" -o \ + "$PICTURE_FILENAME" = "/usr/share/wallpapers/openSUSE112-1600x1200.png" -o \ + "$PICTURE_FILENAME" = "/usr/share/backgrounds/daft/daft.xml" -o \ + "$PICTURE_FILENAME" = "/usr/share/wallpapers/openSUSE113-1600x1200.jpg" -o \ + "$PICTURE_FILENAME" = "/usr/share/backgrounds/IK/IK.xml" \ + \); then + gconftool-2 --unset /desktop/gnome/background/picture_filename + gconftool-2 --unset /desktop/gnome/background/picture_options fi + + mkdir -p -m 0700 "$XDG_CONFIG_HOME" + mkdir -p "$SUSE_DIR" + touch "$SUSE_DIR/gnome-11.4-wallpaper-migrated" fi # Some actions that are specific to the LiveCD -if [ -e /usr/share/applications/YaST2/live-installer.desktop ] ; then +if test "$IS_LIVE_IMAGE" = "yes" ; then # Install the live install desktop icon this way until there is a better # solution. The actual files reside in gnome2-SuSE the # /usr/share/applications/YaST2/live-installer.desktop exists on a live @@ -41,13 +65,6 @@ # setup live install to not have a lock-enabled screensaver gconftool-2 --set /apps/gnome-screensaver/lock_enabled --type=bool "false" - # setup live install to not start beagled - if [ -e /etc/xdg/autostart/beagled-autostart.desktop ] ; then - mkdir -p ~/.config/autostart - cp /etc/xdg/autostart/beagled-autostart.desktop ~/.config/autostart - echo "X-GNOME-Autostart-enabled=false" >> ~/.config/autostart/beagled-autostart.desktop - fi - # setup live install to not start updater-applet if [ -e /usr/share/gnome/autostart/gpk-update-icon.desktop ] ; then mkdir -p ~/.config/autostart ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
