This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository eigensoft.
commit 48b810ebe42139a41d92bec48d464b3234b9272e Author: Andreas Tille <[email protected]> Date: Tue Jul 19 08:15:22 2016 +0200 Reactivate lapacke patch, fix headers (thanks to Tatiana Malygina) --- debian/changelog | 4 ++++ debian/patches/fixing_headers.patch | 26 ++++++++++++++++++++++++++ debian/patches/lapacke.patch | 25 ++++++++----------------- debian/patches/series | 3 ++- 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb66360..9e44e57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ eigensoft (6.1.2+dfsg-1) UNRELEASED; urgency=medium + [ Andreas Tille ] * New upstream version * Adapt watch file to match new version string + [ Tatiana Malygina ] + * Fix headers + -- Andreas Tille <[email protected]> Mon, 18 Jul 2016 21:48:31 +0200 eigensoft (6.0.1+ds-1) unstable; urgency=medium diff --git a/debian/patches/fixing_headers.patch b/debian/patches/fixing_headers.patch new file mode 100644 index 0000000..05dc884 --- /dev/null +++ b/debian/patches/fixing_headers.patch @@ -0,0 +1,26 @@ +Author: Tatiana Malygina <[email protected]> +Last-Update: Tue, 19 Jul 2016 08:47:27 +0300 +Description: Fix lapack headers + +--- a/src/eigensrc/eigx.c ++++ b/src/eigensrc/eigx.c +@@ -12,7 +12,7 @@ + + #define HAVE_LAPACK_CONFIG_H + #define LAPACK_COMPLEX_STRUCTURE +-#include "../lapack/lapacke/include/lapacke.h" ++#include <lapacke.h> + typedef int __CLPK_integer; + + typedef double __CLPK_doublereal; +--- a/src/eigx.c ++++ b/src/eigx.c +@@ -12,7 +12,7 @@ + + #define HAVE_LAPACK_CONFIG_H + #define LAPACK_COMPLEX_STRUCTURE +-#include "lapack/lapacke/include/lapacke.h" ++#include <lapacke.h> + typedef int __CLPK_integer; + + typedef double __CLPK_doublereal; diff --git a/debian/patches/lapacke.patch b/debian/patches/lapacke.patch index 309bee2..2a3a777 100644 --- a/debian/patches/lapacke.patch +++ b/debian/patches/lapacke.patch @@ -6,21 +6,12 @@ Author: Petter Reinholdtsen <[email protected]> Last-Update: 2016-02-05 License: same as eigensoft itself -Index: eigensoft/src/Makefile -=================================================================== ---- eigensoft.orig/src/Makefile 2016-02-05 16:55:12.484189587 +0000 -+++ eigensoft/src/Makefile 2016-02-05 16:56:06.816583962 +0000 -@@ -15,11 +15,11 @@ - ifdef OPENBLAS - CFLAGS += -I../include -I$(OPENBLAS)/include -D_GNU_SOURCE - LDFLAGS += -L$(OPENBLAS)/lib -D_GNU_SOURCE --LDLIBS = -Wl,-Bdynamic -lgsl -Wl,-Bstatic -lblas -Wl,-Bdynamic -lgfortran -pthread -lm -+LDLIBS = -Wl,-Bdynamic -lgsl -Wl,-Bstatic -lblas -Wl,-Bdynamic -llapacke -llapack -lgfortran -pthread -lm - else - CFLAGS += -I../include -D_GNU_SOURCE - LDFLAGS += -D_GNU_SOURCE --LDLIBS = -lgsl -lblas -lgfortran -pthread -lm -+LDLIBS = -lgsl -lblas -llapacke -llapack -lgfortran -pthread -lm - endif +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,5 +1,5 @@ + CFLAGS += -I../include +-LDLIBS += -lgsl -lblas -lgfortran -lrt -lm ++LDLIBS += -lgsl -lblas -lgfortran -lrt -lm -llapacke -llapack -pthread - CC = gcc + ifeq ($(OPTIMIZE), 1) + CFLAGS += -O2 diff --git a/debian/patches/series b/debian/patches/series index 4420531..0a3ceda 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ blas.patch -# lapacke.patch libm.patch +lapacke.patch +fixing_headers.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/eigensoft.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
