[med-svn] [phast] 01/01: Use clapack

[Andreas Tille]

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

tille pushed a commit to branch master
in repository phast.

commit 83f190cc426d6c8f07b5eb03059de7a62a0dab6b
Author: Andreas Tille <tille at debian.org>
Date:   Fri May 27 18:07:57 2016 +0200

    Use clapack
---
 debian/changelog             |  2 +-
 debian/control               |  3 +--
 debian/patches/clapack.patch | 21 +++++++++++++++++++++
 debian/patches/lapacke.patch | 13 -------------
 debian/patches/series        |  2 +-
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2403071..5c64b58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ phast (1.4-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #<bug>)
 
- -- Andreas Tille <tille at debian.org>  Thu, 21 Apr 2016 10:12:37 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 27 May 2016 18:06:35 +0200
diff --git a/debian/control b/debian/control
index 9701ba2..78068ec 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               liblapacke-dev,
-#               libf2c2-dev
+               libclapack-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/phast.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/phast.git
diff --git a/debian/patches/clapack.patch b/debian/patches/clapack.patch
new file mode 100644
index 0000000..c305c1c
--- /dev/null
+++ b/debian/patches/clapack.patch
@@ -0,0 +1,21 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 27 May 2016 18:06:35 +0200
+Description: Debian's clapack package renames library from lapack.a
+ to clapack.a to enable parallel installation of the alternative
+ implementation lapacke
+
+--- a/src/lib/Makefile
++++ b/src/lib/Makefile
+@@ -19,10 +19,10 @@ sharedlib: liblinks sharedphastlib
+ # by default, CLAPACK uses non-standard library names, which confuses
+ # the compiler.  We'll just create symbolic links in ${PHAST}/lib that
+ # have proper names
+-liblinks: ${PHAST}/lib/liblapack.a ${PHAST}/lib/libtmg.a \
++liblinks: ${PHAST}/lib/libclapack.a ${PHAST}/lib/libtmg.a \
+ 	${PHAST}/lib/libblaswr.a 
+ 
+-${PHAST}/lib/liblapack.a: ${CLAPACKPATH}/lapack${PLAT}.a
++${PHAST}/lib/liblapack.a: ${CLAPACKPATH}/clapack${PLAT}.a
+ 	mkdir -p ${PHAST}/lib
+ 	${LN} -s $< $@
+ 
diff --git a/debian/patches/lapacke.patch b/debian/patches/lapacke.patch
deleted file mode 100644
index cedc904..0000000
--- a/debian/patches/lapacke.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/external_libs.h
-+++ b/include/external_libs.h
-@@ -39,8 +39,8 @@
- #else
- 
- #ifndef SKIP_LAPACK 
--#include <f2c.h>  
--#include <clapack.h> 
-+/* #include <f2c.h> */
-+#include <lapacke.h> 
- #define LAPACK_INT integer
- #define LAPACK_DOUBLE doublereal
- #endif  /*ifndef SKIP_LAPACK */
diff --git a/debian/patches/series b/debian/patches/series
index 8a9a701..3f76f8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-lapacke.patch
+clapack.patch

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