[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=61cc42e

The following commit has been merged in the master branch:
commit 61cc42e69ce4fbd626b169ef0685aafe1397e0a5
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Feb 23 12:35:15 2012 +0100

    Set version in using CMake instead of hardcoding in main.cpp
---
 CMakeLists.txt | 4 ++++
 main.cpp       | 3 ++-
 version.h.in   | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 254c735..e6b1df7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(ktp-auth-handler)
 
+set(KTP_AUTH_HANDLER_VERSION "0.3.60")
+
 set (CMAKE_MODULE_PATH
      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
      ${CMAKE_MODULE_PATH}
@@ -38,6 +40,8 @@ set(ktp_auth_handler_SRCS
     ${ktp_common_internals_SRCS}
 )
 
+configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
 kde4_add_ui_files(ktp_auth_handler_SRCS x-telepathy-password-prompt.ui)
 kde4_add_executable(ktp-auth-handler ${ktp_auth_handler_SRCS})
 
diff --git a/main.cpp b/main.cpp
index 13dd3aa..d77d800 100644
--- a/main.cpp
+++ b/main.cpp
@@ -34,6 +34,7 @@
 
 #include "sasl-handler.h"
 #include "tls-handler.h"
+#include "version.h"
 
 #include <KTp/telepathy-handler-application.h>
 
@@ -44,7 +45,7 @@ int main(int argc, char *argv[])
 {
     KAboutData aboutData("ktp-auth-handler", 0,
                          ki18n("Telepathy Authentication Handler"),
-                         "0.3");
+                         KTP_AUTH_HANDLER_VERSION);
     aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Developer"), "kde at davidedmundson.co.uk");
     aboutData.addAuthor(ki18n("Daniele E. Domenichelli"), ki18n("Developer"), "daniele.domenichelli at gmail.com");
     aboutData.setProductName("telepathy/auth-handler");
diff --git a/version.h.in b/version.h.in
new file mode 100644
index 0000000..13813a4
--- /dev/null
+++ b/version.h.in
@@ -0,0 +1 @@
+#define KTP_AUTH_HANDLER_VERSION "@KTP_AUTH_HANDLER_VERSION@"

-- 
ktp-auth-handler packaging