[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=a13b78a

The following commit has been merged in the master branch:
commit a13b78a6cbfef4de4e5791cef6f98d00caf974b9
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Oct 22 13:47:02 2014 +0200

    Remove remaining usages of version.h
---
 CMakeLists.txt                        | 1 +
 KTp/message-filter-config-manager.cpp | 1 -
 tools/debugger/main.cpp               | 5 +++--
 version.h.in                          | 2 --
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6704780..0547b86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,7 @@ set (KTP_SONUMBER 9)
 set (KTP_VERSION "0.${KTP_SONUMBER}.0")
 set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
 
+add_definitions(-DKTP_MESSAGE_FILTER_FRAMEWORK_VERSION=\"${KTP_MESSAGE_FILTER_FRAMEWORK_VERSION}\")
 add_definitions(-DTRANSLATION_DOMAIN=\"ktp-common-internals\")
 add_definitions (
                  -DQT_NO_CAST_FROM_ASCII
diff --git a/KTp/message-filter-config-manager.cpp b/KTp/message-filter-config-manager.cpp
index 9c78654..1224ac6 100644
--- a/KTp/message-filter-config-manager.cpp
+++ b/KTp/message-filter-config-manager.cpp
@@ -18,7 +18,6 @@
 
 #include "message-filter-config-manager.h"
 #include "message-processor-private.h"
-#include "version.h"
 
 #include <QMutex>
 #include <QSet>
diff --git a/tools/debugger/main.cpp b/tools/debugger/main.cpp
index dc5974b..9cf41d1 100644
--- a/tools/debugger/main.cpp
+++ b/tools/debugger/main.cpp
@@ -17,7 +17,8 @@
 */
 
 #include "main-window.h"
-#include "version.h"
+
+#include "ktp_version.h"
 
 #include <KAboutData>
 #include <KLocalizedString>
@@ -28,7 +29,7 @@ int main(int argc, char **argv)
 {
     KAboutData aboutData(QStringLiteral("ktp-debugger"),
             i18n("KDE Telepathy Debug Tool"),
-            QStringLiteral(KTP_VERSION),
+            QStringLiteral(KTP_VERSION_STRING),
             i18n("Tool for inspecting logs of the various underlying telepathy components"),
             KAboutLicense::LGPL,
             i18n("Copyright (C) 2011 Collabora Ltd."));
diff --git a/version.h.in b/version.h.in
deleted file mode 100644
index 84dc49b..0000000
--- a/version.h.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#define KTP_VERSION "@KTP_VERSION@"
-#define KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "@KTP_MESSAGE_FILTER_FRAMEWORK_VERSION@"

-- 
ktp-common-internals packaging