From 173c99d84024e7df72411c6e21d45ce27961e1ee Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Tue, 25 Jan 2005 18:16:24 +0000
Subject: Fix small errors in default layout menu files

---
 mandrake_desk.spec                 | 5 ++++-
 menu/defaultlayout-simplified.menu | 1 +
 menu/defaultlayout.menu            | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 1365b9a..8f686ed 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -1,7 +1,7 @@
 Summary:	The Desktop configuration files for Mandrakelinux
 Name:		mandrake_desk
 Version:	10.1
-Release: 	14mdk
+Release: 	15mdk
 License:	GPL
 URL:		http://www.mandrakelinux.com/
 Group:		System/Configuration/Other
@@ -163,6 +163,9 @@ rm -fr %buildroot
 
 
 %changelog
+* Tue Jan 25 2005 Frederic Crozat <fcrozat@mandrakesoft.com> 10.1-15mdk 
+- Fix small errors in default layout menu files
+
 * Tue Dec 14 2004 Frederic Crozat <fcrozat@mandrakesoft.com> 10.1-14mdk 
 - Move mdk menu data from menu to mandrake_desk package
 
diff --git a/menu/defaultlayout-simplified.menu b/menu/defaultlayout-simplified.menu
index 723e247..2a6b074 100644
--- a/menu/defaultlayout-simplified.menu
+++ b/menu/defaultlayout-simplified.menu
@@ -1,4 +1,5 @@
 <Menu>
+<Name>Mandrakelinux</Name>
 <Layout>
 <Menuname>Use Office Tools</Menuname>
 <Menuname>Organize</Menuname>
diff --git a/menu/defaultlayout.menu b/menu/defaultlayout.menu
index 1b5ccef..d981f45 100644
--- a/menu/defaultlayout.menu
+++ b/menu/defaultlayout.menu
@@ -1,12 +1,13 @@
 <Menu>
+<Name>Mandrakelinux</Name>
 <Layout>
-<Merge type="menus"/>
 <Menuname>Office</Menuname>
 <Menuname>Internet</Menuname>
 <Menuname>Multimedia</Menuname>
 <Menuname>System</Menuname>
 <Menuname>More Applications</Menuname>
 <Menuname>Other</Menuname>
+<Merge type="menus"/>
 <Merge type="files"/>
 </Layout>
 </Menu>
-- 
cgit v1.2.1