Hello community, here is the log from the commit of package gnome-menus-branding-openSUSE for openSUSE:Factory checked in at Mon May 2 14:33:28 CEST 2011. -------- --- GNOME/gnome-menus-branding-openSUSE/gnome-menus-branding-SLED.changes 2010-10-15 17:11:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-menus-branding-openSUSE/gnome-menus-branding-SLED.changes 2011-04-27 16:03:54.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Apr 27 16:02:06 CEST 2011 - vuntz@opensuse.org + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + instead of excluding X-SuSE-ControlCenter-* categories, simply + exclude X-SuSE-YaST. We might still want to see .desktop files + with X-SuSE-ControlCenter-* in Other as the control center won't + display them anymore. + +------------------------------------------------------------------- +Wed Apr 27 14:26:20 CEST 2011 - fcrozat@novell.com + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + Ensure YaST launcher is visible in System category. + +------------------------------------------------------------------- gnome-menus-branding-openSUSE.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gnome-menus-branding-SLED (Version 11.4) +# spec file for package gnome-menus-branding-SLED # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,13 +23,13 @@ Name: gnome-menus-branding-SLED Version: 11.4 -Release: 1 +Release: 2 Group: System/GUI/GNOME License: BSD3c Summary: SLED branding of gnome-menus Source: gnome-menus-branding-COPYING Source1: gnome-menus-branding-settings.menu -# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # 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 ++++++ gnome-menus-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gnome-menus-branding-openSUSE (Version 11.4) +# spec file for package gnome-menus-branding-openSUSE # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,13 +23,13 @@ Name: gnome-menus-branding-openSUSE Version: 11.4 -Release: 1 +Release: 5 Group: System/GUI/GNOME License: BSD3c Summary: openSUSE branding of gnome-menus Source: gnome-menus-branding-COPYING Source1: gnome-menus-branding-settings.menu -# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gnome-menus-branding-openSUSE, you cannot ++++++ gnome-menus-branding-remove-X-SuSE-ControlCenter.patch ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -1,13 +1,18 @@ ---- gnome-applications.menu 2010-09-13 14:35:10.868032788 +0200 -+++ gnome-applications.menu.new 2010-09-13 14:34:56.248032229 +0200 -@@ -147,6 +147,10 @@ - <Not><Category>Core</Category></Not> +--- gnome-applications.menu.orig 2011-04-26 18:27:31.000000000 +0200 ++++ gnome-applications.menu 2011-04-27 14:24:20.805677461 +0200 +@@ -134,6 +134,7 @@ + <Category>System</Category> <Not><Category>Settings</Category></Not> + </And> ++ <Filename>YaST.desktop</Filename> + </Include> + </Menu> <!-- End System Tools --> + +@@ -147,6 +148,7 @@ + <Not><Category>Core</Category></Not> <Not><Category>Screensaver</Category></Not> -+ <Not><Category>X-SuSE-ControlCenter-Hardware</Category></Not> -+ <Not><Category>X-SuSE-ControlCenter-LookAndFeel</Category></Not> -+ <Not><Category>X-SuSE-ControlCenter-Personal</Category></Not> -+ <Not><Category>X-SuSE-ControlCenter-System</Category></Not> + <Not><Category>X-GNOME-Settings-Panel</Category></Not> ++ <Not><Category>X-SuSE-YaST</Category></Not> </And> </Include> </Menu> <!-- End Other --> ++++++ gnome-menus-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Apr 27 16:02:06 CEST 2011 - vuntz@opensuse.org + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + instead of excluding X-SuSE-ControlCenter-* categories, simply + exclude X-SuSE-YaST. We might still want to see .desktop files + with X-SuSE-ControlCenter-* in Other as the control center won't + display them anymore. + +------------------------------------------------------------------- +Wed Apr 27 14:26:20 CEST 2011 - fcrozat@novell.com + +- Update gnome-menus-branding-remove-X-SuSE-ControlCenter.patch: + Ensure YaST launcher is visible in System category. + +------------------------------------------------------------------- Fri Oct 8 11:48:24 CEST 2010 - vuntz@opensuse.org - Bump version to 11.4. ++++++ gnome-menus-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.TGybPi/_old 2011-05-02 14:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TGybPi/_new 2011-05-02 14:31:41.000000000 +0200 @@ -27,7 +27,7 @@ Summary: %{branding_name} branding of gnome-menus Source: gnome-menus-branding-COPYING Source1: gnome-menus-branding-settings.menu -# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-ControlCenter-* categories from the Applications menu +# PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with gnome-menus-branding-%{branding_name}, you cannot ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org