Hello community, here is the log from the commit of package gnome-menus-branding-SLED checked in at Tue Nov 4 17:38:45 CET 2008. -------- --- GNOME/gnome-menus-branding-SLED/gnome-menus-branding-SLED.changes 2008-10-06 16:32:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-menus-branding-SLED/gnome-menus-branding-SLED.changes 2008-11-04 12:47:48.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Nov 4 12:43:45 CET 2008 - vuntz@novell.com + +- Sync with gnome-menus-branding-openSUSE: + + Upstream has changed the way settings.menu is used for 2.24, so + kill preferences.menu and just use settings.menu now. + + Keep preferences.menu as a link to settings.menu, since we + don't want to break anything because of this. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-menus-branding-SLED-customization.patch gnome-menus-branding-SLED-preferences.menu New: ---- gnome-menus-branding-SLED-settings.menu ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.h23454/_old 2008-11-04 17:38:30.000000000 +0100 +++ /var/tmp/diff_new_pack.h23454/_new 2008-11-04 17:38:30.000000000 +0100 @@ -20,17 +20,16 @@ Name: gnome-menus-branding-SLED Version: 11.1 -Release: 13 +Release: 14 Group: System/GUI/GNOME License: BSD 3-Clause Summary: SLED branding of gnome-menus Source: %{name}-COPYING -Source1: %{name}-preferences.menu +Source1: %{name}-settings.menu Source2: %{name}-Hidden.directory -Patch: %{name}-customization.patch Provides: gnome-menus-branding = 2.23 Conflicts: otherproviders(gnome-menus-branding) -Supplements: packageand(branding-SLED:gnome-menus) +Supplements: packageand(gnome-menus:branding-SLED) BuildRoot: %{_tmppath}/%{name}-%{version}-build # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gnome-menus-branding-SLED, you cannot @@ -52,11 +51,12 @@ %prep %setup -q -T -c %{name}-%{version} cp -a %{S:0} COPYING -cp -a %{S:1} preferences.menu cp -a %{S:2} Hidden.directory # We will base menus on upstream menus: cp -a %{_sysconfdir}/xdg/menus/*.menu . -%patch +# Override settings.menu with our version. It doesn't make sense to patch it, +# they're just completely different +cp -a %{S:1} settings.menu %build @@ -65,6 +65,8 @@ install -m0644 *.directory $RPM_BUILD_ROOT%{_datadir}/desktop-directories/ install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus install -m0644 *.menu $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/ +# Remove this in 11.2 +ln -s %{_sysconfdir}/xdg/menus/settings.menu $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences.menu %clean rm -rf $RPM_BUILD_ROOT @@ -76,6 +78,12 @@ %{_sysconfdir}/xdg/menus/*.menu %changelog +* Tue Nov 04 2008 vuntz@novell.com +- Sync with gnome-menus-branding-openSUSE: + + Upstream has changed the way settings.menu is used for 2.24, so + kill preferences.menu and just use settings.menu now. + + Keep preferences.menu as a link to settings.menu, since we + don't want to break anything because of this. * Mon Oct 06 2008 sbrabec@suse.cz - Conflict with other branding providers (FATE#304881). * Mon Aug 25 2008 jpr@suse.de ++++++ gnome-menus-branding-SLED-settings.menu ++++++ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> <Menu> <Name>Preferences</Name> <Directory>Settings.directory</Directory> <!-- Read standard .directory and .desktop file locations --> <DefaultAppDirs/> <DefaultDirectoryDirs/> <!-- Read in overrides and child menus from settings-merged/ --> <DefaultMergeDirs/> <!-- Settings --> <Include> <And> <Category>X-Ximian-Settings</Category> <Not> <Or> <Category>AdvancedSettings</Category> <Category>System</Category> <Category>Appearance</Category> <Category>Behavior</Category> <Category>Hardware</Category> <Category>Personal</Category> <Category>Merged</Category> <Category>AdvancedSettings</Category> </Or> </Not> </And> </Include> <Menu> <Name>Personal</Name> <Directory>Personal.directory</Directory> <Include> <Category>X-SuSE-ControlCenter-Personal</Category> <And> <Category>X-Ximian-Settings</Category> <Category>Personal</Category> </And> </Include> </Menu> <Menu> <Name>Look and Feel</Name> <Directory>LookAndFeel.directory</Directory> <Include> <Category>X-SuSE-ControlCenter-LookAndFeel</Category> <And> <Category>X-Ximian-Settings</Category> <Or> <Category>Behavior</Category> <Category>Appearance</Category> </Or> </And> </Include> </Menu> <Menu> <Name>Hardware</Name> <Directory>Hardware.directory</Directory> <Include> <Category>X-SuSE-ControlCenter-Hardware</Category> <And> <Category>X-Ximian-Settings</Category> <Category>Hardware</Category> </And> <Filename>YaST2-bluetooth.desktop</Filename> <Filename>YaST2-x11.desktop</Filename> <Filename>YaST2-scanner.desktop</Filename> <Filename>YaST2-lan.desktop</Filename> <Filename>YaST2-modem.desktop</Filename> <Filename>YaST2-dsl.desktop</Filename> </Include> </Menu> <Menu> <Name>System</Name> <Directory>System.directory</Directory> <Include> <Category>X-SuSE-ControlCenter-System</Category> <And> <Category>X-Ximian-Settings</Category> <Or> <Category>Merged</Category> <Category>AdvancedSettings</Category> <Category>System</Category> </Or> </And> <Filename>YaST2-yast-language.desktop</Filename> <Filename>YaST2-timezone.desktop</Filename> <Filename>YaST2-users.desktop</Filename> </Include> </Menu> <Layout> <Merge type="menus"/> <Merge type="files"/> </Layout> </Menu> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org