[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:12:18 UTC 2016


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

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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67233ad..15aafd2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 project (ktp-filetransfer-handler)
 
+set(KTP_FILETRANSFER_HANDLER_VERSION "0.3.60")
+
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
 set(IS_KTP_INTERNAL_MODULE TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d686cf0..1b970e9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,8 @@ set (ktp_filetransfer_handler_SRCS
      handle-outgoing-file-transfer-channel-job.cpp
 )
 
+configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
 kde4_add_executable(ktp-filetransfer-handler ${ktp_filetransfer_handler_SRCS})
 
 target_link_libraries(ktp-filetransfer-handler
diff --git a/src/main.cpp b/src/main.cpp
index abdfbb5..c0042cf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "filetransfer-handler.h"
+#include "version.h"
 
 #include <KTp/telepathy-handler-application.h>
 
@@ -31,7 +32,7 @@ int main(int argc, char* argv[])
     KAboutData aboutData("ktp-filetransfer-handler",
                          "ktp-filetransfer-handler",
                          ki18n("Telepathy File Transfer Handler"),
-                         "0.3.60");
+                         KTP_FILETRANSFER_HANDLER_VERSION);
     aboutData.addAuthor(ki18n("Daniele E. Domenichelli"), ki18n("Developer"), "daniele.domenichelli at gmail.com");
     aboutData.setProductName("telepathy/filetransfer");
 
diff --git a/src/version.h.in b/src/version.h.in
new file mode 100644
index 0000000..deb018e
--- /dev/null
+++ b/src/version.h.in
@@ -0,0 +1 @@
+#define KTP_FILETRANSFER_HANDLER_VERSION "@KTP_FILETRANSFER_HANDLER_VERSION@"

-- 
ktp-filetransfer-handler packaging



More information about the pkg-kde-commits mailing list