[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=43c5f57

The following commit has been merged in the master branch:
commit 43c5f571a7ea3702e244793f07b0844d2ac8e5a2
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Oct 20 16:25:16 2014 +0200

    Properly pass the translation domain
    
    So that ktp-common-internals can be translated in the KF5 world.
---
 CMakeLists.txt                 |  3 +--
 KTp/CMakeLists.txt             |  4 +---
 KTp/Declarative/CMakeLists.txt |  1 -
 KTp/Logger/CMakeLists.txt      |  1 -
 KTp/Models/CMakeLists.txt      |  1 -
 KTp/Widgets/CMakeLists.txt     |  1 -
 global.cpp                     | 24 ------------------------
 7 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5610ccc..fc2a2bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,7 @@ set_package_properties(TelepathyLoggerQt5 PROPERTIES DESCRIPTION "Qt bindings fo
                       )
 
 
+add_definitions(-DTRANSLATION_DOMAIN=\"ktp-common-internals\")
 add_definitions (
                  -DQT_NO_CAST_FROM_ASCII
                  -DQT_NO_KEYWORDS
@@ -86,8 +87,6 @@ endif ()
 
 configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
 
-set(KTP_GLOBAL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/global.cpp)
-
 add_subdirectory(KTp)
 add_subdirectory(tools)
 add_subdirectory(data)
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 828a8d5..df7fd86 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -2,7 +2,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR})
 
 set (ktp_common_internals_private_SRCS
-     ${KTP_GLOBAL_SOURCES}
      abstract-message-filter.cpp
      account-factory.cpp
      actions.cpp
@@ -67,9 +66,8 @@ set (ktp_common_internals_private_HDRS
 set (ktp_private_LIBS
                        KF5::Wallet
                        KF5::KIOWidgets
-                       KF5::KDELibs4Support
                        ${TELEPATHY_QT5_LIBRARIES}
-                       ${KDEPIMLIBS_KABC_LIBS}
+                       KF5::KDELibs4Support
 )
 
 if (TELEPATHY_LOGGER_QT5_FOUND)
diff --git a/KTp/Declarative/CMakeLists.txt b/KTp/Declarative/CMakeLists.txt
index 9776e5c..541653b 100644
--- a/KTp/Declarative/CMakeLists.txt
+++ b/KTp/Declarative/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set (ktp_qml_plugin_SRCS
-    ${KTP_GLOBAL_SOURCES}
     conversation.cpp
     conversations-model.cpp
     hide-window-component.cpp
diff --git a/KTp/Logger/CMakeLists.txt b/KTp/Logger/CMakeLists.txt
index 9d4ef4c..119f467 100644
--- a/KTp/Logger/CMakeLists.txt
+++ b/KTp/Logger/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set (ktp_logger_private_SRCS
-    ${KTP_GLOBAL_SOURCES}
     abstract-logger-plugin.cpp
     log-entity.cpp
     log-manager.cpp
diff --git a/KTp/Models/CMakeLists.txt b/KTp/Models/CMakeLists.txt
index 3d14aff..510d18e 100644
--- a/KTp/Models/CMakeLists.txt
+++ b/KTp/Models/CMakeLists.txt
@@ -1,5 +1,4 @@
 set (ktp_models_private_SRCS
-    ${KTP_GLOBAL_SOURCES}
     abstract-grouping-proxy-model.cpp
     accounts-list-model.cpp
     accounts-tree-proxy-model.cpp
diff --git a/KTp/Widgets/CMakeLists.txt b/KTp/Widgets/CMakeLists.txt
index b6e6a3b..01af6fd 100644
--- a/KTp/Widgets/CMakeLists.txt
+++ b/KTp/Widgets/CMakeLists.txt
@@ -3,7 +3,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
 )
 
 set (ktp_widgets_private_SRCS
-    ${KTP_GLOBAL_SOURCES}
     contact-view-widget.cpp
     contact-grid-widget.cpp
     contact-grid-dialog.cpp
diff --git a/global.cpp b/global.cpp
deleted file mode 100644
index 18c525a..0000000
--- a/global.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2013 Daniel Vrátil <dvratil at redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <KGlobal>
-
-//Load i18n catalog
-static const KCatalogLoader loader(QLatin1String("ktp-common-internals"));
-

-- 
ktp-common-internals packaging