From 86dd28fd7a021d04d58094d7a58621119ac44a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 1 Aug 2013 14:30:27 +0200 Subject: RPM Packaging: update kcmautostart --- .../kcmautostart/kcmautostart-14.0.0.spec | 14 +- redhat/tdelibs/tdelibs-14.0.0-fix_xdg_menu.patch | 2990 -------------------- 2 files changed, 8 insertions(+), 2996 deletions(-) delete mode 100644 redhat/tdelibs/tdelibs-14.0.0-fix_xdg_menu.patch (limited to 'redhat') diff --git a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec index 9406f761b..8ceeb8b59 100644 --- a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec +++ b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec @@ -41,9 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -# [kcmautostart] kcmautostart crash on exit -Patch3: kcmautostart-3.5.13-fix_crash_on_exit.patch - BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -63,7 +60,6 @@ Requires: trinity-kdebase %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch3 -p1 -b .crash_on_exit %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -82,8 +78,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --disable-static + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --disable-rpath %__make %{?_smp_mflags} @@ -95,6 +96,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang autostart + %clean %__rm -rf %{buildroot} diff --git a/redhat/tdelibs/tdelibs-14.0.0-fix_xdg_menu.patch b/redhat/tdelibs/tdelibs-14.0.0-fix_xdg_menu.patch deleted file mode 100644 index c2aa5d5d4..000000000 --- a/redhat/tdelibs/tdelibs-14.0.0-fix_xdg_menu.patch +++ /dev/null @@ -1,2990 +0,0 @@ -diff -Nuar trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/applications.menu trinity-tdelibs-14.0.0~pre599+bae79307/kded/applications.menu ---- trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/applications.menu 2013-07-18 19:06:05.024534339 +0200 -+++ trinity-tdelibs-14.0.0~pre599+bae79307/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100 -@@ -1,907 +0,0 @@ -- -- -- -- Applications -- tde-main.directory -- -- -- -- -- -- -- -- -- More -- -- -- -- Applications -- -- -- -- -- Applications -- tde-unknown.directory -- -- -- -- -- -- Core -- TDE -- -- -- X-SuSE-YaST -- -- -- -- -- Development -- tde-development.directory -- -- X-TDE-TDevelopIDE -- tde-development-tdevelop.directory -- -- -- Development -- X-TDE-TDevelopIDE -- KDE -- -- -- -- -- Translation -- tde-development-translation.directory -- -- -- Development -- Translation -- KDE -- -- -- -- -- Web Development -- tde-development-webdevelopment.directory -- -- -- Development -- WebDevelopment -- KDE -- -- -- -- -- -- Development -- X-TDE-TDevelopIDE -- Translation -- WebDevelopment -- KDE -- -- -- -- KDE -- kde-development.directory -- -- -- Development -- KDE -- Translation -- WebDevelopment -- TDE -- -- -- -- Translation -- kde-development-translation.directory -- -- -- Development -- Translation -- KDE -- TDE -- -- -- -- -- Web Development -- kde-development-webdevelopment.directory -- -- -- Development -- WebDevelopment -- KDE -- TDE -- -- -- -- -- -- -- Science -- tde-science.directory -- -- -- -- Astronomy -- Biology -- Chemistry -- Geology -- MedicalSoftware -- Physics -- Math -- Science -- -- Education -- KDE -- -- -- -- -- Edutainment -- tde-edutainment.directory -- -- Languages -- tde-edu-languages.directory -- -- -- Education -- -- Languages -- X-TDE-Edu-Language -- -- KDE -- -- -- -- -- Mathematics -- tde-edu-mathematics.directory -- -- -- Education -- Math -- KDE -- -- -- -- -- Miscellaneous -- tde-edu-miscellaneous.directory -- -- -- Education -- -- Languages -- X-TDE-Edu-Language -- Math -- Science -- Teaching -- X-TDE-Edu-Teaching -- KDE -- -- -- -- -- -- Science -- tde-edu-science.directory -- -- -- Education -- Science -- KDE -- -- -- -- -- Tools -- tde-edu-tools.directory -- -- -- Education -- -- Teaching -- X-TDE-Edu-Teaching -- -- KDE -- -- -- -- -- KDE -- kde-edutainment.directory -- -- -- Education -- KDE -- -- Education -- Languages -- X-TDE-Edu-Language -- X-KDE-Edu-Language -- Math -- Science -- Teaching -- X-TDE-Edu-Teaching -- X-KDE-Edu-Teaching -- TDE -- -- -- -- -- Languages -- kde-edu-languages.directory -- -- -- Languages -- KDE -- TDE -- -- -- -- -- Mathematics -- kde-edu-mathematics.directory -- -- -- Math -- KDE -- TDE -- -- -- -- -- Miscellaneous -- kde-edu-miscellaneous.directory -- -- -- Education -- KDE -- -- Languages -- X-TDE-Edu-Language -- X-KDE-Edu-Language -- Math -- Science -- Teaching -- X-TDE-Edu-Teaching -- X-KDE-Edu-Teaching -- TDE -- -- -- -- -- -- Science -- kde-edu-science.directory -- -- -- Science -- KDE -- TDE -- -- -- -- -- Tools -- kde-edu-tools.directory -- -- -- Teaching -- KDE -- TDE -- -- -- -- -- -- -- Games -- tde-games.directory -- -- Arcade -- tde-games-arcade.directory -- -- -- Game -- ArcadeGame -- KDE -- -- -- -- -- Board -- tde-games-board.directory -- -- -- Game -- BoardGame -- KDE -- -- -- -- -- Card -- tde-games-card.directory -- -- -- Game -- CardGame -- KDE -- -- -- -- -- Kidsgames -- tde-games-kids.directory -- -- -- Game -- -- X-TDE-KidsGame -- KidsGame -- -- KDE -- -- -- -- -- TacticStrategy -- tde-games-strategy.directory -- -- -- Game -- StrategyGame -- KDE -- -- -- -- -- -- Game -- -- ArcadeGame -- BoardGame -- CardGame -- X-TDE-KidsGame -- KidsGame -- StrategyGame -- KDE -- -- -- -- -- KDE -- kde-games.directory -- -- Arcade -- kde-games-arcade.directory -- -- -- Game -- ArcadeGame -- KDE -- TDE -- -- -- -- -- Board -- kde-games-board.directory -- -- -- Game -- BoardGame -- KDE -- TDE -- -- -- -- -- Card -- kde-games-card.directory -- -- -- Game -- CardGame -- KDE -- TDE -- -- -- -- -- Kidsgames -- kde-games-kids.directory -- -- -- Game -- KidsGame -- KDE -- TDE -- -- -- -- -- TacticStrategy -- kde-games-strategy.directory -- -- -- Game -- StrategyGame -- KDE -- TDE -- -- -- -- -- -- Game -- KDE -- -- ArcadeGame -- BoardGame -- CardGame -- X-TDE-KidsGame -- KidsGame -- StrategyGame -- TDE -- -- -- -- -- -- -- Graphics -- tde-graphics.directory -- -- -- Graphics -- X-TDE-More -- X-KDE-More -- KDE -- ooo-draw.desktop -- -- -- -- KDE -- kde-graphics.directory -- -- -- Graphics -- KDE -- -- -- -- -- More -- tde-more.directory -- -- -- Graphics -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- -- Internet -- tde-internet.directory -- -- -- Network -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- Terminal -- tde-internet-terminal.directory -- -- -- More -- tde-more.directory -- -- -- Network -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- KDE -- kde-internet.directory -- -- -- Network -- KDE -- -- -- -- -- -- Multimedia -- tde-multimedia.directory -- -- -- AudioVideo -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- More -- tde-more.directory -- -- -- AudioVideo -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- KDE -- kde-multimedia.directory -- -- -- AudioVideo -- KDE -- -- -- -- -- -- Office -- tde-office.directory -- -- -- -- -- More -- -- -- -- Office -- X-TDE-Office-PIM -- X-TDE-More -- X-KDE-More -- KDE -- -- ooo-draw.desktop -- -- -- Personal Information Management -- tde-office-pim.directory -- -- -- X-TDE-Office-PIM -- -- -- -- -- More -- tde-more.directory -- -- -- Office -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- KDE -- kde-office.directory -- -- -- Office -- KDE -- -- -- -- -- -- Settingsmenu -- tde-settingsmenu.directory -- -- -- Settings -- KDE -- X-KDE-settings-sound -- -- -- -- KDE -- kde-settingsmenu.directory -- -- -- Settings -- KDE -- -- -- -- -- -- System -- tde-system.directory -- -- -- System -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- SuperUser -- tde-system-su.directory -- -- -- X-TDE-System-su -- X-TDE-More -- X-KDE-More -- X-KDE-System-su -- KDE -- -- -- -- -- More -- tde-more.directory -- -- -- System -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- KDE -- kde-system.directory -- -- -- System -- KDE -- -- -- -- -- ScreenSavers -- tde-system-screensavers.directory -- -- -- Terminal -- tde-system-terminal.directory -- -- -- -- Utilities -- tde-utilities.directory -- -- -- Utility -- -- Accessibility -- X-TDE-Utilities-Desktop -- X-TDE-Utilities-File -- X-TDE-Utilities-Peripherals -- X-TDE-Utilities-PIM -- TextEditor -- X-TDE-More -- KDE -- -- -- -- -- Accessibility -- tde-utilities-accessibility.directory -- -- -- Utility -- Accessibility -- KDE -- -- -- -- -- Desktop -- tde-utilities-desktop.directory -- -- -- Utility -- X-TDE-Utilities-Desktop -- KDE -- -- -- -- -- Editors -- tde-editors.directory -- -- -- TextEditor -- KDE -- -- -- -- -- File -- tde-utilities-file.directory -- -- -- Utility -- X-TDE-Utilities-File -- -- -- -- -- Peripherals -- tde-utilities-peripherals.directory -- -- -- Utility -- X-TDE-Utilities-Peripherals -- -- -- -- -- Personal Information Management -- tde-utilities-pim.directory -- -- -- Utility -- X-TDE-Utilities-PIM -- KDE -- X-KDE-Utilities-PIM -- -- -- -- -- Toys -- tde-toys.directory -- -- -- Amusement -- KDE -- -- -- -- -- XUtilities -- tde-utilities-xutils.directory -- -- -- More -- tde-more.directory -- -- -- Utility -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- More -- tde-more.directory -- -- -- Utility -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- KDE -- kde-utilities.directory -- -- -- Utility -- KDE -- -- Accessibility -- X-TDE-Utilities-Desktop -- X-KDE-Utilities-Desktop -- X-TDE-Utilities-Peripherals -- X-TDE-Utilities-PIM -- X-KDE-Utilities-PIM -- X-TDE-More -- X-KDE-More -- TextEditor -- TDE -- -- -- -- -- Accessibility -- kde-utilities-accessibility.directory -- -- -- Utility -- Accessibility -- KDE -- TDE -- -- -- -- -- Desktop -- kde-utilities-desktop.directory -- -- -- Utility -- X-KDE-Utilities-Desktop -- KDE -- TDE -- -- -- -- -- Editors -- kde-editors.directory -- -- -- TextEditor -- KDE -- TDE -- -- -- -- -- Personal Information Management -- kde-utilities-pim.directory -- -- -- Utility -- X-KDE-Utilities-PIM -- KDE -- TDE -- -- -- -- -- Toys -- kde-toys.directory -- -- -- Amusement -- KDE -- TDE -- -- -- -- -- -- -- -- TDE -- Core -- -- -- -- -- -- Debian -- debian.directory -- debian-menu.menu -- -- -- applications-merged -- applications-kmenuedit.menu -- -diff -Nuar trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/applications.menu-no-kde trinity-tdelibs-14.0.0~pre599+bae79307/kded/applications.menu-no-kde ---- trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/applications.menu-no-kde 2013-07-18 19:06:05.025534334 +0200 -+++ trinity-tdelibs-14.0.0~pre599+bae79307/kded/applications.menu-no-kde 1970-01-01 01:00:00.000000000 +0100 -@@ -1,568 +0,0 @@ -- -- -- -- Applications -- tde-main.directory -- -- -- -- -- -- -- -- -- More -- -- -- -- Applications -- -- -- -- -- Applications -- tde-unknown.directory -- -- -- -- -- -- Core -- TDE -- -- -- X-SuSE-YaST -- -- KDE -- -- -- -- -- Development -- tde-development.directory -- -- X-TDE-TDevelopIDE -- tde-development-tdevelop.directory -- -- -- Development -- X-TDE-TDevelopIDE -- KDE -- X-KDE-KDevelopIDE -- -- -- -- -- Translation -- tde-development-translation.directory -- -- -- Development -- Translation -- KDE -- -- -- -- -- Web Development -- tde-development-webdevelopment.directory -- -- -- Development -- WebDevelopment -- KDE -- -- -- -- -- -- Development -- X-TDE-TDevelopIDE -- Translation -- WebDevelopment -- KDE -- -- -- -- -- Science -- tde-science.directory -- -- -- -- Astronomy -- Biology -- Chemistry -- Geology -- MedicalSoftware -- Physics -- Math -- Science -- -- Education -- KDE -- -- -- -- -- Edutainment -- tde-edutainment.directory -- -- Languages -- tde-edu-languages.directory -- -- -- Education -- -- Languages -- X-TDE-Edu-Language -- -- KDE -- -- -- -- -- Mathematics -- tde-edu-mathematics.directory -- -- -- Education -- Math -- KDE -- -- -- -- -- Miscellaneous -- tde-edu-miscellaneous.directory -- -- -- Education -- -- Languages -- X-TDE-Edu-Language -- Math -- Science -- Teaching -- X-TDE-Edu-Teaching -- KDE -- -- -- -- -- -- Science -- tde-edu-science.directory -- -- -- Education -- Science -- KDE -- -- -- -- -- Tools -- tde-edu-tools.directory -- -- -- Education -- -- Teaching -- X-TDE-Edu-Teaching -- -- KDE -- -- -- -- -- -- Games -- tde-games.directory -- -- Arcade -- tde-games-arcade.directory -- -- -- Game -- ArcadeGame -- KDE -- -- -- -- -- Board -- tde-games-board.directory -- -- -- Game -- BoardGame -- KDE -- -- -- -- -- Card -- tde-games-card.directory -- -- -- Game -- CardGame -- KDE -- -- -- -- -- Kidsgames -- tde-games-kids.directory -- -- -- Game -- -- X-TDE-KidsGame -- KidsGame -- -- KDE -- -- -- -- -- TacticStrategy -- tde-games-strategy.directory -- -- -- Game -- StrategyGame -- KDE -- -- -- -- -- -- Game -- -- ArcadeGame -- BoardGame -- CardGame -- X-TDE-KidsGame -- KidsGame -- StrategyGame -- KDE -- -- -- -- -- -- Graphics -- tde-graphics.directory -- -- -- Graphics -- X-TDE-More -- X-KDE-More -- KDE -- ooo-draw.desktop -- -- -- -- More -- tde-more.directory -- -- -- Graphics -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- -- Internet -- tde-internet.directory -- -- -- Network -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- Terminal -- tde-internet-terminal.directory -- -- -- More -- tde-more.directory -- -- -- Network -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- -- Multimedia -- tde-multimedia.directory -- -- -- AudioVideo -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- More -- tde-more.directory -- -- -- AudioVideo -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- -- Office -- tde-office.directory -- -- -- -- -- More -- -- -- -- Office -- X-TDE-Office-PIM -- X-TDE-More -- X-KDE-More -- KDE -- -- ooo-draw.desktop -- -- -- Personal Information Management -- tde-office-pim.directory -- -- -- X-TDE-Office-PIM -- -- -- -- -- More -- tde-more.directory -- -- -- Office -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- -- Settingsmenu -- tde-settingsmenu.directory -- -- -- Settings -- KDE -- X-KDE-settings-sound -- -- -- -- -- System -- tde-system.directory -- -- -- System -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- SuperUser -- tde-system-su.directory -- -- -- X-TDE-System-su -- X-TDE-More -- X-KDE-More -- X-KDE-System-su -- KDE -- -- -- -- -- More -- tde-more.directory -- -- -- System -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- ScreenSavers -- tde-system-screensavers.directory -- -- -- Terminal -- tde-system-terminal.directory -- -- -- -- Utilities -- tde-utilities.directory -- -- -- Utility -- Accessibility -- X-TDE-Utilities-Desktop -- X-TDE-Utilities-File -- X-TDE-Utilities-Peripherals -- X-TDE-Utilities-PIM -- X-TDE-More -- X-KDE-Utilities-Desktop -- X-KDE-Utilities-Peripherals -- X-KDE-Utilities-PIM -- X-KDE-More -- KDE -- -- -- -- Accessibility -- tde-utilities-accessibility.directory -- -- -- Utility -- Accessibility -- KDE -- -- -- -- -- Desktop -- tde-utilities-desktop.directory -- -- -- Utility -- X-TDE-Utilities-Desktop -- KDE -- -- -- -- -- Editors -- tde-editors.directory -- -- -- TextEditor -- KDE -- -- -- -- -- File -- tde-utilities-file.directory -- -- -- Utility -- X-TDE-Utilities-File -- -- -- -- -- Peripherals -- tde-utilities-peripherals.directory -- -- -- Utility -- X-TDE-Utilities-Peripherals -- -- -- -- -- Personal Information Management -- tde-utilities-pim.directory -- -- -- Utility -- X-TDE-Utilities-PIM -- KDE -- X-KDE-Utilities-PIM -- -- -- -- -- Toys -- tde-toys.directory -- -- -- Amusement -- KDE -- -- -- -- -- XUtilities -- tde-utilities-xutils.directory -- -- -- More -- tde-more.directory -- -- -- Utility -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- More -- tde-more.directory -- -- -- Utility -- X-TDE-More -- X-KDE-More -- KDE -- -- -- -- -- -- -- TDE -- Core -- -- -- -- -- -- Debian -- debian.directory -- debian-menu.menu -- -- -- applications-merged -- applications-kmenuedit.menu -- -diff -Nuar trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/CMakeLists.txt trinity-tdelibs-14.0.0~pre599+bae79307/kded/CMakeLists.txt ---- trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/CMakeLists.txt 2013-07-18 19:06:05.024534339 +0200 -+++ trinity-tdelibs-14.0.0~pre599+bae79307/kded/CMakeLists.txt 2013-07-18 19:06:30.827397914 +0200 -@@ -35,7 +35,7 @@ - ##### other data ################################ - - install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) --install( FILES applications.menu applications.menu-no-kde DESTINATION ${XDG_MENU_INSTALL_DIR} ) -+install( FILES tde-applications.menu tde-applications.menu-no-kde DESTINATION ${XDG_MENU_INSTALL_DIR} ) - install( FILES kded.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) - - -diff -Nuar trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/tde-applications.menu trinity-tdelibs-14.0.0~pre599+bae79307/kded/tde-applications.menu ---- trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/tde-applications.menu 1970-01-01 01:00:00.000000000 +0100 -+++ trinity-tdelibs-14.0.0~pre599+bae79307/kded/tde-applications.menu 2013-07-16 15:59:41.000000000 +0200 -@@ -0,0 +1,907 @@ -+ -+ -+ -+ Applications -+ tde-main.directory -+ -+ -+ -+ -+ -+ -+ -+ -+ More -+ -+ -+ -+ Applications -+ -+ -+ -+ -+ Applications -+ tde-unknown.directory -+ -+ -+ -+ -+ -+ Core -+ TDE -+ -+ -+ X-SuSE-YaST -+ -+ -+ -+ -+ Development -+ tde-development.directory -+ -+ X-TDE-TDevelopIDE -+ tde-development-tdevelop.directory -+ -+ -+ Development -+ X-TDE-TDevelopIDE -+ KDE -+ -+ -+ -+ -+ Translation -+ tde-development-translation.directory -+ -+ -+ Development -+ Translation -+ KDE -+ -+ -+ -+ -+ Web Development -+ tde-development-webdevelopment.directory -+ -+ -+ Development -+ WebDevelopment -+ KDE -+ -+ -+ -+ -+ -+ Development -+ X-TDE-TDevelopIDE -+ Translation -+ WebDevelopment -+ KDE -+ -+ -+ -+ KDE -+ kde-development.directory -+ -+ -+ Development -+ KDE -+ Translation -+ WebDevelopment -+ TDE -+ -+ -+ -+ Translation -+ kde-development-translation.directory -+ -+ -+ Development -+ Translation -+ KDE -+ TDE -+ -+ -+ -+ -+ Web Development -+ kde-development-webdevelopment.directory -+ -+ -+ Development -+ WebDevelopment -+ KDE -+ TDE -+ -+ -+ -+ -+ -+ -+ Science -+ tde-science.directory -+ -+ -+ -+ Astronomy -+ Biology -+ Chemistry -+ Geology -+ MedicalSoftware -+ Physics -+ Math -+ Science -+ -+ Education -+ KDE -+ -+ -+ -+ -+ Edutainment -+ tde-edutainment.directory -+ -+ Languages -+ tde-edu-languages.directory -+ -+ -+ Education -+ -+ Languages -+ X-TDE-Edu-Language -+ -+ KDE -+ -+ -+ -+ -+ Mathematics -+ tde-edu-mathematics.directory -+ -+ -+ Education -+ Math -+ KDE -+ -+ -+ -+ -+ Miscellaneous -+ tde-edu-miscellaneous.directory -+ -+ -+ Education -+ -+ Languages -+ X-TDE-Edu-Language -+ Math -+ Science -+ Teaching -+ X-TDE-Edu-Teaching -+ KDE -+ -+ -+ -+ -+ -+ Science -+ tde-edu-science.directory -+ -+ -+ Education -+ Science -+ KDE -+ -+ -+ -+ -+ Tools -+ tde-edu-tools.directory -+ -+ -+ Education -+ -+ Teaching -+ X-TDE-Edu-Teaching -+ -+ KDE -+ -+ -+ -+ -+ KDE -+ kde-edutainment.directory -+ -+ -+ Education -+ KDE -+ -+ Education -+ Languages -+ X-TDE-Edu-Language -+ X-KDE-Edu-Language -+ Math -+ Science -+ Teaching -+ X-TDE-Edu-Teaching -+ X-KDE-Edu-Teaching -+ TDE -+ -+ -+ -+ -+ Languages -+ kde-edu-languages.directory -+ -+ -+ Languages -+ KDE -+ TDE -+ -+ -+ -+ -+ Mathematics -+ kde-edu-mathematics.directory -+ -+ -+ Math -+ KDE -+ TDE -+ -+ -+ -+ -+ Miscellaneous -+ kde-edu-miscellaneous.directory -+ -+ -+ Education -+ KDE -+ -+ Languages -+ X-TDE-Edu-Language -+ X-KDE-Edu-Language -+ Math -+ Science -+ Teaching -+ X-TDE-Edu-Teaching -+ X-KDE-Edu-Teaching -+ TDE -+ -+ -+ -+ -+ -+ Science -+ kde-edu-science.directory -+ -+ -+ Science -+ KDE -+ TDE -+ -+ -+ -+ -+ Tools -+ kde-edu-tools.directory -+ -+ -+ Teaching -+ KDE -+ TDE -+ -+ -+ -+ -+ -+ -+ Games -+ tde-games.directory -+ -+ Arcade -+ tde-games-arcade.directory -+ -+ -+ Game -+ ArcadeGame -+ KDE -+ -+ -+ -+ -+ Board -+ tde-games-board.directory -+ -+ -+ Game -+ BoardGame -+ KDE -+ -+ -+ -+ -+ Card -+ tde-games-card.directory -+ -+ -+ Game -+ CardGame -+ KDE -+ -+ -+ -+ -+ Kidsgames -+ tde-games-kids.directory -+ -+ -+ Game -+ -+ X-TDE-KidsGame -+ KidsGame -+ -+ KDE -+ -+ -+ -+ -+ TacticStrategy -+ tde-games-strategy.directory -+ -+ -+ Game -+ StrategyGame -+ KDE -+ -+ -+ -+ -+ -+ Game -+ -+ ArcadeGame -+ BoardGame -+ CardGame -+ X-TDE-KidsGame -+ KidsGame -+ StrategyGame -+ KDE -+ -+ -+ -+ -+ KDE -+ kde-games.directory -+ -+ Arcade -+ kde-games-arcade.directory -+ -+ -+ Game -+ ArcadeGame -+ KDE -+ TDE -+ -+ -+ -+ -+ Board -+ kde-games-board.directory -+ -+ -+ Game -+ BoardGame -+ KDE -+ TDE -+ -+ -+ -+ -+ Card -+ kde-games-card.directory -+ -+ -+ Game -+ CardGame -+ KDE -+ TDE -+ -+ -+ -+ -+ Kidsgames -+ kde-games-kids.directory -+ -+ -+ Game -+ KidsGame -+ KDE -+ TDE -+ -+ -+ -+ -+ TacticStrategy -+ kde-games-strategy.directory -+ -+ -+ Game -+ StrategyGame -+ KDE -+ TDE -+ -+ -+ -+ -+ -+ Game -+ KDE -+ -+ ArcadeGame -+ BoardGame -+ CardGame -+ X-TDE-KidsGame -+ KidsGame -+ StrategyGame -+ TDE -+ -+ -+ -+ -+ -+ -+ Graphics -+ tde-graphics.directory -+ -+ -+ Graphics -+ X-TDE-More -+ X-KDE-More -+ KDE -+ ooo-draw.desktop -+ -+ -+ -+ KDE -+ kde-graphics.directory -+ -+ -+ Graphics -+ KDE -+ -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Graphics -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ -+ Internet -+ tde-internet.directory -+ -+ -+ Network -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ Terminal -+ tde-internet-terminal.directory -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Network -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ KDE -+ kde-internet.directory -+ -+ -+ Network -+ KDE -+ -+ -+ -+ -+ -+ Multimedia -+ tde-multimedia.directory -+ -+ -+ AudioVideo -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ AudioVideo -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ KDE -+ kde-multimedia.directory -+ -+ -+ AudioVideo -+ KDE -+ -+ -+ -+ -+ -+ Office -+ tde-office.directory -+ -+ -+ -+ -+ More -+ -+ -+ -+ Office -+ X-TDE-Office-PIM -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ ooo-draw.desktop -+ -+ -+ Personal Information Management -+ tde-office-pim.directory -+ -+ -+ X-TDE-Office-PIM -+ -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Office -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ KDE -+ kde-office.directory -+ -+ -+ Office -+ KDE -+ -+ -+ -+ -+ -+ Settingsmenu -+ tde-settingsmenu.directory -+ -+ -+ Settings -+ KDE -+ X-KDE-settings-sound -+ -+ -+ -+ KDE -+ kde-settingsmenu.directory -+ -+ -+ Settings -+ KDE -+ -+ -+ -+ -+ -+ System -+ tde-system.directory -+ -+ -+ System -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ SuperUser -+ tde-system-su.directory -+ -+ -+ X-TDE-System-su -+ X-TDE-More -+ X-KDE-More -+ X-KDE-System-su -+ KDE -+ -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ System -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ KDE -+ kde-system.directory -+ -+ -+ System -+ KDE -+ -+ -+ -+ -+ ScreenSavers -+ tde-system-screensavers.directory -+ -+ -+ Terminal -+ tde-system-terminal.directory -+ -+ -+ -+ Utilities -+ tde-utilities.directory -+ -+ -+ Utility -+ -+ Accessibility -+ X-TDE-Utilities-Desktop -+ X-TDE-Utilities-File -+ X-TDE-Utilities-Peripherals -+ X-TDE-Utilities-PIM -+ TextEditor -+ X-TDE-More -+ KDE -+ -+ -+ -+ -+ Accessibility -+ tde-utilities-accessibility.directory -+ -+ -+ Utility -+ Accessibility -+ KDE -+ -+ -+ -+ -+ Desktop -+ tde-utilities-desktop.directory -+ -+ -+ Utility -+ X-TDE-Utilities-Desktop -+ KDE -+ -+ -+ -+ -+ Editors -+ tde-editors.directory -+ -+ -+ TextEditor -+ KDE -+ -+ -+ -+ -+ File -+ tde-utilities-file.directory -+ -+ -+ Utility -+ X-TDE-Utilities-File -+ -+ -+ -+ -+ Peripherals -+ tde-utilities-peripherals.directory -+ -+ -+ Utility -+ X-TDE-Utilities-Peripherals -+ -+ -+ -+ -+ Personal Information Management -+ tde-utilities-pim.directory -+ -+ -+ Utility -+ X-TDE-Utilities-PIM -+ KDE -+ X-KDE-Utilities-PIM -+ -+ -+ -+ -+ Toys -+ tde-toys.directory -+ -+ -+ Amusement -+ KDE -+ -+ -+ -+ -+ XUtilities -+ tde-utilities-xutils.directory -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Utility -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Utility -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ KDE -+ kde-utilities.directory -+ -+ -+ Utility -+ KDE -+ -+ Accessibility -+ X-TDE-Utilities-Desktop -+ X-KDE-Utilities-Desktop -+ X-TDE-Utilities-Peripherals -+ X-TDE-Utilities-PIM -+ X-KDE-Utilities-PIM -+ X-TDE-More -+ X-KDE-More -+ TextEditor -+ TDE -+ -+ -+ -+ -+ Accessibility -+ kde-utilities-accessibility.directory -+ -+ -+ Utility -+ Accessibility -+ KDE -+ TDE -+ -+ -+ -+ -+ Desktop -+ kde-utilities-desktop.directory -+ -+ -+ Utility -+ X-KDE-Utilities-Desktop -+ KDE -+ TDE -+ -+ -+ -+ -+ Editors -+ kde-editors.directory -+ -+ -+ TextEditor -+ KDE -+ TDE -+ -+ -+ -+ -+ Personal Information Management -+ kde-utilities-pim.directory -+ -+ -+ Utility -+ X-KDE-Utilities-PIM -+ KDE -+ TDE -+ -+ -+ -+ -+ Toys -+ kde-toys.directory -+ -+ -+ Amusement -+ KDE -+ TDE -+ -+ -+ -+ -+ -+ -+ -+ TDE -+ Core -+ -+ -+ -+ -+ -+ Debian -+ debian.directory -+ debian-menu.menu -+ -+ -+ applications-merged -+ applications-kmenuedit.menu -+ -diff -Nuar trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/tde-applications.menu-no-kde trinity-tdelibs-14.0.0~pre599+bae79307/kded/tde-applications.menu-no-kde ---- trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/tde-applications.menu-no-kde 1970-01-01 01:00:00.000000000 +0100 -+++ trinity-tdelibs-14.0.0~pre599+bae79307/kded/tde-applications.menu-no-kde 2013-07-16 15:59:41.000000000 +0200 -@@ -0,0 +1,568 @@ -+ -+ -+ -+ Applications -+ tde-main.directory -+ -+ -+ -+ -+ -+ -+ -+ -+ More -+ -+ -+ -+ Applications -+ -+ -+ -+ -+ Applications -+ tde-unknown.directory -+ -+ -+ -+ -+ -+ Core -+ TDE -+ -+ -+ X-SuSE-YaST -+ -+ KDE -+ -+ -+ -+ -+ Development -+ tde-development.directory -+ -+ X-TDE-TDevelopIDE -+ tde-development-tdevelop.directory -+ -+ -+ Development -+ X-TDE-TDevelopIDE -+ KDE -+ X-KDE-KDevelopIDE -+ -+ -+ -+ -+ Translation -+ tde-development-translation.directory -+ -+ -+ Development -+ Translation -+ KDE -+ -+ -+ -+ -+ Web Development -+ tde-development-webdevelopment.directory -+ -+ -+ Development -+ WebDevelopment -+ KDE -+ -+ -+ -+ -+ -+ Development -+ X-TDE-TDevelopIDE -+ Translation -+ WebDevelopment -+ KDE -+ -+ -+ -+ -+ Science -+ tde-science.directory -+ -+ -+ -+ Astronomy -+ Biology -+ Chemistry -+ Geology -+ MedicalSoftware -+ Physics -+ Math -+ Science -+ -+ Education -+ KDE -+ -+ -+ -+ -+ Edutainment -+ tde-edutainment.directory -+ -+ Languages -+ tde-edu-languages.directory -+ -+ -+ Education -+ -+ Languages -+ X-TDE-Edu-Language -+ -+ KDE -+ -+ -+ -+ -+ Mathematics -+ tde-edu-mathematics.directory -+ -+ -+ Education -+ Math -+ KDE -+ -+ -+ -+ -+ Miscellaneous -+ tde-edu-miscellaneous.directory -+ -+ -+ Education -+ -+ Languages -+ X-TDE-Edu-Language -+ Math -+ Science -+ Teaching -+ X-TDE-Edu-Teaching -+ KDE -+ -+ -+ -+ -+ -+ Science -+ tde-edu-science.directory -+ -+ -+ Education -+ Science -+ KDE -+ -+ -+ -+ -+ Tools -+ tde-edu-tools.directory -+ -+ -+ Education -+ -+ Teaching -+ X-TDE-Edu-Teaching -+ -+ KDE -+ -+ -+ -+ -+ -+ Games -+ tde-games.directory -+ -+ Arcade -+ tde-games-arcade.directory -+ -+ -+ Game -+ ArcadeGame -+ KDE -+ -+ -+ -+ -+ Board -+ tde-games-board.directory -+ -+ -+ Game -+ BoardGame -+ KDE -+ -+ -+ -+ -+ Card -+ tde-games-card.directory -+ -+ -+ Game -+ CardGame -+ KDE -+ -+ -+ -+ -+ Kidsgames -+ tde-games-kids.directory -+ -+ -+ Game -+ -+ X-TDE-KidsGame -+ KidsGame -+ -+ KDE -+ -+ -+ -+ -+ TacticStrategy -+ tde-games-strategy.directory -+ -+ -+ Game -+ StrategyGame -+ KDE -+ -+ -+ -+ -+ -+ Game -+ -+ ArcadeGame -+ BoardGame -+ CardGame -+ X-TDE-KidsGame -+ KidsGame -+ StrategyGame -+ KDE -+ -+ -+ -+ -+ -+ Graphics -+ tde-graphics.directory -+ -+ -+ Graphics -+ X-TDE-More -+ X-KDE-More -+ KDE -+ ooo-draw.desktop -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Graphics -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ -+ Internet -+ tde-internet.directory -+ -+ -+ Network -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ Terminal -+ tde-internet-terminal.directory -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Network -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ -+ Multimedia -+ tde-multimedia.directory -+ -+ -+ AudioVideo -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ AudioVideo -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ -+ Office -+ tde-office.directory -+ -+ -+ -+ -+ More -+ -+ -+ -+ Office -+ X-TDE-Office-PIM -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ ooo-draw.desktop -+ -+ -+ Personal Information Management -+ tde-office-pim.directory -+ -+ -+ X-TDE-Office-PIM -+ -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Office -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ -+ Settingsmenu -+ tde-settingsmenu.directory -+ -+ -+ Settings -+ KDE -+ X-KDE-settings-sound -+ -+ -+ -+ -+ System -+ tde-system.directory -+ -+ -+ System -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ SuperUser -+ tde-system-su.directory -+ -+ -+ X-TDE-System-su -+ X-TDE-More -+ X-KDE-More -+ X-KDE-System-su -+ KDE -+ -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ System -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ ScreenSavers -+ tde-system-screensavers.directory -+ -+ -+ Terminal -+ tde-system-terminal.directory -+ -+ -+ -+ Utilities -+ tde-utilities.directory -+ -+ -+ Utility -+ Accessibility -+ X-TDE-Utilities-Desktop -+ X-TDE-Utilities-File -+ X-TDE-Utilities-Peripherals -+ X-TDE-Utilities-PIM -+ X-TDE-More -+ X-KDE-Utilities-Desktop -+ X-KDE-Utilities-Peripherals -+ X-KDE-Utilities-PIM -+ X-KDE-More -+ KDE -+ -+ -+ -+ Accessibility -+ tde-utilities-accessibility.directory -+ -+ -+ Utility -+ Accessibility -+ KDE -+ -+ -+ -+ -+ Desktop -+ tde-utilities-desktop.directory -+ -+ -+ Utility -+ X-TDE-Utilities-Desktop -+ KDE -+ -+ -+ -+ -+ Editors -+ tde-editors.directory -+ -+ -+ TextEditor -+ KDE -+ -+ -+ -+ -+ File -+ tde-utilities-file.directory -+ -+ -+ Utility -+ X-TDE-Utilities-File -+ -+ -+ -+ -+ Peripherals -+ tde-utilities-peripherals.directory -+ -+ -+ Utility -+ X-TDE-Utilities-Peripherals -+ -+ -+ -+ -+ Personal Information Management -+ tde-utilities-pim.directory -+ -+ -+ Utility -+ X-TDE-Utilities-PIM -+ KDE -+ X-KDE-Utilities-PIM -+ -+ -+ -+ -+ Toys -+ tde-toys.directory -+ -+ -+ Amusement -+ KDE -+ -+ -+ -+ -+ XUtilities -+ tde-utilities-xutils.directory -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Utility -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ More -+ tde-more.directory -+ -+ -+ Utility -+ X-TDE-More -+ X-KDE-More -+ KDE -+ -+ -+ -+ -+ -+ -+ TDE -+ Core -+ -+ -+ -+ -+ -+ Debian -+ debian.directory -+ debian-menu.menu -+ -+ -+ applications-merged -+ applications-kmenuedit.menu -+ -diff -Nuar trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/tdebuildsycoca.cpp trinity-tdelibs-14.0.0~pre599+bae79307/kded/tdebuildsycoca.cpp ---- trinity-tdelibs-14.0.0~pre599+bae79307/kded.ORI/tdebuildsycoca.cpp 2013-07-18 19:06:05.024534339 +0200 -+++ trinity-tdelibs-14.0.0~pre599+bae79307/kded/tdebuildsycoca.cpp 2013-07-18 19:06:36.658367094 +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); -- cgit v1.2.1