[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=6f36899

The following commit has been merged in the master branch:
commit 6f36899aa224182de81520e56717bb891cb44cb6
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Oct 21 16:59:17 2011 +0200

    Rename DBus services, fix and add missing .client and .service files
    
    NOTE: Delete the old client and service files before installing
---
 CMakeLists.txt                                            | 15 ++++++++-------
 KDE.AuthHandler.client => KDE.SASLHandler.client          |  0
 KDE.AuthHandler.client => KDE.TLSHandler.client           |  3 +--
 main.cpp                                                  |  4 ++--
 ...reedesktop.Telepathy.Client.KDE.SASLHandler.service.in |  2 +-
 ...freedesktop.Telepathy.Client.KDE.TLSHandler.service.in |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 118148b..30afa63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,15 +59,16 @@ target_link_libraries(telepathy-kde-auth-handler
     ${KDE4_KDEUI_LIBS}
 )
 
-configure_file(org.freedesktop.Telepathy.Client.KDE.SASL.Handler.service.in
-               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.SASL.Handler.service)
-#configure_file(org.freedesktop.Telepathy.Client.KDE.TLS.Handler.service.in
-#               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TLS.Handler.service)
+configure_file(org.freedesktop.Telepathy.Client.KDE.SASLHandler.service.in
+               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.SASLHandler.service)
+#configure_file(org.freedesktop.Telepathy.Client.KDE.TLSHandler.service.in
+#               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TLSHandler.service)
 
 
 install(TARGETS telepathy-kde-auth-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.SASL.Handler.service
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.SASLHandler.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TLS.Handler.service
+#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TLSHandler.service
 #        DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-install(FILES KDE.AuthHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+install(FILES KDE.SASLHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+#install(FILES KDE.TLSHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
diff --git a/KDE.AuthHandler.client b/KDE.SASLHandler.client
similarity index 100%
copy from KDE.AuthHandler.client
copy to KDE.SASLHandler.client
diff --git a/KDE.AuthHandler.client b/KDE.TLSHandler.client
similarity index 63%
rename from KDE.AuthHandler.client
rename to KDE.TLSHandler.client
index fca9c62..9e0f2dc 100644
--- a/KDE.AuthHandler.client
+++ b/KDE.TLSHandler.client
@@ -2,7 +2,6 @@
 Interfaces=org.freedesktop.Telepathy.Client.Handler
 
 [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerAuthentication
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection
 org.freedesktop.Telepathy.Channel.TargetHandleType u=0
 org.freedesktop.Telepathy.Channel.Requested b=false
-org.freedesktop.Telepathy.Channel.Type.ServerAuthentication.AuthenticationMethod s=org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication
diff --git a/main.cpp b/main.cpp
index b1f11ec..314aed9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
                 Tp::HandleTypeNone, false, saslOtherProperties));
     Tp::SharedPtr<SaslHandler> saslHandler = Tp::SharedPtr<SaslHandler>(new SaslHandler(saslFilter));
     if (!clientRegistrar->registerClient(
-                Tp::AbstractClientPtr(saslHandler), QLatin1String("KDE.SASL.Handler"))) {
+                Tp::AbstractClientPtr(saslHandler), QLatin1String("KDE.SASLHandler"))) {
         handlers -= 1;
     }
 
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
                 Tp::HandleTypeNone, false));
     Tp::SharedPtr<TlsHandler> tlsHandler = Tp::SharedPtr<TlsHandler>(new TlsHandler(tlsFilter));
     if (!clientRegistrar->registerClient(
-                Tp::AbstractClientPtr(tlsHandler), QLatin1String("KDE.TLS.Handler"))) {
+                Tp::AbstractClientPtr(tlsHandler), QLatin1String("KDE.TLSHandler"))) {
         handlers -= 1;
     }
 
diff --git a/org.freedesktop.Telepathy.Client.KDE.TLS.Handler.service.in b/org.freedesktop.Telepathy.Client.KDE.SASLHandler.service.in
similarity index 56%
rename from org.freedesktop.Telepathy.Client.KDE.TLS.Handler.service.in
rename to org.freedesktop.Telepathy.Client.KDE.SASLHandler.service.in
index 02ce3ff..dd14305 100644
--- a/org.freedesktop.Telepathy.Client.KDE.TLS.Handler.service.in
+++ b/org.freedesktop.Telepathy.Client.KDE.SASLHandler.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.KDE.TLS.Handler
+Name=org.freedesktop.Telepathy.Client.KDE.SASLHandler
 Exec=@LIBEXEC_INSTALL_DIR@/telepathy-kde-auth-handler
diff --git a/org.freedesktop.Telepathy.Client.KDE.SASL.Handler.service.in b/org.freedesktop.Telepathy.Client.KDE.TLSHandler.service.in
similarity index 56%
rename from org.freedesktop.Telepathy.Client.KDE.SASL.Handler.service.in
rename to org.freedesktop.Telepathy.Client.KDE.TLSHandler.service.in
index f83252e..9d9f296 100644
--- a/org.freedesktop.Telepathy.Client.KDE.SASL.Handler.service.in
+++ b/org.freedesktop.Telepathy.Client.KDE.TLSHandler.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.KDE.SASL.Handler
+Name=org.freedesktop.Telepathy.Client.KDE.TLSHandler
 Exec=@LIBEXEC_INSTALL_DIR@/telepathy-kde-auth-handler

-- 
ktp-auth-handler packaging