- Rename root node from Mandriva Linux to Applications (Mdv bug #25389)

- Add missing .directory for various entries (Mdv bug #26273)

17 files changed, 78 insertions, 4 deletions

diff --git a/desktop-common-data.spec b/desktop-common-data.spec
index 36b7e14..efef418 100644
--- a/desktop-common-data.spec
+++ b/desktop-common-data.spec
@@ -3,7 +3,7 @@
 Summary:	Desktop common files 
 Name:		desktop-common-data
 Version:	2007
-Release: 	%mkrel 17
+Release: 	%mkrel 18
 License:	GPL
 URL:		http://www.mandrivalinux.com/
 Group:		System/Configuration/Other
@@ -212,6 +212,10 @@ rm -fr %buildroot
 
 
 %changelog
+* Mon Oct 02 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-18mdv2007.0
+- Rename root node from Mandriva Linux to Applications (Mdv bug #25389)
+- Add missing .directory for various entries (Mdv bug #26273)
+
 * Mon Sep 25 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-17mdv2007.0
 - Add missing Emulator category to menu files (Mdv bug #26148)
 
diff --git a/menu/applications-discovery.menu b/menu/applications-discovery.menu
index d667775..cdc6da3 100644
--- a/menu/applications-discovery.menu
+++ b/menu/applications-discovery.menu
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
 <Menu>
-  <Name>Mandriva Linux</Name>
+  <Name>Applications</Name>
   <Layout>
     <Menuname>Games</Menuname>
     <Menuname>Graphics</Menuname>
diff --git a/menu/applications-mdk.menu b/menu/applications-mdk.menu
index 3772d8e..642d8c8 100644
--- a/menu/applications-mdk.menu
+++ b/menu/applications-mdk.menu
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
 <Menu>
-  <Name>Mandriva Linux</Name>
+  <Name>Applications</Name>
   <Layout>
     <Menuname>Office</Menuname>
     <Menuname>Internet</Menuname>
@@ -661,7 +661,7 @@
       </Menu>
       <Menu>
         <Name>Geography</Name>
-        <Directory>mandriva-moreapplications-educatino-geography.directory</Directory>
+        <Directory>mandriva-moreapplications-education-geography.directory</Directory>
 	<Include>
 		<Or>
 			<Category>X-MandrivaLinux-MoreApplications-Education-Geography</Category>
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in b/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
new file mode 100644
index 0000000..c03f2b7
--- /dev/null
+++ b/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Interpreters
+Icon=interpreters_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in b/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
new file mode 100644
index 0000000..f7a909b
--- /dev/null
+++ b/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=development_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
new file mode 100644
index 0000000..582e3c5
--- /dev/null
+++ b/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Economy
+Icon=education_economy_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
new file mode 100644
index 0000000..738fd42
--- /dev/null
+++ b/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Geography
+Icon=education_geography_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
new file mode 100644
index 0000000..80b37e1
--- /dev/null
+++ b/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=History
+Icon=education_history_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
new file mode 100644
index 0000000..8643eb9
--- /dev/null
+++ b/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Literature
+Icon=education_literature_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in b/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
new file mode 100644
index 0000000..877f2bc
--- /dev/null
+++ b/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sports
+Icon=education_sport_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-other.directory.in b/menu/desktop-directories/mandriva-moreapplications-other.directory.in
new file mode 100644
index 0000000..85301a2
--- /dev/null
+++ b/menu/desktop-directories/mandriva-moreapplications-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=more_applications_other_section
diff --git a/menu/desktop-directories/mandriva-multimedia-other.directory.in b/menu/desktop-directories/mandriva-multimedia-other.directory.in
new file mode 100644
index 0000000..010bf91
--- /dev/null
+++ b/menu/desktop-directories/mandriva-multimedia-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=multimedia_section
diff --git a/menu/desktop-directories/mandriva-office-communications-other.directory.in b/menu/desktop-directories/mandriva-office-communications-other.directory.in
new file mode 100644
index 0000000..cb4e4af
--- /dev/null
+++ b/menu/desktop-directories/mandriva-office-communications-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=communications_other_section
diff --git a/menu/desktop-directories/mandriva-office-other.directory.in b/menu/desktop-directories/mandriva-office-other.directory.in
new file mode 100644
index 0000000..db3f56b
--- /dev/null
+++ b/menu/desktop-directories/mandriva-office-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=office_section
diff --git a/menu/desktop-directories/mandriva-other.directory.in b/menu/desktop-directories/mandriva-other.directory.in
new file mode 100644
index 0000000..85301a2
--- /dev/null
+++ b/menu/desktop-directories/mandriva-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=more_applications_other_section
diff --git a/menu/desktop-directories/mandriva-system-archiving-backup.directory.in b/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
new file mode 100644
index 0000000..4fd55f1
--- /dev/null
+++ b/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Backup
+Icon=backup_section
diff --git a/menu/desktop-directories/mandrivalinux.directory.in b/menu/desktop-directories/mandrivalinux.directory.in
new file mode 100644
index 0000000..926cada
--- /dev/null
+++ b/menu/desktop-directories/mandrivalinux.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Applications
+Icon=mandriva