[med-svn] [hilive] 05/06: Adapt patches

[Andreas Tille]

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

tille pushed a commit to branch master
in repository hilive.

commit a75afbac128f273b7e93969bb430ee5eff69f311
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 25 15:24:02 2016 +0100

    Adapt patches
---
 debian/patches/do_not_set_rpath.patch | 13 +++++++------
 debian/patches/fix_cmath.patch        | 13 -------------
 debian/patches/series                 |  1 -
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/debian/patches/do_not_set_rpath.patch b/debian/patches/do_not_set_rpath.patch
index 60c7671..5c52fdf 100644
--- a/debian/patches/do_not_set_rpath.patch
+++ b/debian/patches/do_not_set_rpath.patch
@@ -7,11 +7,12 @@ Description: Do not set rpath
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -35,6 +35,7 @@ foreach (lib ${LIBS})
-     list(APPEND LIB_FILES "lib/${lib}.cpp")
+@@ -84,7 +84,7 @@ foreach (x ${LIB_NAMES})
+ 	list(APPEND LIB_LIST "lib/${x}.cpp")
  endforeach()
- add_library(hilivelib ${LIB_FILES})
-+set_target_properties(hilivelib PROPERTIES SKIP_BUILD_RPATH TRUE)
+ add_library(HiLiveLibs ${LIB_LIST})
+-
++set_target_properties(HiLiveLibs PROPERTIES SKIP_BUILD_RPATH TRUE)
  
- set(Boost_USE_STATIC_LIBS ON) 
- set(Boost_USE_MULTITHREADED ON)  
+ #############################
+ ### Build the executables ###
diff --git a/debian/patches/fix_cmath.patch b/debian/patches/fix_cmath.patch
deleted file mode 100644
index b36015f..0000000
--- a/debian/patches/fix_cmath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 28 Jul 2016 15:13:14 +0200
-Description: Add missing header file
-
---- a/lib/alnread.cpp
-+++ b/lib/alnread.cpp
-@@ -1,5 +1,6 @@
- #include <time.h>
- #include <chrono>
-+#include <cmath>
- 
- #include "alnread.h"
- 
diff --git a/debian/patches/series b/debian/patches/series
index 5d11aea..d8e6b5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_cmath.patch
 do_not_set_rpath.patch

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