- Fix error in upstream category in main menu

- add mandriva-discovery.menu additional menu file to hide / sort applications
  for Discovery / One products

4 files changed, 149 insertions, 2 deletions

diff --git a/desktop-common-data.spec b/desktop-common-data.spec
index 11f5455..d9d4d40 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 14
+Release: 	%mkrel 15
 License:	GPL
 URL:		http://www.mandrivalinux.com/
 Group:		System/Configuration/Other
@@ -105,6 +105,7 @@ install -d -m 0755 %buildroot/%_sysconfdir/xdg/menus/applications-merged  %build
 install -d -m 0755 %buildroot/%_sysconfdir/menu.d %buildroot/%_sysconfdir/profile.d
 install -m 0644 menu/applications-mdk.menu %buildroot/%_sysconfdir/xdg/menus/applications.menu
 install -m 0644 menu/applications-discovery.menu %buildroot/%_sysconfdir/xdg/discovery/menus/applications.menu
+install -m 0644 menu/mandriva-discovery.menu %buildroot/%_sysconfdir/xdg/discovery/menus/mandriva-discovery.menu
 install -m 0755 menu/xdg_menu %buildroot/%_bindir
 install -m 0755 menu/update-menus %buildroot/%_bindir/update-menus
 install -m 0755 menu/menustyle.sh menu/menustyle.csh %buildroot/%_sysconfdir/profile.d
@@ -211,6 +212,11 @@ rm -fr %buildroot
 
 
 %changelog
