Hello community, here is the log from the commit of package gconf2-branding-openSUSE checked in at Sat Nov 8 19:14:13 CET 2008. -------- --- gconf2-branding-openSUSE/gconf2-branding.changes 2008-11-07 14:41:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding.changes 2008-11-07 17:07:28.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Nov 7 17:06:31 CET 2008 - vuntz@novell.com + +- Set /apps/gnome-power-manager/notify/idle_sleep to TRUE (moved + the default from gnome-power-manager to here, so we are upstream + compliant without the branding package). + +------------------------------------------------------------------- +Fri Nov 7 16:47:44 CET 2008 - hmacht@suse.de + +- disable auto suspend and apply the other changes to all distros + (fate#305393) + +------------------------------------------------------------------- gconf2-branding-openSUSE.changes: same change gconf2-branding-SLED.changes: same change gconf2-branding-SLES.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.fc7461/_old 2008-11-08 19:13:49.000000000 +0100 +++ /var/tmp/diff_new_pack.fc7461/_new 2008-11-08 19:13:49.000000000 +0100 @@ -42,7 +42,7 @@ Group: System/GUI/GNOME Summary: GNOME configuration system: openSUSE defaults Version: 2.24 -Release: 9 +Release: 10 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -92,7 +92,7 @@ Summary: Dynamic Wallpaper with openSUSE Look Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 2 +Release: 3 %description -n desktop-data-openSUSE-extra-gnome This optional package contains nice dynamic wallpaper with openSUSE @@ -160,13 +160,15 @@ %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false" %endif +# Depends on the gnome-power-manager-notify-idle-sleep.patch in g-p-m +%gconf_set /apps/gnome-power-manager/notify/idle_sleep --type=bool "true" # Enable Energy Star compliant default configuration -%if %build_SLED %gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend" -%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200 -%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200 %gconf_set /apps/gnome-power-manager/timeout/sleep_display_ac --type=int 300 -%endif +# To complete Energy Star compliant default configuration, you should enable this too: +# (disabled by default because suspending is not working fine in all cases) +#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200 +#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200 # Use custom splash screen in gnome-session: %gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-openSUSE.png" # Use gnome-wm as default window manager: @@ -318,6 +320,13 @@ %changelog * Fri Nov 07 2008 vuntz@novell.com +- Set /apps/gnome-power-manager/notify/idle_sleep to TRUE (moved + the default from gnome-power-manager to here, so we are upstream + compliant without the branding package). +* Fri Nov 07 2008 hmacht@suse.de +- disable auto suspend and apply the other changes to all distros + (fate#305393) +* Fri Nov 07 2008 vuntz@novell.com - Update dynamic background for new branding. Fix bnc#442560. We keep the old one for openSUSE, though (see Jakub's request in the bug). ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.fc7461/_old 2008-11-08 19:13:49.000000000 +0100 +++ /var/tmp/diff_new_pack.fc7461/_new 2008-11-08 19:13:49.000000000 +0100 @@ -42,7 +42,7 @@ Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: 2.24 -Release: 9 +Release: 10 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -92,7 +92,7 @@ Summary: SLED defaults for the GNOME configuration system Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 2 +Release: 3 %description -n desktop-data-SLED-extra-gnome This package provides SLED defaults for configurations based on GConf @@ -153,13 +153,15 @@ %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false" %endif +# Depends on the gnome-power-manager-notify-idle-sleep.patch in g-p-m +%gconf_set /apps/gnome-power-manager/notify/idle_sleep --type=bool "true" # Enable Energy Star compliant default configuration -%if %build_SLED %gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend" -%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200 -%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200 %gconf_set /apps/gnome-power-manager/timeout/sleep_display_ac --type=int 300 -%endif +# To complete Energy Star compliant default configuration, you should enable this too: +# (disabled by default because suspending is not working fine in all cases) +#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200 +#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200 # Use custom splash screen in gnome-session: %gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-SLED.png" # Use gnome-wm as default window manager: @@ -311,6 +313,13 @@ %changelog * Fri Nov 07 2008 vuntz@novell.com +- Set /apps/gnome-power-manager/notify/idle_sleep to TRUE (moved + the default from gnome-power-manager to here, so we are upstream + compliant without the branding package). +* Fri Nov 07 2008 hmacht@suse.de +- disable auto suspend and apply the other changes to all distros + (fate#305393) +* Fri Nov 07 2008 vuntz@novell.com - Update dynamic background for new branding. Fix bnc#442560. We keep the old one for openSUSE, though (see Jakub's request in the bug). ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.fc7461/_old 2008-11-08 19:13:49.000000000 +0100 +++ /var/tmp/diff_new_pack.fc7461/_new 2008-11-08 19:13:49.000000000 +0100 @@ -42,7 +42,7 @@ Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system Version: 2.24 -Release: 9 +Release: 10 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -92,7 +92,7 @@ Summary: SLES defaults for the GNOME configuration system Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 2 +Release: 3 %description -n desktop-data-SLES-extra-gnome This package provides SLES defaults for configurations based on GConf @@ -153,13 +153,15 @@ %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false" %endif +# Depends on the gnome-power-manager-notify-idle-sleep.patch in g-p-m +%gconf_set /apps/gnome-power-manager/notify/idle_sleep --type=bool "true" # Enable Energy Star compliant default configuration -%if %build_SLED %gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend" -%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200 -%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200 %gconf_set /apps/gnome-power-manager/timeout/sleep_display_ac --type=int 300 -%endif +# To complete Energy Star compliant default configuration, you should enable this too: +# (disabled by default because suspending is not working fine in all cases) +#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200 +#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200 # Use custom splash screen in gnome-session: %gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-SLES.png" # Use gnome-wm as default window manager: @@ -311,6 +313,13 @@ %changelog * Fri Nov 07 2008 vuntz@novell.com +- Set /apps/gnome-power-manager/notify/idle_sleep to TRUE (moved + the default from gnome-power-manager to here, so we are upstream + compliant without the branding package). +* Fri Nov 07 2008 hmacht@suse.de +- disable auto suspend and apply the other changes to all distros + (fate#305393) +* Fri Nov 07 2008 vuntz@novell.com - Update dynamic background for new branding. Fix bnc#442560. We keep the old one for openSUSE, though (see Jakub's request in the bug). ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.fc7461/_old 2008-11-08 19:13:49.000000000 +0100 +++ /var/tmp/diff_new_pack.fc7461/_new 2008-11-08 19:13:49.000000000 +0100 @@ -160,13 +160,15 @@ %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false" %endif +# Depends on the gnome-power-manager-notify-idle-sleep.patch in g-p-m +%gconf_set /apps/gnome-power-manager/notify/idle_sleep --type=bool "true" # Enable Energy Star compliant default configuration -%if %build_SLED %gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend" -%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200 -%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200 %gconf_set /apps/gnome-power-manager/timeout/sleep_display_ac --type=int 300 -%endif +# To complete Energy Star compliant default configuration, you should enable this too: +# (disabled by default because suspending is not working fine in all cases) +#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200 +#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200 # Use custom splash screen in gnome-session: %gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-%{branding_name}.png" # Use gnome-wm as default window manager: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org