[med-svn] [axe-demultiplexer] 02/04: Patch cmake lists to get verison from d/changelog

[Kevin Murray]

This is an automated email from the git hooks/post-receive script.

daube-guest pushed a commit to branch master
in repository axe-demultiplexer.

commit 4ca56d8d77426fa804e7770073521da9e3a1cbb6
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Mon Aug 3 12:15:13 2015 +1000

    Patch cmake lists to get verison from d/changelog
---
 debian/patches/cmake-version | 23 +++++++++++++++++++++++
 debian/patches/series        |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/cmake-version b/debian/patches/cmake-version
new file mode 100644
index 0000000..f347f2a
--- /dev/null
+++ b/debian/patches/cmake-version
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,15 +13,11 @@
+         SET(CMAKE_BUILD_TYPE Release)
+ ENDIF()
+ 
+-IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/version")
+-	FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/version" AXE_VERSION)
+-ELSE()
+-	# git describe as versioning
+-	EXECUTE_PROCESS(COMMAND git describe
+-			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-			OUTPUT_VARIABLE AXE_VERSION
+-			OUTPUT_STRIP_TRAILING_WHITESPACE)
+-ENDIF()
++# Get version from debian changelog
++EXECUTE_PROCESS(COMMAND dpkg-parsechangelog -S Version
++		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++		OUTPUT_VARIABLE AXE_VERSION
++		OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
+ MESSAGE(STATUS "${CMAKE_BUILD_TYPE} build of axe version: ${AXE_VERSION}")
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b3441c6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cmake-version

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/axe-demultiplexer.git