[med-svn] [axe-demultiplexer] 04/06: Refresh patches

[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 56139904363adf815d467f51577433a9d7a9ac0c
Author: Kevin Murray <kdmfoss at gmail.com>
Date:   Thu Dec 1 12:37:27 2016 +1100

    Refresh patches
---
 debian/patches/0002-Remove-libqes-from-CML.txt.patch | 4 ++--
 debian/patches/cmake-version                         | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0002-Remove-libqes-from-CML.txt.patch b/debian/patches/0002-Remove-libqes-from-CML.txt.patch
index 26838c5..d4aa588 100644
--- a/debian/patches/0002-Remove-libqes-from-CML.txt.patch
+++ b/debian/patches/0002-Remove-libqes-from-CML.txt.patch
@@ -11,8 +11,8 @@ index 715b394..d63d459 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -76,5 +76,3 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/src/axe_config.h.in
+-SET(LIBQES_AS_SUBMODULE True)  # stop libqes installing itself
+-ADD_SUBDIRECTORY(src/libqes)
  ADD_SUBDIRECTORY(docs)
  ADD_SUBDIRECTORY(tests)
  ADD_SUBDIRECTORY(src)
--SET(LIBQES_AS_SUBMODULE True)  # stop libqes installing itself
--ADD_SUBDIRECTORY(src/libqes)
diff --git a/debian/patches/cmake-version b/debian/patches/cmake-version
index 7c45ee8..411c665 100644
--- a/debian/patches/cmake-version
+++ b/debian/patches/cmake-version
@@ -7,17 +7,13 @@ Get program version from Debian Changelog, not from git.
  CMakeLists.txt | 14 +++++---------
  1 file changed, 5 insertions(+), 9 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4d4e6cd..715b394 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -13,15 +13,11 @@ IF (NOT CMAKE_BUILD_TYPE)
+@@ -13,13 +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()
+-IF (NOT AXE_VERSION)
 -	# git describe as versioning
 -	EXECUTE_PROCESS(COMMAND git describe
 -			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

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