diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu trinity-tdelibs-3.5.13.2/kded/applications.menu --- trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu 2013-07-28 15:03:29.861478619 +0200 +++ trinity-tdelibs-3.5.13.2/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100 @@ -1,472 +0,0 @@ - - - - Applications - kde-main.directory - - - - - - - - - More - - - - Applications - - - - - Applications - kde-unknown.directory - - - - - - Core - KDE - - - X-SuSE-YaST - - - - - Development - kde-development.directory - - X-KDE-KDevelopIDE - kde-development-kdevelop.directory - - - Development - X-KDE-KDevelopIDE - - - - - Translation - kde-development-translation.directory - - - Development - Translation - - - - - Web Development - kde-development-webdevelopment.directory - - - Development - WebDevelopment - - - - - - Development - X-KDE-KDevelopIDE - Translation - WebDevelopment - - - - - Science - kde-science.directory - - - - Astronomy - Biology - Chemistry - Geology - MedicalSoftware - Physics - Math - Science - - Education - - - - - Edutainment - kde-edutainment.directory - - Languages - kde-edu-languages.directory - - - Education - - Languages - X-KDE-Edu-Language - - - - - - Mathematics - kde-edu-mathematics.directory - - - Education - Math - - - - - Miscellaneous - kde-edu-miscellaneous.directory - - - Education - - Languages - X-KDE-Edu-Language - Math - Science - Teaching - X-KDE-Edu-Teaching - - - - - - Science - kde-edu-science.directory - - - Education - Science - - - - - Tools - kde-edu-tools.directory - - - Education - - Teaching - X-KDE-Edu-Teaching - - - - - - - Games - kde-games.directory - - Arcade - kde-games-arcade.directory - - - Game - ArcadeGame - - - - - Board - kde-games-board.directory - - - Game - BoardGame - - - - - Card - kde-games-card.directory - - - Game - CardGame - - - - - Kidsgames - kde-games-kids.directory - - - Game - - X-KDE-KidsGame - KidsGame - - - - - - TacticStrategy - kde-games-strategy.directory - - - Game - StrategyGame - - - - - - Game - - ArcadeGame - BoardGame - CardGame - X-KDE-KidsGame - KidsGame - StrategyGame - - - - - - Graphics - kde-graphics.directory - - - Graphics - X-KDE-More - ooo-draw.desktop - - - - More - kde-more.directory - - - Graphics - X-KDE-More - - - - - - Internet - kde-internet.directory - - - Network - X-KDE-More - - - - Terminal - kde-internet-terminal.directory - - - More - kde-more.directory - - - Network - X-KDE-More - - - - - - Multimedia - kde-multimedia.directory - - - AudioVideo - X-KDE-More - - - - More - kde-more.directory - - - AudioVideo - X-KDE-More - - - - - - Office - kde-office.directory - - - - - More - - - - Office - X-KDE-More - - ooo-draw.desktop - - - More - kde-more.directory - - - Office - X-KDE-More - - - - - - Settingsmenu - kde-settingsmenu.directory - - Settings - - - - System - kde-system.directory - - - System - X-KDE-More - - - - SuperUser - kde-system-su.directory - - - X-KDE-System-su - X-KDE-More - - - - - More - kde-more.directory - - - System - X-KDE-More - - - - - ScreenSavers - kde-system-screensavers.directory - - - Terminal - kde-system-terminal.directory - - - - Utilities - kde-utilities.directory - - - Utility - Accessibility - X-KDE-Utilities-Desktop - X-KDE-Utilities-Peripherals - X-KDE-Utilities-PIM - X-KDE-More - - - - Accessibility - kde-utilities-accessibility.directory - - - Utility - Accessibility - - - - - Desktop - kde-utilities-desktop.directory - - - Utility - X-KDE-Utilities-Desktop - - - - - Editors - kde-editors.directory - - TextEditor - - - - PIM - kde-utilities-pim.directory - - - Utility - X-KDE-Utilities-PIM - - - - - Toys - kde-toys.directory - - Amusement - - - - XUtilities - kde-utilities-xutils.directory - - - More - kde-more.directory - - - Utility - X-KDE-More - - - - - More - kde-more.directory - - - Utility - X-KDE-More - - - - - - - KDE - Core - - - - - - Debian - debian.directory - debian-menu.menu - - - applications-merged - applications-kmenuedit.menu - diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt --- trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt 2013-07-28 15:03:29.861478619 +0200 +++ trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt 2013-07-28 15:03:45.806126508 +0200 @@ -35,7 +35,7 @@ ##### other data ################################ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} ) +install( FILES tde-applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} ) install( FILES kded.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp --- trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp 2013-07-28 15:03:29.861478619 +0200 +++ trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp 2013-07-28 15:04:11.314563211 +0200 @@ -379,7 +379,7 @@ connect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)), this, TQT_SLOT(slotCreateEntry(const TQString &, KService **))); - VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); + VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("tde-applications.menu", true); KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); entry->setLayoutInfo(kdeMenu->layoutList); diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu trinity-tdelibs-3.5.13.2/kded/tde-applications.menu --- trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu 1970-01-01 01:00:00.000000000 +0100 +++ trinity-tdelibs-3.5.13.2/kded/tde-applications.menu 2013-06-07 19:23:04.000000000 +0200 @@ -0,0 +1,472 @@ + + + + Applications + tde-main.directory + + + + + + + + + More + + + + Applications + + + + + Applications + tde-unknown.directory + + + + + + Core + KDE + + + X-SuSE-YaST + + + + + Development + tde-development.directory + + X-KDE-KDevelopIDE + tde-development-kdevelop.directory + + + Development + X-KDE-KDevelopIDE + + + + + Translation + tde-development-translation.directory + + + Development + Translation + + + + + Web Development + tde-development-webdevelopment.directory + + + Development + WebDevelopment + + + + + + Development + X-KDE-KDevelopIDE + Translation + WebDevelopment + + + + + Science + tde-science.directory + + + + Astronomy + Biology + Chemistry + Geology + MedicalSoftware + Physics + Math + Science + + Education + + + + + Edutainment + tde-edutainment.directory + + Languages + tde-edu-languages.directory + + + Education + + Languages + X-KDE-Edu-Language + + + + + + Mathematics + tde-edu-mathematics.directory + + + Education + Math + + + + + Miscellaneous + tde-edu-miscellaneous.directory + + + Education + + Languages + X-KDE-Edu-Language + Math + Science + Teaching + X-KDE-Edu-Teaching + + + + + + Science + tde-edu-science.directory + + + Education + Science + + + + + Tools + tde-edu-tools.directory + + + Education + + Teaching + X-KDE-Edu-Teaching + + + + + + + Games + tde-games.directory + + Arcade + tde-games-arcade.directory + + + Game + ArcadeGame + + + + + Board + tde-games-board.directory + + + Game + BoardGame + + + + + Card + tde-games-card.directory + + + Game + CardGame + + + + + Kidsgames + tde-games-kids.directory + + + Game + + X-KDE-KidsGame + KidsGame + + + + + + TacticStrategy + tde-games-strategy.directory + + + Game + StrategyGame + + + + + + Game + + ArcadeGame + BoardGame + CardGame + X-KDE-KidsGame + KidsGame + StrategyGame + + + + + + Graphics + tde-graphics.directory + + + Graphics + X-KDE-More + ooo-draw.desktop + + + + More + tde-more.directory + + + Graphics + X-KDE-More + + + + + + Internet + tde-internet.directory + + + Network + X-KDE-More + + + + Terminal + tde-internet-terminal.directory + + + More + tde-more.directory + + + Network + X-KDE-More + + + + + + Multimedia + tde-multimedia.directory + + + AudioVideo + X-KDE-More + + + + More + tde-more.directory + + + AudioVideo + X-KDE-More + + + + + + Office + tde-office.directory + + + + + More + + + + Office + X-KDE-More + + ooo-draw.desktop + + + More + tde-more.directory + + + Office + X-KDE-More + + + + + + Settingsmenu + tde-settingsmenu.directory + + Settings + + + + System + tde-system.directory + + + System + X-KDE-More + + + + SuperUser + tde-system-su.directory + + + X-KDE-System-su + X-KDE-More + + + + + More + tde-more.directory + + + System + X-KDE-More + + + + + ScreenSavers + tde-system-screensavers.directory + + + Terminal + tde-system-terminal.directory + + + + Utilities + tde-utilities.directory + + + Utility + Accessibility + X-KDE-Utilities-Desktop + X-KDE-Utilities-Peripherals + X-KDE-Utilities-PIM + X-KDE-More + + + + Accessibility + tde-utilities-accessibility.directory + + + Utility + Accessibility + + + + + Desktop + tde-utilities-desktop.directory + + + Utility + X-KDE-Utilities-Desktop + + + + + Editors + tde-editors.directory + + TextEditor + + + + PIM + tde-utilities-pim.directory + + + Utility + X-KDE-Utilities-PIM + + + + + Toys + tde-toys.directory + + Amusement + + + + XUtilities + tde-utilities-xutils.directory + + + More + tde-more.directory + + + Utility + X-KDE-More + + + + + More + tde-more.directory + + + Utility + X-KDE-More + + + + + + + KDE + Core + + + + + + Debian + debian.directory + debian-menu.menu + + + applications-merged + applications-kmenuedit.menu +