commit lxmenu-data for openSUSE:Factory
Hello community, here is the log from the commit of package lxmenu-data for openSUSE:Factory checked in at Sat May 15 00:38:13 CEST 2010. -------- --- lxmenu-data/lxmenu-data.changes 2009-12-15 15:34:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/lxmenu-data/lxmenu-data.changes 2010-05-14 16:37:49.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 14 14:27:47 UTC 2010 - andrea@opensuse.org + +- Rename guido patch to lxmenu-data-0.1.1-menu-customization.patch +- added patch tag as LXDE packaging team guidelines +- fixed BuildRequires + +------------------------------------------------------------------- +Fri May 14 11:46:08 UTC 2010 - guido+opensuse.org@berhoerster.name + +- clean up and simplify menu structure + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lxmenu-data-0.1.1-restore-system.patch New: ---- lxmenu-data-0.1.1-menu-customization.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxmenu-data.spec ++++++ --- /var/tmp/diff_new_pack.WRuWj7/_old 2010-05-15 00:38:00.000000000 +0200 +++ /var/tmp/diff_new_pack.WRuWj7/_new 2010-05-15 00:38:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lxmenu-data (Version 0.1.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,12 +20,14 @@ Name: lxmenu-data Version: 0.1.1 -Release: 1 +Release: 2 License: GPL Source0: %{name}-%{version}.tar.bz2 -Patch0: %name-%version-restore-system.patch +# PATCH-FEATURE-OPENSUSE lxmenu-data-0.1.1-menu-customization.patch -- Guido Berhörster guido+opensuse.org@berhoerster.name +# Clean up lxde menu and improve user experience +Patch0: %{name}-0.1.1-menu-customization.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gtk2-devel pkgconfig +BuildRequires: gcc gettext-tools perl perl-XML-Parser pkgconfig BuildRequires: autoconf automake intltool BuildArch: noarch Group: System/GUI/Other ++++++ lxmenu-data-0.1.1-menu-customization.patch ++++++ diff -urN lxmenu-data-0.1.1.orig/layout/lxde-applications.menu lxmenu-data-0.1.1/layout/lxde-applications.menu --- lxmenu-data-0.1.1.orig/layout/lxde-applications.menu 2009-05-19 18:52:11.000000000 +0200 +++ lxmenu-data-0.1.1/layout/lxde-applications.menu 2010-05-14 13:56:00.000000000 +0200 @@ -19,13 +19,14 @@ <Directory>lxde-utility.directory</Directory> <Include> <And> - <Category>Utility</Category> + <Category>Utility</Category> <!-- Accessibility spec must have either the Utility or Settings category, and we display an accessibility submenu already for the ones that do not have Settings, so don't display accessibility applications here --> <Not><Category>Accessibility</Category></Not> <Not><Category>System</Category></Not> + <Not><Category>Settings</Category></Not> </And> </Include> </Menu> <!-- End Accessories --> @@ -129,6 +130,7 @@ <And> <Category>System</Category> <Not><Category>Settings</Category></Not> + <Not><Category>SystemSetup</Category></Not> <Not><Category>PackageManager</Category></Not> </And> </Include> @@ -149,17 +151,56 @@ </Menu> <!-- End Other --> <Menu> - <Name>DesktopSettings</Name> - <Directory>lxde-settings.directory</Directory> - <OnlyUnallocated/> + <Name>Settings</Name> + <Directory>lxde-menu-system.directory</Directory> + <Menu> + <Name>Preferences</Name> + <Directory>lxde-settings.directory</Directory> + <Include> + <And> + <Category>Settings</Category> + <Not> + <Or> + <Category>System</Category> + <Filename>gnomecc.desktop</Filename> + <Filename>lxcc.desktop</Filename> + </Or> + </Not> + </And> + </Include> + </Menu> + + <!-- System Settings --> + <Menu> + <Name>Administration</Name> + <Directory>lxde-settings-system.directory</Directory> + <Include> + <And> + <Or> + <Category>PackageManager</Category> + <Category>SystemSetup</Category> + <And> + <Category>Settings</Category> + <Category>System</Category> + </And> + </Or> + <Not> + <Or> + <Category>X-SuSE-YaST</Category> + <Filename>lxcc.desktop</Filename> + </Or> + </Not> + </And> + </Include> + </Menu> <!-- End System Settings --> + <Include> - <Or> - <Category>Settings</Category> - <Category>PackageManager</Category> - <Category>System</Category> - </Or> + <Filename>lxcc.desktop</Filename> </Include> + <Layout> + <Menuname>Preferences</Menuname> + <Menuname>Administration</Menuname> <Merge type="menus"/> <Merge type="files"/> </Layout> @@ -170,7 +211,7 @@ <Merge type="files"/> <Merge type="menus"/> <Separator/> - <Menuname>DesktopSettings</Menuname> + <Menuname>Settings</Menuname> </Layout> </Menu> <!-- End Applications --> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de