[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:14:36 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=36c939a

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

    Set version in using CMake instead of hardcoding in main.cpp
    
    Also bump version to 0.3.60
---
 CMakeLists.txt | 4 ++++
 main.cpp       | 4 ++--
 version.h.in   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ef335c..608392f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(ktp-send-file)
 
+set (KTP_SEND_FILE_VERSION "0.3.60")
+
 set (CMAKE_MODULE_PATH
      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
      ${CMAKE_MODULE_PATH}
@@ -33,6 +35,8 @@ set(KTP_SEND_FILE_SRCS
 set(KTP_SEND_FILE_UI
     mainwindow.ui)
 
+configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
 kde4_add_ui_files(KTP_SEND_FILE_SRCS ${KTP_SEND_FILE_UI})
 
 # Create the plasmoid
diff --git a/main.cpp b/main.cpp
index 116d294..90a3d92 100644
--- a/main.cpp
+++ b/main.cpp
@@ -27,14 +27,14 @@
 #include <KFileDialog>
 #include <KDebug>
 
-
 #include "mainwindow.h"
+#include "version.h"
 
 int main(int argc, char *argv[])
 {
     KAboutData aboutData("ktp-send-file", 0,
                          ki18n("Telepathy Send File"),
-                         "0.3");
+                         KTP_SEND_FILE_VERSION);
     aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Author"), "kde at davidedmundson.co.uk");
 
     KCmdLineArgs::init(argc, argv, &aboutData);
diff --git a/version.h.in b/version.h.in
new file mode 100644
index 0000000..13e67ec
--- /dev/null
+++ b/version.h.in
@@ -0,0 +1 @@
+#define KTP_SEND_FILE_VERSION "@KTP_SEND_FILE_VERSION@"

-- 
ktp-send-file packaging



More information about the pkg-kde-commits mailing list