Fix menu order for Menuname with id

2 files changed, 38 insertions, 35 deletions

diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 4551aba..0d2defd 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: 	17mdk
+Release: 	18mdk
 License:	GPL
 URL:		http://www.mandrakelinux.com/
 Group:		System/Configuration/Other
@@ -170,6 +170,9 @@ rm -fr %buildroot
 
 
 %changelog
+* Tue Mar 01 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-18mdk
+- Fix Filename order with menu id
+
 * Tue Mar 01 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-17mdk
 - Update menu order
 
diff --git a/menu/menu b/menu/menu
index 7c509ba..b73e516 100644
--- a/menu/menu
+++ b/menu/menu
@@ -1,52 +1,52 @@
 ?package(menu): needs=x11 section="/" title="Office" icon="office_section.png" order="Wordprocessors,Spreadsheets,Presentations,Drawing,Graphs,Publishing,Tasks Management,Time Management,Address Books,Communications,Accessories,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Accessories" icon="office_accessories_section.png" order="_mergemenu_,kcalc.desktop,oooqs.desktop,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Address Books" icon="addressbook_section.png" order="_mergemenu_,kaddressbook.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Accessories" icon="office_accessories_section.png" order="_mergemenu_,Mandrakelinux-Office-Accessories-kcalc.desktop,Mandrakelinux-Office-Accessories-oooqs.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Address Books" icon="addressbook_section.png" order="_mergemenu_,Mandrakelinux-Office-AddressBooks-kaddressbook.desktop,_mergefile_"
 #
 ?package(menu): needs=x11 section="Office" title="Communications" icon="communications_section.png" order="Fax,Phone,PDA,Other,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="Office/Communications" title="Fax" icon="communications_fax_section.png"
-?package(menu): needs=x11 section="Office/Communications" title="PDA" icon="pda_section.png" order="_mergemenu_,kpilot.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office/Communications" title="PDA" icon="pda_section.png" order="_mergemenu_,Mandrakelinux-Office-Communications-PDA-kpilot.desktop,_mergefile_"
 ?package(menu): needs=x11 section="Office/Communications" title="Phone" icon="communications_phone_section.png"
 ?package(menu): needs=x11 section="Office/Communications" title="Other" icon="communications_other_section.png"
 #
