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

---
 acinclude.m4                      | 2 +-
 aclocal.m4                        | 2 +-
 admin                             | 2 +-
 cmake                             | 2 +-
 ksystemlog/doc/Makefile           | 2 +-
 ksystemlog/doc/en/Makefile        | 2 +-
 ksystemlog/po/Makefile            | 2 +-
 ksystemlog/src/ksystemlog.desktop | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index c4115be..0cf97f5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -478,7 +478,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/aclocal.m4 b/aclocal.m4
index 290784c..58c8110 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -490,7 +490,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/ksystemlog/doc/Makefile b/ksystemlog/doc/Makefile
index 0969134..41a7627 100644
--- a/ksystemlog/doc/Makefile
+++ b/ksystemlog/doc/Makefile
@@ -256,7 +256,7 @@ target_os = linux-gnu
 target_vendor = pc
 x_includes = .
 x_libraries = /usr/lib
-xdg_appsdir = ${datadir}/applications/kde
+xdg_appsdir = ${datadir}/applications/tde
 xdg_directorydir = ${datadir}/desktop-directories
 xdg_menudir = ${sysconfdir}/xdg/menus
 
diff --git a/ksystemlog/doc/en/Makefile b/ksystemlog/doc/en/Makefile
index 5b72685..7c1a0db 100644
--- a/ksystemlog/doc/en/Makefile
+++ b/ksystemlog/doc/en/Makefile
@@ -253,7 +253,7 @@ target_os = linux-gnu
 target_vendor = pc
 x_includes = .
 x_libraries = /usr/lib
-xdg_appsdir = ${datadir}/applications/kde
+xdg_appsdir = ${datadir}/applications/tde
 xdg_directorydir = ${datadir}/desktop-directories
 xdg_menudir = ${sysconfdir}/xdg/menus
 KDE_DOCS = ksystemlog
diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile
index 6442cf6..cd8e461 100644
--- a/ksystemlog/po/Makefile
+++ b/ksystemlog/po/Makefile
@@ -253,7 +253,7 @@ target_os = linux-gnu
 target_vendor = pc
 x_includes = .
 x_libraries = /usr/lib
-xdg_appsdir = ${datadir}/applications/kde
+xdg_appsdir = ${datadir}/applications/tde
 xdg_directorydir = ${datadir}/desktop-directories
 xdg_menudir = ${sysconfdir}/xdg/menus
 #>- POFILES = AUTO
diff --git a/ksystemlog/src/ksystemlog.desktop b/ksystemlog/src/ksystemlog.desktop
index d1b694a..5e178d4 100644
--- a/ksystemlog/src/ksystemlog.desktop
+++ b/ksystemlog/src/ksystemlog.desktop
@@ -25,4 +25,4 @@ GenericName[it]=Visualizzatore registri di sistema
 GenericName[pt]=Visualizador de Registos do Sistema
 GenericName[sv]=Systemloggvisning
 GenericName[tr]=Sistem Günlükleri Görüntüleyicisi
-Categories=Qt;KDE;Application;System;
+Categories=Qt;TDE;Application;System;