[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=99f7618

The following commit has been merged in the master branch:
commit 99f76186ce3b77d2574df2b8e9044b8c14ebbc5c
Author: Alin M Elena <alinm.elena at gmail.com>
Date:   Fri Dec 23 10:56:57 2011 +0000

    update according to Daniele's comments for name changes
---
 CMakeLists.txt                                           | 16 ++++++++--------
 KDE.SASLHandler.client => KTp.SASLHandler.client         |  0
 KDE.TLSHandler.client => KTp.TLSHandler.client           |  0
 Messages.sh                                              |  2 +-
 main.cpp                                                 |  6 +++---
 ...eedesktop.Telepathy.Client.KTp.SASLHandler.service.in |  2 +-
 ...reedesktop.Telepathy.Client.KTp.TLSHandler.service.in |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b96d111..1a263b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,16 +47,16 @@ target_link_libraries(ktp-auth-handler
     ${KDE4_KDEUI_LIBS}
 )
 
-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)
+configure_file(org.freedesktop.Telepathy.Client.KTp.SASLHandler.service.in
+               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service)
+#configure_file(org.freedesktop.Telepathy.Client.KTp.TLSHandler.service.in
+#               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service)
 
 
 install(TARGETS ktp-auth-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.SASLHandler.service
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TLSHandler.service
+#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service
 #        DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-install(FILES KDE.SASLHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
-#install(FILES KDE.TLSHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+install(FILES KTp.SASLHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+#install(FILES KTp.TLSHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
diff --git a/KDE.SASLHandler.client b/KTp.SASLHandler.client
similarity index 100%
rename from KDE.SASLHandler.client
rename to KTp.SASLHandler.client
diff --git a/KDE.TLSHandler.client b/KTp.TLSHandler.client
similarity index 100%
rename from KDE.TLSHandler.client
rename to KTp.TLSHandler.client
diff --git a/Messages.sh b/Messages.sh
index 44e3aed..47260f0 100755
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,4 +1,4 @@
 #! /usr/bin/env bash
 $EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/telepathy-auth-handler.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/ktp-auth-handler.pot
 rm -f rc.cpp
diff --git a/main.cpp b/main.cpp
index 780c1aa..ecaca80 100644
--- a/main.cpp
+++ b/main.cpp
@@ -42,7 +42,7 @@
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("telepathy-kde-auth-handler",
+    KAboutData aboutData("ktp-auth-handler",
                          "telepathy-auth-handler",
                          ki18n("Telepathy Authentication Handler"),
                          "0.1");
@@ -76,7 +76,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.SASLHandler"))) {
+                Tp::AbstractClientPtr(saslHandler), QLatin1String("KTp.SASLHandler"))) {
         handlers -= 1;
     }
 
@@ -85,7 +85,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.TLSHandler"))) {
+                Tp::AbstractClientPtr(tlsHandler), QLatin1String("KTp.TLSHandler"))) {
         handlers -= 1;
     }
 
diff --git a/org.freedesktop.Telepathy.Client.KDE.SASLHandler.service.in b/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service.in
similarity index 52%
rename from org.freedesktop.Telepathy.Client.KDE.SASLHandler.service.in
rename to org.freedesktop.Telepathy.Client.KTp.SASLHandler.service.in
index f7f102c..fa3bbc3 100644
--- a/org.freedesktop.Telepathy.Client.KDE.SASLHandler.service.in
+++ b/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.KDE.SASLHandler
+Name=org.freedesktop.Telepathy.Client.KTp.SASLHandler
 Exec=@LIBEXEC_INSTALL_DIR@/ktp-auth-handler
diff --git a/org.freedesktop.Telepathy.Client.KDE.TLSHandler.service.in b/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service.in
similarity index 53%
rename from org.freedesktop.Telepathy.Client.KDE.TLSHandler.service.in
rename to org.freedesktop.Telepathy.Client.KTp.TLSHandler.service.in
index b3ec941..98969d7 100644
--- a/org.freedesktop.Telepathy.Client.KDE.TLSHandler.service.in
+++ b/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.KDE.TLSHandler
+Name=org.freedesktop.Telepathy.Client.KTp.TLSHandler
 Exec=@LIBEXEC_INSTALL_DIR@/ktp-auth-handler

-- 
ktp-auth-handler packaging