Hello community, here is the log from the commit of package gconf2-branding-openSUSE checked in at Tue Nov 4 17:35:22 CET 2008. -------- --- gconf2-branding-openSUSE/gconf2-branding.changes 2008-10-31 13:45:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding.changes 2008-11-04 12:27:58.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Nov 4 10:59:38 CET 2008 - vuntz@novell.com + +- Use the right version for desktop-data-openSUSE-extra-gnome. + Part of bnc#440849. +- Remove changes for gnome-volume-manager: we dropped + gnome-volume-manager. + +------------------------------------------------------------------- +Mon Nov 3 13:58:42 CET 2008 - rodrigo@novell.com + +- Disable Energy compliant settings for SLES +- Enable xrandr notification icon by default (bnc#440868) +- Added HACKING file + +------------------------------------------------------------------- gconf2-branding-openSUSE.changes: same change gconf2-branding-SLED.changes: same change gconf2-branding-SLES.changes: same change calling whatdependson for head-i586 New: ---- HACKING ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.YQ8881/_old 2008-11-04 17:34:45.000000000 +0100 +++ /var/tmp/diff_new_pack.YQ8881/_new 2008-11-04 17:34:45.000000000 +0100 @@ -42,7 +42,7 @@ Group: System/GUI/GNOME Summary: GNOME configuration system: openSUSE defaults Version: 2.24 -Release: 7 +Release: 8 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -88,8 +88,8 @@ Supplements: desktop-data-%{desktop_data}-extra Summary: Dynamic Wallpaper with openSUSE Look Group: System/GUI/GNOME -Version: 11.0.1 -Release: 79 +Version: %{desktop_data_ver} +Release: 1 %description -n desktop-data-openSUSE-extra-gnome This optional package contains nice dynamic wallpaper with openSUSE @@ -148,10 +148,12 @@ # FIXME: This key has no applyto and it cannot work. But it is now the default. #%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true" # Enable Energy Star compliant default configuration +%if %build_openSUSE || %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 # 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: @@ -159,6 +161,8 @@ # Define default keybinding of gnome-settings-daemon: # FIX-OPENSUSE gnome-settings-daemon-default-config.patch %gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help" +# Enable xrandr notification by default bnc#440868 rodrigo@novell.com +%gconf_set /apps/gnome_settings_daemon/xrandr/show_notification_icon --type=bool "TRUE" # Do not show process 'estimated memory usage' column on startup: # FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default %gconf_set /apps/procman/proctree/col_15_visible --type=bool "FALSE" @@ -172,16 +176,6 @@ # Use xchat for irc %gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s" %gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true" -# Prefer OpenSUSE applications in gnome-volume-manager: -%gconf_set /desktop/gnome/volume_manager/autophoto_command --type=string "f-spot-import %h" -%gconf_set /desktop/gnome/volume_manager/autoprinter_command --type=string "add-unknown-printer %h" -%gconf_set /desktop/gnome/volume_manager/autovideocam_command --type=string "kino %d" -# Auto run photo management command: -%gconf_set /desktop/gnome/volume_manager/autophoto --type=bool "true" -# Auto run scanner program -%gconf_set /desktop/gnome/volume_manager/autoscanner --type=bool "true" -# Auto run video editing program -%gconf_set /desktop/gnome/volume_manager/autovideocam --type=bool "true" # Change default look of GNOME in libgnome: # Change default background (scriptlets may alter this value): %if %build_openSUSE @@ -294,6 +288,15 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Tue Nov 04 2008 vuntz@novell.com +- Use the right version for desktop-data-openSUSE-extra-gnome. + Part of bnc#440849. +- Remove changes for gnome-volume-manager: we dropped + gnome-volume-manager. +* Mon Nov 03 2008 rodrigo@novell.com +- Disable Energy compliant settings for SLES +- Enable xrandr notification icon by default (bnc#440868) +- Added HACKING file * Fri Oct 31 2008 jpr@suse.de - Require desktop-data-SLED 11 not 11.1 on SLED/SLES * Thu Oct 30 2008 vuntz@novell.com ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.YQ8881/_old 2008-11-04 17:34:45.000000000 +0100 +++ /var/tmp/diff_new_pack.YQ8881/_new 2008-11-04 17:34:45.000000000 +0100 @@ -42,7 +42,7 @@ Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: 2.24 -Release: 7 +Release: 8 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -88,8 +88,8 @@ Supplements: desktop-data-%{desktop_data}-extra Summary: SLED defaults for the GNOME configuration system Group: System/GUI/GNOME -Version: 11.0.1 -Release: 19 +Version: %{desktop_data_ver} +Release: 1 %description -n desktop-data-SLED-extra-gnome This package provides SLED defaults for configurations based on GConf @@ -141,10 +141,12 @@ # FIXME: This key has no applyto and it cannot work. But it is now the default. #%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true" # Enable Energy Star compliant default configuration +%if %build_openSUSE || %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 # 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: @@ -152,6 +154,8 @@ # Define default keybinding of gnome-settings-daemon: # FIX-OPENSUSE gnome-settings-daemon-default-config.patch %gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help" +# Enable xrandr notification by default bnc#440868 rodrigo@novell.com +%gconf_set /apps/gnome_settings_daemon/xrandr/show_notification_icon --type=bool "TRUE" # Do not show process 'estimated memory usage' column on startup: # FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default %gconf_set /apps/procman/proctree/col_15_visible --type=bool "FALSE" @@ -165,16 +169,6 @@ # Use xchat for irc %gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s" %gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true" -# Prefer OpenSUSE applications in gnome-volume-manager: -%gconf_set /desktop/gnome/volume_manager/autophoto_command --type=string "f-spot-import %h" -%gconf_set /desktop/gnome/volume_manager/autoprinter_command --type=string "add-unknown-printer %h" -%gconf_set /desktop/gnome/volume_manager/autovideocam_command --type=string "kino %d" -# Auto run photo management command: -%gconf_set /desktop/gnome/volume_manager/autophoto --type=bool "true" -# Auto run scanner program -%gconf_set /desktop/gnome/volume_manager/autoscanner --type=bool "true" -# Auto run video editing program -%gconf_set /desktop/gnome/volume_manager/autovideocam --type=bool "true" # Change default look of GNOME in libgnome: # Change default background (scriptlets may alter this value): %if %build_openSUSE @@ -287,6 +281,15 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Tue Nov 04 2008 vuntz@novell.com +- Use the right version for desktop-data-openSUSE-extra-gnome. + Part of bnc#440849. +- Remove changes for gnome-volume-manager: we dropped + gnome-volume-manager. +* Mon Nov 03 2008 rodrigo@novell.com +- Disable Energy compliant settings for SLES +- Enable xrandr notification icon by default (bnc#440868) +- Added HACKING file * Fri Oct 31 2008 jpr@suse.de - Require desktop-data-SLED 11 not 11.1 on SLED/SLES * Thu Oct 30 2008 vuntz@novell.com ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.YQ8881/_old 2008-11-04 17:34:45.000000000 +0100 +++ /var/tmp/diff_new_pack.YQ8881/_new 2008-11-04 17:34:45.000000000 +0100 @@ -42,7 +42,7 @@ Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system Version: 2.24 -Release: 7 +Release: 8 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -88,8 +88,8 @@ Supplements: desktop-data-%{desktop_data}-extra Summary: SLES defaults for the GNOME configuration system Group: System/GUI/GNOME -Version: 11.0.1 -Release: 9 +Version: %{desktop_data_ver} +Release: 1 %description -n desktop-data-SLES-extra-gnome This package provides SLES defaults for configurations based on GConf @@ -141,10 +141,12 @@ # FIXME: This key has no applyto and it cannot work. But it is now the default. #%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true" # Enable Energy Star compliant default configuration +%if %build_openSUSE || %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 # 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: @@ -152,6 +154,8 @@ # Define default keybinding of gnome-settings-daemon: # FIX-OPENSUSE gnome-settings-daemon-default-config.patch %gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help" +# Enable xrandr notification by default bnc#440868 rodrigo@novell.com +%gconf_set /apps/gnome_settings_daemon/xrandr/show_notification_icon --type=bool "TRUE" # Do not show process 'estimated memory usage' column on startup: # FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default %gconf_set /apps/procman/proctree/col_15_visible --type=bool "FALSE" @@ -165,16 +169,6 @@ # Use xchat for irc %gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s" %gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true" -# Prefer OpenSUSE applications in gnome-volume-manager: -%gconf_set /desktop/gnome/volume_manager/autophoto_command --type=string "f-spot-import %h" -%gconf_set /desktop/gnome/volume_manager/autoprinter_command --type=string "add-unknown-printer %h" -%gconf_set /desktop/gnome/volume_manager/autovideocam_command --type=string "kino %d" -# Auto run photo management command: -%gconf_set /desktop/gnome/volume_manager/autophoto --type=bool "true" -# Auto run scanner program -%gconf_set /desktop/gnome/volume_manager/autoscanner --type=bool "true" -# Auto run video editing program -%gconf_set /desktop/gnome/volume_manager/autovideocam --type=bool "true" # Change default look of GNOME in libgnome: # Change default background (scriptlets may alter this value): %if %build_openSUSE @@ -287,6 +281,15 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Tue Nov 04 2008 vuntz@novell.com +- Use the right version for desktop-data-openSUSE-extra-gnome. + Part of bnc#440849. +- Remove changes for gnome-volume-manager: we dropped + gnome-volume-manager. +* Mon Nov 03 2008 rodrigo@novell.com +- Disable Energy compliant settings for SLES +- Enable xrandr notification icon by default (bnc#440868) +- Added HACKING file * Fri Oct 31 2008 jpr@suse.de - Require desktop-data-SLED 11 not 11.1 on SLED/SLES * Thu Oct 30 2008 vuntz@novell.com ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.YQ8881/_old 2008-11-04 17:34:45.000000000 +0100 +++ /var/tmp/diff_new_pack.YQ8881/_new 2008-11-04 17:34:45.000000000 +0100 @@ -88,7 +88,7 @@ Supplements: desktop-data-%{desktop_data}-extra Summary: Dynamic Wallpaper with %{branding_name} Look Group: System/GUI/GNOME -Version: 11.0.1 +Version: %{desktop_data_ver} Release: 72 %description -n desktop-data-%{branding_name}-extra-gnome @@ -148,10 +148,12 @@ # FIXME: This key has no applyto and it cannot work. But it is now the default. #%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true" # Enable Energy Star compliant default configuration +%if %build_openSUSE || %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 # 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: @@ -159,6 +161,8 @@ # Define default keybinding of gnome-settings-daemon: # FIX-OPENSUSE gnome-settings-daemon-default-config.patch %gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help" +# Enable xrandr notification by default bnc#440868 rodrigo@novell.com +%gconf_set /apps/gnome_settings_daemon/xrandr/show_notification_icon --type=bool "TRUE" # Do not show process 'estimated memory usage' column on startup: # FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default %gconf_set /apps/procman/proctree/col_15_visible --type=bool "FALSE" @@ -172,16 +176,6 @@ # Use xchat for irc %gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s" %gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true" -# Prefer OpenSUSE applications in gnome-volume-manager: -%gconf_set /desktop/gnome/volume_manager/autophoto_command --type=string "f-spot-import %h" -%gconf_set /desktop/gnome/volume_manager/autoprinter_command --type=string "add-unknown-printer %h" -%gconf_set /desktop/gnome/volume_manager/autovideocam_command --type=string "kino %d" -# Auto run photo management command: -%gconf_set /desktop/gnome/volume_manager/autophoto --type=bool "true" -# Auto run scanner program -%gconf_set /desktop/gnome/volume_manager/autoscanner --type=bool "true" -# Auto run video editing program -%gconf_set /desktop/gnome/volume_manager/autovideocam --type=bool "true" # Change default look of GNOME in libgnome: # Change default background (scriptlets may alter this value): %if %build_openSUSE ++++++ HACKING ++++++ This meta-package contains 3 subpackages: - gconf2-branding-openSUSE - gconf2-branding-SLES - gconf2-branding-SLED To change any of the packages: 1) Edit the gconf2-branding.spec.in file and add the changes you need. If you want the change only for one of the 3 distributions, just use: %if %build_openSUSE | %build_SLES | %build_SLED ...settings for only this specific distribution %endif If you don't use the %if...%endif statements, the change will be done for all the 3 distributions. 2) Edit the gconf2-branding.changes file 3) Run the pre_checkin.sh script 4) osc commit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org