-?package(menu): needs=x11 section="Office" title="Drawing" icon="office_drawing_section.png" order="_mergemenu_,OpenOffice.org Draw.desktop,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Graphs" icon="graphs_section.png" order="_mergemenu_,Dia.desktop,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Presentations" icon="presentation_section.png" order="_mergemenu_,OpenOffice.org Impress.desktop,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Publishing" icon="publishing_section.png" order="_mergemenu_,Xpdf.desktop,GhostView.desktop,_mergefile_
-?package(menu): needs=x11 section="Office" title="Spreadsheets" icon="spreadsheet_section.png" order="_mergemenu_,OpenOffice.org Calc.desktop,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Tasks Management" icon="taskmanagement_section.png" order="_mergemenu_,Planner.desktop,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Time Management" icon="timemanagement_section.png" order="_mergemenu_,korganizer.desktop,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Wordprocessors" icon="wordprocessor_section.png" order="_mergemenu_,OpenOffice.org Writer.desktop,OpenOffice.org Math.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Drawing" icon="office_drawing_section.png" order="_mergemenu_,Mandrakelinux-Office-Drawing-OpenOffice.org Draw.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Graphs" icon="graphs_section.png" order="_mergemenu_,Mandrakelinux-Office-Graphs-Dia.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Presentations" icon="presentation_section.png" order="_mergemenu_,Mandrakelinux-Office-Presentations-OpenOffice.org Impress.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Publishing" icon="publishing_section.png" order="_mergemenu_,Mandrakelinux-Office-Publishing-Xpdf.desktop,Mandrakelinux-Office-Publishing-GhostView.desktop,_mergefile_
+?package(menu): needs=x11 section="Office" title="Spreadsheets" icon="spreadsheet_section.png" order="_mergemenu_,Mandrakelinux-Office-Spreadsheets-OpenOffice.org Calc.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Tasks Management" icon="taskmanagement_section.png" order="_mergemenu_,Mandrakelinux-Office-TasksManagement-Planner.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Time Management" icon="timemanagement_section.png" order="_mergemenu_,Mandrakelinux-Office-TimeManagement-korganizer.desktop,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Wordprocessors" icon="wordprocessor_section.png" order="_mergemenu_,OpenOffice.org Writer.desktop,Mandrakelinux-Office-Wordprocessors-OpenOffice.org Math.desktop,_mergefile_"
 ?package(menu): needs=x11 section="Office" title="Other" icon="office_section.png"
 #
 #
 ?package(menu): needs=x11 section="/" title="Internet" icon="internet_section.png" order="Remote Access,Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Chat" icon="chat_section.png" order="_mergemenu_,ksirc.desktop,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="File Transfer" icon="file_transfer_section.png" order="_mergemenu_,kbear.desktop,Gtm.desktop,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Instant Messaging" icon="instant_messaging_section.png" order="_mergemenu_,kopete.desktop,Gaim.desktop,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Mail" icon="mail_section.png" order="_mergemenu_,Kontact.desktop,Evolution.desktop,Mozilla Messenger.desktop,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="News" icon="news_section.png" order="_mergemenu_,KNode.desktop,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Remote Access" icon="remote_access_section.png" order="_mergemenu_,Kppp.desktop,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Chat" icon="chat_section.png" order="_mergemenu_,Mandrakelinux-Internet-Chat-ksirc.desktop,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="File Transfer" icon="file_transfer_section.png" order="_mergemenu_,Mandrakelinux-Internet-FileTransfer-kbear.desktop,Mandrakelinux-Internet-FileTransfer-Gtm.desktop,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Instant Messaging" icon="instant_messaging_section.png" order="_mergemenu_,Mandrakelinux-Internet-InstantMessaging-kopete.desktop,Mandrakelinux-Internet-InstantMessaging-Gaim.desktop,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Mail" icon="mail_section.png" order="_mergemenu_,Mandrakelinux-Internet-Mail-Kontact.desktop,Mandrakelinux-Internet-Mail-Evolution.desktop,Mandrakelinux-Internet-Mail-Mozilla Messenger.desktop,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="News" icon="news_section.png" order="_mergemenu_,Mandrakelinux-Internet-News-KNode.desktop,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Remote Access" icon="remote_access_section.png" order="_mergemenu_,Mandrakelinux-Internet-RemoteAccess-Kppp.desktop,_mergefile_"
 ?package(menu): needs=x11 section="Internet" title="Video Conference" icon="video_conferences_section.png"
-?package(menu): needs=x11 section="Internet" title="Web Browsers" icon="web_browser_section.png" order="_mergemenu_,konqbrowser.desktop,Mozilla.desktop,Mozilla Firefox.desktop,Epiphany Web Browser.desktop,Epiphany Bookmarks Editor.desktop,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Web Browsers" icon="web_browser_section.png" order="_mergemenu_,Mandrakelinux-Internet-WebBrowsers-konqbrowser.desktop,Mandrakelinux-Internet-WebBrowsers-Mozilla.desktop,Mandrakelinux-Internet-WebBrowsers-Mozilla Firefox.desktop,Mandrakelinux-Internet-WebBrowsers-Epiphany Web Browser.desktop,Mandrakelinux-Internet-WebBrowsers-Epiphany Bookmarks Editor.desktop,_mergefile_"
 ?package(menu): needs=x11 section="Internet" title="Web Editors" icon="web_editors_section.png"
 ?package(menu): needs=x11 section="Internet" title="Other" icon="other_networking.png"
 #
 #
 ?package(menu): needs=x11 section="/" title="Multimedia" icon="multimedia_section.png" order="Sound,Video,Graphics,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Graphics" icon="graphics_section.png" order="_mergemenu_,The GIMP.desktop,kooka.desktop,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Sound" icon="sound_section.png" order="_mergemenu_,kscd.desktop,Totem Media Player.desktop,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Video" icon="video_section.png" order="_mergemenu_,Totem Movie Player.desktop,_mergefile_"
