[med-svn] [axe-demultiplexer] 06/06: Fix dynamic linking to libqes

[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 05545856d0cb7efff5e58431ea58ce2140481544
Author: Kevin Murray <kdmfoss at gmail.com>
Date:   Thu Dec 1 12:51:04 2016 +1100

    Fix dynamic linking to libqes
---
 debian/patches/0002-Remove-libqes-from-CML.txt.patch   |  7 +++++--
 ...0003-Use-standard-include-path-of-gsl-headers.patch |  2 +-
 debian/patches/0004-Dynamically-link-to-libqes.patch   | 18 ++++++++++++++++--
 debian/patches/cmake-version                           |  8 +++++---
 4 files changed, 27 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 d4aa588..10777da 100644
--- a/debian/patches/0002-Remove-libqes-from-CML.txt.patch
+++ b/debian/patches/0002-Remove-libqes-from-CML.txt.patch
@@ -7,10 +7,13 @@ Subject: Remove libqes from CML.txt
  1 file changed, 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 715b394..d63d459 100644
+index f4ea21e..aa04d79 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -76,5 +76,3 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/src/axe_config.h.in
+@@ -57,8 +57,6 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/src/axe_config.h.in
+                ${CMAKE_BINARY_DIR}/axe_config.h)
+ 
 -SET(LIBQES_AS_SUBMODULE True)  # stop libqes installing itself
 -ADD_SUBDIRECTORY(src/libqes)
  ADD_SUBDIRECTORY(docs)
diff --git a/debian/patches/0003-Use-standard-include-path-of-gsl-headers.patch b/debian/patches/0003-Use-standard-include-path-of-gsl-headers.patch
index 19b04c2..8dee327 100644
--- a/debian/patches/0003-Use-standard-include-path-of-gsl-headers.patch
+++ b/debian/patches/0003-Use-standard-include-path-of-gsl-headers.patch
@@ -7,7 +7,7 @@ Subject: Use standard include path of gsl headers
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/axe.c b/src/axe.c
-index ffcd13b..e66420c 100644
+index 6390418..9326947 100644
 --- a/src/axe.c
 +++ b/src/axe.c
 @@ -23,7 +23,7 @@
diff --git a/debian/patches/0004-Dynamically-link-to-libqes.patch b/debian/patches/0004-Dynamically-link-to-libqes.patch
index d83c761..31b4383 100644
--- a/debian/patches/0004-Dynamically-link-to-libqes.patch
+++ b/debian/patches/0004-Dynamically-link-to-libqes.patch
@@ -3,8 +3,9 @@ Date: Wed, 11 Nov 2015 14:19:38 +1100
 Subject: Dynamically link to libqes
 
 ---
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/CMakeLists.txt   | 2 +-
+ tests/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index bc989b5..4dba402 100644
@@ -19,3 +20,16 @@ index bc989b5..4dba402 100644
  SET_TARGET_PROPERTIES(axelib PROPERTIES OUTPUT_NAME axe)
  
  # Executable
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 8f31a54..8c3f62e 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/tinytest)
+ 
+ ADD_EXECUTABLE(test_axe test.c ${CMAKE_CURRENT_SOURCE_DIR}/tinytest/tinytest.c test_libaxe.c)
+-TARGET_LINK_LIBRARIES(test_axe ${AXE_DEPENDS_LIBRARIES} axelib qes_static)
++TARGET_LINK_LIBRARIES(test_axe ${AXE_DEPENDS_LIBRARIES} axelib qes)
+ 
+ # Copy test files over to bin dir & make output
+ ADD_CUSTOM_TARGET(setup_tests ALL
diff --git a/debian/patches/cmake-version b/debian/patches/cmake-version
index 411c665..28e50b2 100644
--- a/debian/patches/cmake-version
+++ b/debian/patches/cmake-version
@@ -4,12 +4,14 @@ Subject: cmake-version
 
 Get program version from Debian Changelog, not from git.
 ---
- CMakeLists.txt | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
+ CMakeLists.txt | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27d91f3..f4ea21e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -13,13 +13,11 @@
+@@ -13,13 +13,11 @@ IF (NOT CMAKE_BUILD_TYPE)
          SET(CMAKE_BUILD_TYPE Release)
  ENDIF()
  

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