Fix order into simplified menu

2 files changed, 21 insertions, 18 deletions

diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 0d2defd..3e07b49 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: 	18mdk
+Release: 	19mdk
 License:	GPL
 URL:		http://www.mandrakelinux.com/
 Group:		System/Configuration/Other
@@ -170,6 +170,9 @@ rm -fr %buildroot
 
 
 %changelog
+* Wed Mar 02 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-19mdk
+- Fix order for simplified menu
+
 * Tue Mar 01 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-18mdk
 - Fix Filename order with menu id
 
diff --git a/menu/menu-simplified b/menu/menu-simplified
index cf71a2a..a48d265 100644
--- a/menu/menu-simplified
+++ b/menu/menu-simplified
@@ -1,31 +1,31 @@
-?package(menu): needs=x11 section="/" title="Use Office Tools" icon="office_section.png"
-?package(menu): needs=x11 section="Use Office Tools" title="Use More Office Tools" icon="office_section.png" order="Wordprocessors,Spreadsheets,Presentations,Drawing,Graphs,Publishing,Tasks Management,Time Management,Address Books,Communications,Accessories,Other"
-?package(menu): needs=x11 section="/" title="Organize" icon="timemanagement_section.png"
+?package(menu): needs=x11 section="/" title="Use Office Tools" icon="office_section.png" order="_mergemenu_,Mandrakelinux-UseOfficeTools-Create a Text Document.desktop,Mandrakelinux-UseOfficeTools-Create a Spreadsheet.desktop,Mandrakelinux-UseOfficeTools-Create a Presentation.desktop,Mandrakelinux-UseOfficeTools-Create a Drawing,Mandrakelinux-UseOfficeTools-kivio.desktop,Mandrakelinux-UseOfficeTools-Design a Layout.desktop,Mandrakelinux-UseOfficeTools-kontact-kaddressbook.desktop,Mandrakelinux-UseOfficeTools-kdeprintfax.desktop,Mandrakelinux-UseOfficeTools-kfax.desktop,Mandrakelinux-UseOfficeTools-kpilot.desktop,Mandrakelinux-UseOfficeTools-kcalc.desktop,Mandrakelinux-UseOfficeTools-kdict.desktop,_mergefile_,Use More Office Tools,_separator_,Other"
+?package(menu): needs=x11 section="Use Office Tools" title="Use More Office Tools" 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="/" title="Organize" icon="timemanagement_section.png" order="_mergemenu_,Mandrakelinux-Organize-kontact-knotes.desktop,Mandrakelinux-Organize-kontact-korganizer.desktop,Mandrakelinux-Organize-kontact-korganizer-time.desktop,Mandrakelinux-Organize-karm.desktop,Mandrakelinux-Organize-Manage Projects.desktop,Mandrakelinux-Organize-Manage Your Finances.desktop,_mergefile_"
 ?package(menu): needs=x11 section="Organize" title="Use More Productivity Tools" icon="timemanagement_section.png"
 ?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Finances" icon="finances_section.png"
 ?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Tasks Management" icon="taskmanagement_section.png"
 ?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Time Management" icon="timemanagement_section.png"
-?package(menu): needs=x11 section="/" title="Surf the Internet" icon="internet_section.png"
-?package(menu): needs=x11 section="Surf the Internet" title="Use More Connectivity Utilities" icon="internet_section.png" order="Remote Access,Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,Other"
-?package(menu): needs=x11 section="/" title="Enjoy Music and Video" icon="multimedia_section.png"
-?package(menu): needs=x11 section="Enjoy Music and Video" title="Discover More Entertainment Options" icon="multimedia_section.png" order="Sound,Video,Graphics,Other"
-?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Sound" icon="sound_section.png" 
+?package(menu): needs=x11 section="/" title="Surf the Internet" icon="internet_section.png" order="_mergemenu_,konqueror.desktop,kontact-KMail.desktop,kopete.desktop,kontact-KNode.desktop,-Organize a Video Conference.desktop,kphone.desktop,quanta.desktop,kbear.desktop,Kppp.desktop,_mergefile_,Use More Internet Software,Use More Connectivity Utilities,_separator_,Other"
+?package(menu): needs=x11 section="Surf the Internet" title="Use More Connectivity Utilities" icon="internet_section.png" order="Remote Access,Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,_separator,,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="/" title="Enjoy Music and Video" icon="multimedia_section.png" order="_mergemenu_,Mandrakelinux-EnjoyMusicandVideo-kmix.desktop,Mandrakelinux-EnjoyMusicandVideo-kscd.desktop,Mandrakelinux-EnjoyMusicandVideo-amarok.desktop,Mandrakelinux-EnjoyMusicandVideo-kaudiocreator.desktop,Mandrakelinux-EnjoyMusicandVideo-Record Sounds.desktop,Mandrakelinux-EnjoyMusicandVideo-Mix Music.desktop,Mandrakelinux-EnjoyMusicandVideo-rosegarden.desktop,Mandrakelinux-EnjoyMusicandVideo-kaffeine.desktop,Mandrakelinux-EnjoyMusicandVideo-kdenlive.desktop,Mandrakelinux-EnjoyMusicandVideo-kdetv.desktop,_mergefile_,Discover More Entertainment Options,_separator_,Other"
+?package(menu): needs=x11 section="Enjoy Music and Video" title="Discover More Entertainment Options" icon="multimedia_section.png" order="Sound,Video,Graphics,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Sound" icon="sound_section.png"  
 ?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Video" icon="video_section.png" 