+?package(menu): needs=x11 section="Multimedia" title="Graphics" icon="graphics_section.png" order="_mergemenu_,Mandrakelinux-Multimedia-Graphics-The GIMP.desktop,Mandrakelinux-Multimedia-Graphics-kooka.desktop,_mergefile_"
+?package(menu): needs=x11 section="Multimedia" title="Sound" icon="sound_section.png" order="_mergemenu_,Mandrakelinux-Multimedia-Sound-kscd.desktop,Mandrakelinux-Multimedia-Sound-Totem Media Player.desktop,_mergefile_"
+?package(menu): needs=x11 section="Multimedia" title="Video" icon="video_section.png" order="_mergemenu_,Mandrakelinux-Multimedia-Video-Totem Movie Player.desktop,_mergefile_"
 ?package(menu): needs=x11 section="Multimedia" title="Other" icon="multimedia_section.png"
 #
 #
 ?package(menu): needs=x11 section="/" title="System" icon="system_section.png" order="Terminals,Text Tools,Configuration,Archiving,File Tools,Monitoring,Session,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="System" title="Archiving" icon="archiving_section.png" order="Backup,CD Burning,Compression,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="System/Archiving" title="Backup" icon="backup_section.png" order="_mergemenu_,DrakSync.desktop,_mergefile_"
-?package(menu): needs=x11 section="System/Archiving" title="CD Burning" icon="cd_burning_section.png" order="_mergemenu_,k3b.desktop,_mergefile_"
+?package(menu): needs=x11 section="System/Archiving" title="Backup" icon="backup_section.png" order="_mergemenu_,Mandrakelinux-System-Archiving-Backup-DrakSync.desktop,_mergefile_"
+?package(menu): needs=x11 section="System/Archiving" title="CD Burning" icon="cd_burning_section.png" order="_mergemenu_,Mandrakelinux-System-Archiving-CDBurning-k3b.desktop,_mergefile_"
 ?package(menu): needs=x11 section="System/Archiving" title="Compression" icon="compression_section.png"
 ?package(menu): needs=x11 section="System/Archiving" title="Other" icon="other_archiving.png"
 #
-?package(menu): needs=x11 section="System" title="Configuration" icon="configuration_section.png" order="KControl.desktop,Configure Your Computer.desktop,Boot and Init,GNOME,Hardware,Networking,Packaging,Printing,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="System" title="Configuration" icon="configuration_section.png" order="Mandrakelinux-System-Configuration-KControl.desktop,Mandrakelinux-System-Configuration-Configure Your Computer.desktop,Boot and Init,GNOME,Hardware,Networking,Packaging,Printing,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="System/Configuration" title="Boot and Init" icon="boot_init_section.png"
 ?package(menu): needs=x11 section="System/Configuration" title="GNOME" icon="gnome_section.png"
 ?package(menu): needs=x11 section="System/Configuration" title="Hardware" icon="hardware_configuration_section.png"
@@ -57,27 +57,27 @@
 ?package(menu): needs=x11 section="System/Configuration" title="Users" icon="configuration_section.png"
 ?package(menu): needs=x11 section="System/Configuration" title="Other" icon="other_configuration.png"
 #
-?package(menu): needs=x11 section="System" title="File Tools" icon="file_tools_section.png" order="_mergemenu_,Kfind.desktop,_mergefile_"
-?package(menu): needs=x11 section="System" title="Monitoring" icon="monitoring_section.png" order="_mergemenu_,ksysguard.desktop,_mergefile_"
-?package(menu): needs=x11 section="System" title="Terminals" icon="terminals_section.png" order="_mergemenu_,konsole.desktop,_mergefile_"
-?package(menu): needs=x11 section="System" title="Text Tools" icon="text_tools_section.png" order="_mergemenu_,kdict.desktop,_mergefile_"
+?package(menu): needs=x11 section="System" title="File Tools" icon="file_tools_section.png" order="_mergemenu_,Mandrakelinux-System-FileTools-Kfind.desktop,_mergefile_"
+?package(menu): needs=x11 section="System" title="Monitoring" icon="monitoring_section.png" order="_mergemenu_,Mandrakelinux-System-Monitoring-ksysguard.desktop,_mergefile_"
+?package(menu): needs=x11 section="System" title="Terminals" icon="terminals_section.png" order="_mergemenu_,Mandrakelinux-System-Terminals-konsole.desktop,_mergefile_"
+?package(menu): needs=x11 section="System" title="Text Tools" icon="text_tools_section.png" order="_mergemenu_,Mandrakelinux-System-TextTools-kdict.desktop,_mergefile_"
 ?package(menu): needs=x11 section="System" title="Other" icon="system_other_section.png"
 #
 #
 ?package(menu): needs=x11 section="/" title="More Applications" icon="more_applications_section.png" order="Accessibility,Development,Editors,Emulators,Finances,Databases,Education,Sciences,Communications,Games,Documentation,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications" title="Accessibility" icon="accessibility_section.png" order="_mergemenu_,kmag.desktop,_mergefile_"
