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

---
 dnssd/CMakeLists.txt    |  4 ++--
 dnssd/Makefile.am       | 10 +++++-----
 dnssd/README            |  2 +-
 dnssd/kcm_kdnssd.kcfg   | 39 ---------------------------------------
 dnssd/kcm_tdednssd.kcfg | 39 +++++++++++++++++++++++++++++++++++++++
 dnssd/settings.kcfgc    |  2 +-
 6 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 dnssd/kcm_kdnssd.kcfg
 create mode 100644 dnssd/kcm_tdednssd.kcfg

(limited to 'dnssd')

diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 3df24100b..09d96161d 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -31,9 +31,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/dnssd )
 
 
-##### kdnssd ####################################
+##### tdednssd ####################################
 
-set( target kdnssd )
+set( target tdednssd )
 
 set( ${target}_SRCS
   remoteservice.cpp responder.cpp servicebase.cpp
diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am
index c24bdd6ba..25e749d72 100644
--- a/dnssd/Makefile.am
+++ b/dnssd/Makefile.am
@@ -7,16 +7,16 @@ noinst_HEADERS = sdevent.h
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
-lib_LTLIBRARIES =  libkdnssd.la
+lib_LTLIBRARIES =  libtdednssd.la
 
-libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
+libtdednssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
 				settings.kcfgc publicservice.cpp query.cpp domainbrowser.cpp servicebrowser.cpp
 dnssdincludedir = $(includedir)/dnssd
 dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
 	publicservice.h servicebase.h servicebrowser.h settings.h
-libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
-libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
+libtdednssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
 
-#kde_kcfg_DATA = kcm_kdnssd.kcfg
+#kde_kcfg_DATA = kcm_tdednssd.kcfg
 
 include ../admin/Doxyfile.am
diff --git a/dnssd/README b/dnssd/README
index ffceb8ce9..304a7babb 100644
--- a/dnssd/README
+++ b/dnssd/README
@@ -1,7 +1,7 @@
 Checklist to ensure that zeroconf will work:
 
 1) Install Avahi, at least version 0.3
-2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by tdelibs
+2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs
 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
 line starting with 'host:'. It should be something like:
 host: files mdns dns
diff --git a/dnssd/kcm_kdnssd.kcfg b/dnssd/kcm_kdnssd.kcfg
deleted file mode 100644
index 207ab608c..000000000
--- a/dnssd/kcm_kdnssd.kcfg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kdnssdrc" />
- <group name="browsing" >
-  <entry key="DomainList" type="StringList" >
-   <label>Additional domains for browsing</label>
-   <whatsthis>List of 'wide-area' (non link-local) domains that should be browsed.</whatsthis>
-  </entry>
-  <entry key="BrowseLocal" type="Bool" >
-   <label>Browse local network</label>
-   <whatsthis>If true .local domain will be browsed. It is always link-local, using multicast DNS.</whatsthis>
-   <default>true</default>
-  </entry>
-  <entry key="Recursive" type="Bool" >
-   <label>Recursive search for domains</label>
-   <whatsthis>Removed in KDE 3.5.0</whatsthis>
-   <default>false</default>
-  </entry>
- </group>
- <group name="publishing" >
-  <entry key="PublishType" type="Enum" >
-   <label>Select publishing in LAN (multicast) or WAN (unicast, needs configured DNS server)</label>
-   <whatsthis>Specifies if publishing should be by default link-local using multicast DNS (LAN) or 'wide-area' using normal DNS server (WAN).</whatsthis>
-   <default>LAN</default>
-   <choices>
-    <choice name="LAN" />
-    <choice name="WAN" />
-   </choices>
-  </entry>
-  <entry key="PublishDomain" type="String" >
-   <label>Name of default publishing domain for WAN</label>
-   <whatsthis>Domain name for publishing using 'wide-area' (normal DNS) ZeroConf. This must match domain specified in /etc/mdnsd.conf. This value is used only if PublishType is set to WAN.
-</whatsthis>
-  </entry>
- </group>
-</kcfg>
diff --git a/dnssd/kcm_tdednssd.kcfg b/dnssd/kcm_tdednssd.kcfg
new file mode 100644
index 000000000..19cefaafa
--- /dev/null
+++ b/dnssd/kcm_tdednssd.kcfg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+ <kcfgfile name="tdednssdrc" />
+ <group name="browsing" >
+  <entry key="DomainList" type="StringList" >
+   <label>Additional domains for browsing</label>
+   <whatsthis>List of 'wide-area' (non link-local) domains that should be browsed.</whatsthis>
+  </entry>
+  <entry key="BrowseLocal" type="Bool" >
+   <label>Browse local network</label>
+   <whatsthis>If true .local domain will be browsed. It is always link-local, using multicast DNS.</whatsthis>
+   <default>true</default>
+  </entry>
+  <entry key="Recursive" type="Bool" >
+   <label>Recursive search for domains</label>
+   <whatsthis>Removed in KDE 3.5.0</whatsthis>
+   <default>false</default>
+  </entry>
+ </group>
+ <group name="publishing" >
+  <entry key="PublishType" type="Enum" >
+   <label>Select publishing in LAN (multicast) or WAN (unicast, needs configured DNS server)</label>
+   <whatsthis>Specifies if publishing should be by default link-local using multicast DNS (LAN) or 'wide-area' using normal DNS server (WAN).</whatsthis>
+   <default>LAN</default>
+   <choices>
+    <choice name="LAN" />
+    <choice name="WAN" />
+   </choices>
+  </entry>
+  <entry key="PublishDomain" type="String" >
+   <label>Name of default publishing domain for WAN</label>
+   <whatsthis>Domain name for publishing using 'wide-area' (normal DNS) ZeroConf. This must match domain specified in /etc/mdnsd.conf. This value is used only if PublishType is set to WAN.
+</whatsthis>
+  </entry>
+ </group>
+</kcfg>
diff --git a/dnssd/settings.kcfgc b/dnssd/settings.kcfgc
index 63764fc57..b8454f94b 100644
--- a/dnssd/settings.kcfgc
+++ b/dnssd/settings.kcfgc
@@ -1,5 +1,5 @@
 ClassName=Configuration
-File=kcm_kdnssd.kcfg
+File=kcm_tdednssd.kcfg
 GlobalEnums=false
 Inherits=TDEConfigSkeleton
 ItemAccessors=false
-- 
cgit v1.2.1