Author: baggins Date: Fri May 18 06:39:28 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 6 - proper support for xfce 4.10, without merging external menus
---- Files affected: packages/applnk: applnk.spec (1.120 -> 1.121) , xfce-4.10.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/applnk/applnk.spec diff -u packages/applnk/applnk.spec:1.120 packages/applnk/applnk.spec:1.121 --- packages/applnk/applnk.spec:1.120 Fri May 18 02:08:01 2012 +++ packages/applnk/applnk.spec Fri May 18 08:39:23 2012 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Applnk - bazowa struktura katalogów z opisami do plików desktop/kdelnk Name: applnk Version: 2.2.0 -Release: 5 +Release: 6 License: GPL Group: Base Source0: ftp://ep09.pld-linux.org/software/applnk/%{name}-%{version}.tar.bz2 @@ -74,6 +74,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.121 2012/05/18 06:39:23 baggins +- rel 6 +- proper support for xfce 4.10, without merging external menus + Revision 1.120 2012/05/18 00:08:01 baggins - rel 5 - full support for xfce 4.10 ================================================================ Index: packages/applnk/xfce-4.10.patch diff -u packages/applnk/xfce-4.10.patch:1.2 packages/applnk/xfce-4.10.patch:1.3 --- packages/applnk/xfce-4.10.patch:1.2 Fri May 18 02:08:01 2012 +++ packages/applnk/xfce-4.10.patch Fri May 18 08:39:23 2012 @@ -1,6 +1,6 @@ -diff -ur applnk-2.2.0.orig/menus/applnk-applications.menu applnk-2.2.0/menus/applnk-applications.menu ---- applnk-2.2.0.orig/menus/applnk-applications.menu 2011-02-22 11:20:34.000000000 +0100 -+++ applnk-2.2.0/menus/applnk-applications.menu 2012-05-18 02:07:20.098461411 +0200 +diff -ur applnk-2.2.0/menus/applnk-applications.menu applnk-2.2.0-xfce/menus/applnk-applications.menu +--- applnk-2.2.0/menus/applnk-applications.menu 2011-02-22 11:20:34.000000000 +0100 ++++ applnk-2.2.0-xfce/menus/applnk-applications.menu 2012-05-18 08:35:37.000000000 +0200 @@ -26,7 +26,7 @@ </Include> @@ -26,20 +26,79 @@ <Not><Category>X-XFCE</Category></Not> <Not><Category>GNOME</Category></Not> </And> -@@ -632,6 +632,7 @@ +@@ -631,15 +631,71 @@ + <Include> <And> <Category>Settings</Category> ++ <Or> <Category>X-XFCE</Category> + <Category>XFCE</Category> ++ </Or> ++ <Not> ++ <Or> ++ <Category>X-XFCE-PersonalSettings</Category> ++ <Category>X-XFCE-HardwareSettings</Category> ++ <Category>X-XFCE-SystemSettings</Category> ++ </Or> ++ </Not> </And> </Include> <Layout> -@@ -640,6 +641,7 @@ - <Merge type="menus"/> - <Merge type="files"/> +- <Filename>xfce-settings-manager.desktop</Filename> +- <Separator/> +- <Merge type="menus"/> +- <Merge type="files"/> ++ <Menuname>Personal</Menuname> ++ <Menuname>Hardware</Menuname> ++ <Menuname>System</Menuname> ++ <Merge type="all"/> </Layout> -+ <MergeFile>xfce-settings-manager.menu</MergeFile> ++ <Menu> ++ <Name>Personal</Name> ++ <Directory>xfce-personal.directory</Directory> ++ <Include> ++ <And> ++ <Category>Settings</Category> ++ <Or> ++ <Category>X-XFCE</Category> ++ <Category>XFCE</Category> ++ </Or> ++ <Category>X-XFCE-SettingsDialog</Category> ++ <Category>X-XFCE-PersonalSettings</Category> ++ </And> ++ <Filename>xscreensaver-properties.desktop</Filename> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Hardware</Name> ++ <Directory>xfce-hardware.directory</Directory> ++ <Include> ++ <And> ++ <Category>Settings</Category> ++ <Or> ++ <Category>X-XFCE</Category> ++ <Category>XFCE</Category> ++ </Or> ++ <Category>X-XFCE-SettingsDialog</Category> ++ <Category>X-XFCE-HardwareSettings</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>System</Name> ++ <Directory>xfce-system.directory</Directory> ++ <Include> ++ <And> ++ <Category>Settings</Category> ++ <Or> ++ <Category>X-XFCE</Category> ++ <Category>XFCE</Category> ++ </Or> ++ <Category>X-XFCE-SettingsDialog</Category> ++ <Category>X-XFCE-SystemSettings</Category> ++ </And> ++ </Include> ++ </Menu> </Menu> <Menu> <Name>GNOME</Name> -Only in applnk-2.2.0/menus: applnk-applications.menu~ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/applnk/applnk.spec?r1=1.120&r2=1.121 http://cvs.pld-linux.org/packages/applnk/xfce-4.10.patch?r1=1.2&r2=1.3 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
