Author: baggins Date: Fri May 18 00:08:06 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 5 - full support for xfce 4.10
---- Files affected: packages/applnk: applnk.spec (1.119 -> 1.120) , xfce-4.10.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/applnk/applnk.spec diff -u packages/applnk/applnk.spec:1.119 packages/applnk/applnk.spec:1.120 --- packages/applnk/applnk.spec:1.119 Thu May 17 19:54:52 2012 +++ packages/applnk/applnk.spec Fri May 18 02:08:01 2012 @@ -3,14 +3,14 @@ Summary(pl.UTF-8): Applnk - bazowa struktura katalogów z opisami do plików desktop/kdelnk Name: applnk Version: 2.2.0 -Release: 4 +Release: 5 License: GPL Group: Base Source0: ftp://ep09.pld-linux.org/software/applnk/%{name}-%{version}.tar.bz2 # Source0-md5: 0af5401b44bb2c91c771da76c627b4f5 Patch0: xfce-4.10.patch Provides: xdg-menus -Conflicts: xfdesktop < 4.8.0 +Conflicts: xfdesktop < 4.10.0 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -74,6 +74,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.120 2012/05/18 00:08:01 baggins +- rel 5 +- full support for xfce 4.10 + Revision 1.119 2012/05/17 17:54:52 baggins - rel 4 - xfce 4.10 category changed to XFCE ================================================================ Index: packages/applnk/xfce-4.10.patch diff -u packages/applnk/xfce-4.10.patch:1.1 packages/applnk/xfce-4.10.patch:1.2 --- packages/applnk/xfce-4.10.patch:1.1 Thu May 17 19:54:52 2012 +++ packages/applnk/xfce-4.10.patch Fri May 18 02:08:01 2012 @@ -1,6 +1,24 @@ ---- applnk-2.2.0/menus/applnk-applications.menu~ 2011-02-22 11:20:34.000000000 +0100 -+++ applnk-2.2.0/menus/applnk-applications.menu 2012-05-17 19:53:29.962100171 +0200 -@@ -621,6 +621,7 @@ +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 +@@ -26,7 +26,7 @@ + </Include> + + <Layout> +- <Filename>xfrun4.desktop</Filename> ++ <Filename>xfce4-run.desktop</Filename> + <Separator/> + <Filename>exo-terminal-emulator.desktop</Filename> + <Filename>exo-file-manager.desktop</Filename> +@@ -38,7 +38,6 @@ + <Separator/> + <Menuname>Settings</Menuname> + <Separator/> +- <Filename>xfhelp4.desktop</Filename> + <Filename>xfce4-about.desktop</Filename> + <Filename>xfce4-session-logout.desktop</Filename> + </Layout> +@@ -621,6 +620,7 @@ <Category>PackageManager</Category> <Category>Printing</Category> </Or> @@ -8,7 +26,7 @@ <Not><Category>X-XFCE</Category></Not> <Not><Category>GNOME</Category></Not> </And> -@@ -632,6 +633,7 @@ +@@ -632,6 +632,7 @@ <And> <Category>Settings</Category> <Category>X-XFCE</Category> @@ -16,3 +34,12 @@ </And> </Include> <Layout> +@@ -640,6 +641,7 @@ + <Merge type="menus"/> + <Merge type="files"/> + </Layout> ++ <MergeFile>xfce-settings-manager.menu</MergeFile> + </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.119&r2=1.120 http://cvs.pld-linux.org/packages/applnk/xfce-4.10.patch?r1=1.1&r2=1.2 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