+* Tue Sep 19 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-15mdv2007.0
+- Fix error in upstream category in main menu
+- add mandriva-discovery.menu additional menu file to hide / sort applications
+  for Discovery / One products
+
 * Mon Sep 18 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-14mdv2007.0
 - Rebuild with fixed mdk-menu-message to get all translations (Mdv bug #25895)
 
diff --git a/menu/applications-discovery.menu b/menu/applications-discovery.menu
index 8f534a9..8262c69 100644
--- a/menu/applications-discovery.menu
+++ b/menu/applications-discovery.menu
@@ -222,5 +222,6 @@
             </Or>
     </Include>
   </Menu>
+<MergeFile>/etc/xdg/discovery/menus/mandriva-discovery.menu</MergeFile>
 <MergeFile>applications-kmenuedit.menu</MergeFile>
 </Menu>
diff --git a/menu/applications-mdk.menu b/menu/applications-mdk.menu
index bfcbfe0..26f8706 100644
--- a/menu/applications-mdk.menu
+++ b/menu/applications-mdk.menu
@@ -697,7 +697,7 @@
 			<Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category>
 			<And>
 				<Category>Education</Category>
-				<Category>Languages</Category>
+				<Category>Science</Category>
 			</And>
 		</Or>
         </Include>
diff --git a/menu/mandriva-discovery.menu b/menu/mandriva-discovery.menu
new file mode 100644
index 0000000..11937ad
--- /dev/null
+++ b/menu/mandriva-discovery.menu
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+<Menu>
+  <Name>Mandriva Linux</Name>
+  <Menu>
+    <Name>Graphics</Name>
+    <Exclude>
+      <Filename>kde-showfoto.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Internet</Name>
+    <Layout>
+      <Filename>mandriva-mozilla-firefox.desktop</Filename>
+      <Filename>kde-konqbrowser.desktop</Filename>
+      <Filename>epiphany.desktop</Filename>
+      <Filename>evolution.desktop</Filename>
+      <Filename>kde-KMail.desktop</Filename>
+      <Filename>kde-Kontact.desktop</Filename>
+      <Filename>kde-kopete.desktop</Filename>
+      <Filename>gaim.desktop</Filename>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Exclude>
+      <Filename>kde-kppplogview.desktop</Filename>
+      <Filename>kde-Kppp.desktop</Filename>
+      <Filename>kde-ksig.desktop</Filename>
+      <Filename>kde-knewsticker-standalone.desktop</Filename>
+      <Filename>kde-krfb.desktop</Filename>
+      <Filename>kde-krdc.desktop</Filename>
+      <Filename>kde-kget.desktop</Filename>
+      <Filename>kde-KNode.desktop</Filename>
+      <Filename>kde-ksirc.desktop</Filename>
+      <Filename>kde-groupwarewizard.desktop</Filename>
+      <Filename>bme.desktop</Filename>
+      <Filename>gftp.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Office</Name>
+    <Layout>
+      <Filename>template2.0.desktop</Filename>
+      <Filename>writer2.0.desktop</Filename>
+      <Filename>calc2.0.desktop</Filename>
+      <Filename>impress2.0.desktop</Filename>
+      <Filename>draw2.0.desktop</Filename>
+      <Filename>base2.0.desktop</Filename>
+      <Filename>web2.0.desktop</Filename>
+      <Separator/>
+      <Filename>kde-kwrite.desktop</Filename>
+      <Filename>kde-kpdf.desktop</Filename>
+      <Filename>kde-korganizer.desktop</Filename>
+      <Filename>kde-kalarm.desktop</Filename>
+      <Filename>kde-kcalc.desktop</Filename>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Exclude>
+      <Filename>kde-kghostview.desktop</Filename>
+      <Filename>kde-kate.desktop</Filename>
+      <Filename>kde-kaddressbook.desktop</Filename>
+      <Filename>kde-kdict.desktop</Filename>
+      <Filename>kde-KCharSelect.desktop</Filename>
+      <Filename>kde-multisynk.desktop</Filename>
+      <Filename>mandriva-hp-sendfax.desktop</Filename>
+      <Filename>kde-kpalmdoc.desktop</Filename>
+      <Filename>gnome-dictionary.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Exclude>
+      <Filename>mandriva-echomixer.desktop</Filename>
+      <Filename>mandriva-envy24control.desktop</Filename>
+      <Filename>mandriva-rmedigicontrol.desktop</Filename>
+      <Filename>kde-kdenlive.desktop</Filename>
+      <Filename>vumeter.desktop</Filename>
+      <Filename>reclevel.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>System</Name>
+    <Layout>
+      <Filename>mandriva-drakconf.desktop</Filename>
+      <Filename>mandriva-rpmdrake-root.desktop</Filename>
+      <Filename>kde-KControl.desktop</Filename>
+      <Filename>kde-kmenuedit.desktop</Filename>
+      <Filename>alacarte.desktop</Filename>
+      <Filename>mandriva-drakmenustyle.desktop</Filename>
+      <Filename>mandriva-ftw.desktop</Filename>
+      <Filename>mandriva-mdvonline.desktop</Filename>
+      <Filename>mandriva-mdvonline-bundle.desktop</Filename>
+      <Separator/>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Exclude>
+      <Filename>mandriva-mtink.desktop</Filename>
+      <Filename>kde-kdf.desktop</Filename>
+      <Filename>kde-kwifimanager.desktop</Filename>
+      <Filename>kde-kinfocenter.desktop</Filename>
+      <Filename>kde-kover.desktop</Filename>
+      <Filename>kde-kwalletconfig.desktop</Filename>
+      <Filename>kde-kcm_kbluetoothd.desktop</Filename>
+      <Filename>mandriva-xterm.desktop</Filename>
+      <Filename>kde-KFloppy.desktop</Filename>
+      <Filename>kde-kcm_btpaired.desktop</Filename>
+      <Filename>mandriva-userdrake.desktop</Filename>
+      <Filename>mandriva-hp-toolbox.desktop</Filename>
+      <Filename>kde-ksysguard.desktop</Filename>
+      <Filename>mandriva-harddrake-ui.desktop</Filename>
+      <Filename>mandriva-rpmdrake.desktop</Filename>
+      <Filename>mandriva-drakxtools-newt-system.desktop</Filename>
+      <Filename>mandriva-drakxtools-newt-user.desktop</Filename>
+      <Filename>kde-krandrtray.desktop</Filename>
+      <Filename>kde-kwikdisk.desktop</Filename>
+      <Filename>mandriva-net_applet.desktop</Filename>
+      <Filename>baobab.desktop</Filename>
+      <Filename>nautilus.desktop</Filename>
+      <Filename>gdmsetup.desktop</Filename>
+      <Filename>gdmphotosetup.desktop</Filename>
+      <Filename>gdmflexiserver.desktop</Filename>
+      <Filename>gnome-system-log.desktop</Filename>
+      <Filename>gnome-search-tool.desktop</Filename>
+      <Filename>gfloppy.desktop</Filename>
+      <Filename>gnome-system-monitor.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>More Applications</Name>
+    <Exclude>
+      <Filename>kde-kbtobexclient.desktop</Filename>
+      <Filename>kde-kbtserialchat.desktop</Filename>
+      <Filename>kde-kjscmd.desktop</Filename>
+      <Filename>invest-chart.desktop</Filename>
+      <Filename>base2.0.desktop</Filename>
+    </Exclude>
+  </Menu>
+</Menu>