From f331af031a2fc2f01599db5712ba9171ab5f5d7c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:13:47 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 systemsettings/menu/system-settings.menu | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'systemsettings/menu')

diff --git a/systemsettings/menu/system-settings.menu b/systemsettings/menu/system-settings.menu
index 16f55b2..d2f3089 100644
--- a/systemsettings/menu/system-settings.menu
+++ b/systemsettings/menu/system-settings.menu
@@ -293,7 +293,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
 					<Filename>tde-proxy.desktop</Filename>
 					<Filename>tde-netpref.desktop</Filename>
-					<Filename>tde-kcm_kdnssd.desktop</Filename>
+					<Filename>tde-kcm_tdednssd.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 
@@ -301,7 +301,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
 					<Filename>tde-proxy.desktop</Filename>
 					<Filename>tde-netpref.desktop</Filename>
-					<Filename>tde-kcm_kdnssd.desktop</Filename>
+					<Filename>tde-kcm_tdednssd.desktop</Filename>
 					<Category>X-TDE-systemsettings-network-networksettings</Category>
 				</Include>
 			</Menu>
@@ -366,7 +366,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 
 			<Layout>
 				<Filename>tde-audioencoding.desktop</Filename>
-				<Filename>tde-kresources.desktop</Filename>
+				<Filename>tde-tderesources.desktop</Filename>
 				<Filename>tde-kcmkded.desktop</Filename>
 				<Filename>tde-kcmsmserver.desktop</Filename>
 				<Merge type="files" />
@@ -374,7 +374,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 
 			<Include>
 				<Filename>tde-audioencoding.desktop</Filename>
-				<Filename>tde-kresources.desktop</Filename>
+				<Filename>tde-tderesources.desktop</Filename>
 				<Filename>tde-kcmkded.desktop</Filename>
 				<Filename>tde-kcmsmserver.desktop</Filename>
 				<Category>X-TDE-systemsettings-advancedusersettings</Category>
-- 
cgit v1.2.1