+?package(menu): needs=x11 section="More Applications" title="Accessibility" icon="accessibility_section.png" order="_mergemenu_,Mandrakelinux-MoreApplications-Accessibility-kmag.desktop,_mergefile_"
 ?package(menu): needs=x11 section="More Applications" title="Communications" icon="communications_section.png"
 ?package(menu): needs=x11 section="More Applications" title="Databases" icon="databases_section.png"
 #
 ?package(menu): needs=x11 section="More Applications" title="Development" icon="development_section.png" order="Development Environment,Interpreter,Tools,Code Generators,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="More Applications/Development" title="Code Generators" icon="code_generator_section.png"
-?package(menu): needs=x11 section="More Applications/Development" title="Development Environments" icon="development_environment_section.png" order="_mergemenu_,kdevelop.desktop,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Interpreters" icon="interpreters_section.png" order="_mergemenu_,GNU Prolog.desktop,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Tools" icon="development_tools_section.png" order="_mergemenu_,Gdb.desktop,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Development" title="Development Environments" icon="development_environment_section.png" order="_mergemenu_,Mandrakelinux-MoreApplications-Development-DevelopmentEnvironments-kdevelop.desktop,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Development" title="Interpreters" icon="interpreters_section.png" order="_mergemenu_,Mandrakelinux-MoreApplications-Development-Interpreter-GNU Prolog.desktop,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Development" title="Tools" icon="development_tools_section.png" order="_mergemenu_,Mandrakelinux-MoreApplications-Development-Tools-Gdb.desktop,_mergefile_"
 ?package(menu): needs=x11 section="More Applications/Development" title="Other" icon="development_section.png"
 #
 ?package(menu): needs=x11 section="More Applications" title="Documentation" icon="documentation_section.png"
-?package(menu): needs=x11 section="More Applications" title="Editors" icon="editors_section.png" order="_mergemenu_,Emacs.desktop,XEmacs.desktop,VI editor.desktop,_mergefile_"
+?package(menu): needs=x11 section="More Applications" title="Editors" icon="editors_section.png" order="_mergemenu_,Mandrakelinux-MoreApplications-Editors-Emacs.desktop,Mandrakelinux-MoreApplications-Editors-XEmacs.desktop,Mandrakelinux-MoreApplications-Editors-VI editor.desktop,_mergefile_"
 #
 ?package(menu): needs=x11 section="More Applications" title="Education" icon="education_section.png" order="Economy,Geography,History,Languages,Literature,Sciences,Sports,Other,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="More Applications/Education" title="Economy" icon="education_economy_section.png"
@@ -90,7 +90,7 @@
 ?package(menu): needs=x11 section="More Applications/Education" title="Other" icon="education_other_section.png"
 #
 ?package(menu): needs=x11 section="More Applications" title="Emulators" icon="emulators_section.png"
-?package(menu): needs=x11 section="More Applications" title="Finances" icon="finances_section.png" order="_mergemenu_,GnuCash.desktop,kmymoney2.desktop,_mergefile"
+?package(menu): needs=x11 section="More Applications" title="Finances" icon="finances_section.png" order="_mergemenu_,Mandrakelinux-MoreApplications-Finances-GnuCash.desktop,Mandrakelinux-MoreApplications-Finances-kmymoney2.desktop,_mergefile"
 #
 ?package(menu): needs=x11 section="More Applications" title="Games" icon="amusement_section.png" order="Adventure,Arcade,Boards,Cards,Puzzles,Sports,Strategy,Toys,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="More Applications/Games" title="Adventure" icon="adventure_section.png"