-?package(menu): needs=x11 section="/" title="View, Modify and Create Graphics" icon="graphics_section.png"
+?package(menu): needs=x11 section="/" title="View, Modify and Create Graphics" icon="graphics_section.png" order="_mergemenu_,Mandrakelinux-View,ModifyandCreateGraphics-kuickshow.desktop,Mandrakelinux-View,ModifyandCreateGraphics-Edit Images and Photos.desktop,Mandrakelinux-View,ModifyandCreateGraphics-kooka.desktop,Mandrakelinux-View,ModifyandCreateGraphics-digikam.desktop,Mandrakelinux-View,ModifyandCreateGraphics-ksnapshot.desktop,_mergefile_,Use More Image Editing Tools,_separator_,Other"
 ?package(menu): needs=x11 section="View, Modify and Create Graphics" title="Use More Image Editing Tools" icon="graphics_section.png"
-?package(menu): needs=x11 section="/" title="Play Games" icon="amusement_section.png"
-?package(menu): needs=x11 section="Play Games" title="Play More Games" icon="amusement_section.png" order="Adventure,Arcade,Boards,Cards,Puzzles,Sports,Strategy,Toys"
-?package(menu): needs=x11 section="/" title="Administer Your System" icon="configuration_section.png"
-?package(menu): needs=x11 section="Administer Your System" title="Use More Administration Tools" icon="system_section.png" order="Terminals,Text Tools,Configuration,Archiving,File Tools,Monitoring,Session"
+?package(menu): needs=x11 section="/" title="Play Games" icon="amusement_section.png" order="_mergemenu_,Mandrakelinux-PlayGames-Frozen-Bubble.desktop,Mandrakelinux-PlayGames-ArmageTron.desktop,Mandrakelinux-PlayGames-Cannon Smash.desktop,Mandrakelinux-PlayGames-Chromium.desktop,Mandrakelinux-PlayGames-LBreakout 2.desktop,Tuxracer.desktop,Mandrakelinux-PlayGames-Crack Attack! - Solo.desktop,_mergefile_,Play More Games,_separator_,Other"
+?package(menu): needs=x11 section="Play Games" title="Play More Games" icon="amusement_section.png" order="Adventure,Arcade,Boards,Cards,Puzzles,Sports,Strategy,Toys,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="/" title="Administer Your System" icon="configuration_section.png" order="_mergemenu_,Mandrakelinux-AdministerYourSystem-KControl.desktop,Mandrakelinux-AdministerYourSystem-Configure Your Computer.desktop,Mandrakelinux-AdministerYourSystem-kdepasswd.desktop,Mandrakelinux-AdministerYourSystem-k3b.desktop,Mandrakelinux-AdministerYourSystem-Backup Your Data.desktop,Mandrakelinux-AdministerYourSystem-ark.desktop,Mandrakelinux-AdministerYourSystem-KFloppy.desktop,Mandrakelinux-AdministerYourSystem-konsole.desktop,_mergefile_,Use More Administration Tools,_separator_,Other"
+?package(menu): needs=x11 section="Administer Your System" title="Use More Administration Tools" icon="system_section.png" order="Terminals,Text Tools,Configuration,Archiving,File Tools,Monitoring,Session,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="Administer Your System/Use More Administration Tools" title="Accessibility" icon="accessibility_section.png" 
 ?package(menu): needs=x11 section="Administer Your System/Use More Administration Tools" title="Communications" icon="communications_section.png"
 ?package(menu): needs=x11 section="/" title="Read Documentation" icon="documentation_section.png"
 ?package(menu): needs=x11 section="Read Documentation" title="Read More Documentation" icon="documentation_section.png"
 ?package(menu): needs=x11 section="/" title="Develop" icon="development_section.png"
 ?package(menu): needs=x11 section="/" title="Use Education Software" icon="education_section.png"
-?package(menu): needs=x11 section="Use Education Software" title="Use More Education Software" icon="education_section.png" order="Economy,Geography,History,Languages,Literature,Sciences,Sports,Other"
+?package(menu): needs=x11 section="Use Education Software" title="Use More Education Software" icon="education_section.png" order="Economy,Geography,History,Languages,Literature,Sciences,Sports,Other,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="/" title="Use Scientific Software" icon="sciences_section.png"
-?package(menu): needs=x11 section="Use Scientific Software" title="Use More Sciences Software" icon="sciences_section.png" order="Artificial Intelligence,Astronomy,Biology,Chemistry,Computer Science,Data Visualization,Electricity,Geosciences,Image Processing,Mathematics,Numeric analysis,Parallel Computing,Physics,Robotics,Other"
+?package(menu): needs=x11 section="Use Scientific Software" title="Use More Sciences Software" icon="sciences_section.png" order="Artificial Intelligence,Astronomy,Biology,Chemistry,Computer Science,Data Visualization,Electricity,Geosciences,Image Processing,Mathematics,Numeric analysis,Parallel Computing,Physics,Robotics,Other,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="/" title="Use Emulators" icon="emulators_section.png"
-?package(menu): needs=x11 section="/" title="Use More Applications" icon="more_applications_other_section.png" order="Accessibility,Development,Editors,Emulators,Finances,Databases,Education,Sciences,Communications,Games,Documentation,Other"
-?package(menu): needs=x11 section="Develop" title="Use More Development Software" icon="development_section.png" order="Development Environment,Interpreter,Tools,Code Generators"
+?package(menu): needs=x11 section="/" title="Use More Applications" icon="more_applications_other_section.png" order="Accessibility,Development,Editors,Emulators,Finances,Databases,Education,Sciences,Communications,Games,Documentation,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Develop" title="Use More Development Software" icon="development_section.png" order="Development Environment,Interpreter,Tools,Code Generators,_mergemenu_,_mergefile_"