From a65a688c38c2f8dc2151a5b7f8f9ed7300bd21e3 Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Fri, 8 Jun 2012 17:29:36 -0500
Subject: [PATCH] Update XDG information in support of bug report 892.

---
 acinclude.m4                      |  2 +-
 admin                             |  2 +-
 cmake                             |  2 +-
 kerry/src/beagled.desktop         |  8 ++++----
 kerry/src/kcm/kcmbeagle.desktop   |  8 ++++----
 kerry/src/kcm/kcmkerry.desktop    |  6 +++---
 kerry/src/kerry.autostart.desktop | 10 +++++-----
 kerry/src/kerry.desktop           |  4 ++--
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 0e24e6a..7ea922d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -489,7 +489,7 @@ if test "$1" = "default"; then
     kde_widgetdir='\${libdir}/trinity/plugins/designer'
   fi
   if test -z "$xdg_appsdir"; then
-    xdg_appsdir='\${datadir}/applications/kde'
+    xdg_appsdir='\${datadir}/applications/tde'
   fi
   if test -z "$xdg_menudir"; then
     xdg_menudir='\${sysconfdir}/xdg/menus'
diff --git a/admin b/admin
index 06098ef..4af57bf 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit 06098efaf31973c11d7dd89ae291e6844b132e1a
+Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0
diff --git a/cmake b/cmake
index e47cc63..d2f658c 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit e47cc63e66a12ca6b740500b76f385336ee40dbc
+Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280
diff --git a/kerry/src/beagled.desktop b/kerry/src/beagled.desktop
index 6c880d4..a1165dd 100644
--- a/kerry/src/beagled.desktop
+++ b/kerry/src/beagled.desktop
@@ -20,7 +20,7 @@ Name[sv]=Beagle-demon
 Name[th]=แดมอน Beagle
 Name[uk]=Даемон Beagle
 Name[zh_CN]=Beagle 守护进程
-X-KDE-autostart-condition=kerryrc:Beagle:AutoStart:true
-X-KDE-StartupNotify=false
-X-KDE-autostart-after=kerry
-X-KDE-autostart-phase=2
+X-TDE-autostart-condition=kerryrc:Beagle:AutoStart:true
+X-TDE-StartupNotify=false
+X-TDE-autostart-after=kerry
+X-TDE-autostart-phase=2
diff --git a/kerry/src/kcm/kcmbeagle.desktop b/kerry/src/kcm/kcmbeagle.desktop
index 6906a0d..6d73c98 100644
--- a/kerry/src/kcm/kcmbeagle.desktop
+++ b/kerry/src/kcm/kcmbeagle.desktop
@@ -3,9 +3,9 @@ Type=Application
 Icon=kerry
 Exec=kcmshell beagle
 
-X-KDE-Library=beagle
-X-KDE-FactoryName=beagle
-X-KDE-ParentApp=kcontrol
+X-TDE-Library=beagle
+X-TDE-FactoryName=beagle
+X-TDE-ParentApp=kcontrol
 
 Name=Desktop Search
 Name[ar]=بحث على سطح المكتب
@@ -45,4 +45,4 @@ Keywords[pt]=beagle,pesquisa no ambiente de trabalho,pesquisa de ficheiros,pesqu
 Keywords[sv]=beagle,skrivbord sök,filsökning,kerry
 Keywords[uk]=beagle,desktop search,file search,search,kerry,пошук файлів,стільничний пошук,пошук
 
-Categories=Qt;KDE;X-KDE-settings-components;
+Categories=Qt;TDE;X-TDE-settings-components;
diff --git a/kerry/src/kcm/kcmkerry.desktop b/kerry/src/kcm/kcmkerry.desktop
index b0942b4..5e33dc9 100644
--- a/kerry/src/kcm/kcmkerry.desktop
+++ b/kerry/src/kcm/kcmkerry.desktop
@@ -4,6 +4,6 @@ Type=Application
 Icon=kerry
 Exec=kcmshell kerry
 
-X-KDE-Library=beagle
-X-KDE-FactoryName=kerry
-X-KDE-ParentApp=kcontrol
+X-TDE-Library=beagle
+X-TDE-FactoryName=kerry
+X-TDE-ParentApp=kcontrol
diff --git a/kerry/src/kerry.autostart.desktop b/kerry/src/kerry.autostart.desktop
index d64f39a..2f42b18 100644
--- a/kerry/src/kerry.autostart.desktop
+++ b/kerry/src/kerry.autostart.desktop
@@ -25,11 +25,11 @@ GenericName[zh_CN]=桌面搜索
 Exec=kerry
 Icon=kerry
 Type=Application
-Categories=Qt;KDE;Application;Core;Utility;Filesystem;
+Categories=Qt;TDE;Application;Core;Utility;Filesystem;
 Terminal=false
 X-DCOP-ServiceType=Unique
-X-KDE-StartupNotify=false
-X-KDE-autostart-condition=kerryrc:General:AutoStart:true
-X-KDE-autostart-after=panel
-X-KDE-autostart-phase=2
+X-TDE-StartupNotify=false
+X-TDE-autostart-condition=kerryrc:General:AutoStart:true
+X-TDE-autostart-after=panel
+X-TDE-autostart-phase=2
 
diff --git a/kerry/src/kerry.desktop b/kerry/src/kerry.desktop
index a144b8b..0bbb399 100644
--- a/kerry/src/kerry.desktop
+++ b/kerry/src/kerry.desktop
@@ -25,7 +25,7 @@ GenericName[zh_CN]=桌面搜索
 Exec=kerry --show-searchdialog
 Icon=kerry
 Type=Application
-Categories=Qt;KDE;Application;Core;Utility;Filesystem;
+Categories=Qt;TDE;Application;Core;Utility;Filesystem;
 Terminal=false
 X-DCOP-ServiceType=Unique
-X-KDE-StartupNotify=false
+X-TDE-StartupNotify=false