rpms/lxmenu-data/devel lxmenu-data-0.1.1-menu.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lxmenu-data.spec, 1.1, 1.2 sources, 1.2, 1.3 lxmenu-data-0.1-menu.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxmenu-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24420

Modified Files:
	.cvsignore lxmenu-data.spec sources 
Added Files:
	lxmenu-data-0.1.1-menu.patch 
Removed Files:
	lxmenu-data-0.1-menu.patch 
Log Message:
* Mon Jul 06 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.1.1-1
- Update to 0.1.1


lxmenu-data-0.1.1-menu.patch:

--- NEW FILE lxmenu-data-0.1.1-menu.patch ---
--- 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	2009-07-06 01:40:17.000000000 +0200
@@ -148,29 +148,43 @@
 		</Include>
 		</Menu> <!-- End Other -->
 
+	<!-- Preferences -->
 	<Menu>
-		<Name>DesktopSettings</Name>
+		<Name>Preferences</Name>
 		<Directory>lxde-settings.directory</Directory>
-		<OnlyUnallocated/>
 		<Include>
-			<Or>
+			<And>
 				<Category>Settings</Category>
-				<Category>PackageManager</Category>
-				<Category>System</Category>
-			</Or>
+				<Not>
+					<Or>
+						<Category>System</Category>
+						<Category>X-XfceSettingsDialog</Category>
+						<Filename>gnomecc.desktop</Filename>
+						<Filename>gnome-default-applications.desktop</Filename>
+					</Or>
+				</Not>
+			</And>
 		</Include>
-		<Layout>
-			<Merge type="menus"/>
-			<Merge type="files"/>
-		</Layout>
+	</Menu>		<!-- End Preferences -->
 
-	</Menu> <!-- End Settings -->
+	<!-- System Settings -->
+	<Menu>
+		<Name>Administration</Name>
+		<Directory>lxde-settings-system.directory</Directory>
+		<Include>
+			<And>
+				<Category>Settings</Category>
+				<Category>System</Category>
+			</And>
+		</Include>
+	</Menu>		 <!-- End System Settings -->
 
 	<Layout>
 		<Merge type="files"/>
 		<Merge type="menus"/>
 		<Separator/>
-		<Menuname>DesktopSettings</Menuname>
+		<Menuname>Preferences</Menuname>
+		<Menuname>Administration</Menuname>
 	</Layout>
 
 </Menu> <!-- End Applications -->


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxmenu-data/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Mar 2009 17:46:15 -0000	1.2
+++ .cvsignore	5 Jul 2009 23:51:55 -0000	1.3
@@ -1 +1 @@
-lxmenu-data-0.1.tar.gz
+lxmenu-data-0.1.1.tar.gz


Index: lxmenu-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxmenu-data/devel/lxmenu-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxmenu-data.spec	24 Mar 2009 17:46:15 -0000	1.1
+++ lxmenu-data.spec	5 Jul 2009 23:51:55 -0000	1.2
@@ -1,8 +1,8 @@
 # Review:       https://bugzilla.redhat.com/487973
 
 Name:           lxmenu-data
-Version:        0.1
-Release:        2%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        Data files for the LXDE menu
 
 Group:          User Interface/Desktops
@@ -10,7 +10,7 @@ License:        LGPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
 Source1:        lxmenu-data-0.1-COPYING
-Patch0:         lxmenu-data-0.1-menu.patch
+Patch0:         lxmenu-data-0.1.1-menu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool >= 0.40.0
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 06 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.1.1-1
+- Update to 0.1.1
+
 * Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.1-2
 - Change menu structure to vendor default
 - Fix license


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxmenu-data/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Mar 2009 17:46:15 -0000	1.2
+++ sources	5 Jul 2009 23:51:55 -0000	1.3
@@ -1 +1 @@
-1c35ad4bf05cd076ce4a9bb64a246351  lxmenu-data-0.1.tar.gz
+cee3181dd22088f3db0e99ffbedc986d  lxmenu-data-0.1.1.tar.gz


--- lxmenu-data-0.1-menu.patch DELETED ---