[cpl-plugin-xsh] 15/15: Replace clapack by lapack

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-xsh.

commit 50b01fdd1d0cec08428a8de05832f1d7cb8a912e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Oct 30 12:24:01 2013 +0100

    Replace clapack by lapack
---
 debian/cpl-plugin-xsh.install |    3 ---
 debian/patches/lapack.patch   |   60 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |    1 +
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/debian/cpl-plugin-xsh.install b/debian/cpl-plugin-xsh.install
deleted file mode 100644
index 72c46a6..0000000
--- a/debian/cpl-plugin-xsh.install
+++ /dev/null
@@ -1,3 +0,0 @@
-calib/dic usr/share/cpl-plugins/xsh
-calib/gasgano usr/share/cpl-plugins/xsh
-reflex usr/share/cpl-plugins/xsh
diff --git a/debian/patches/lapack.patch b/debian/patches/lapack.patch
new file mode 100644
index 0000000..da9dc70
--- /dev/null
+++ b/debian/patches/lapack.patch
@@ -0,0 +1,60 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Replace clapack by lapack
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -7,7 +7,7 @@
+     AC_MSG_CHECKING([for lapack])
+ 
+     xsh_lapack_check_header="clapack.h"
+-    xsh_lapack_check_lib="libclapack.a"
++    xsh_lapack_check_lib="liblapack.so"
+ 
+     xsh_lapack_includes=""
+     xsh_lapack_libraries=""
+@@ -42,7 +42,7 @@
+         # Check for the lapack includes
+ 
+         if test -z "$xsh_with_lapack_includes"; then
+-            xsh_lapack_incdirs="/opt/clapack/include /usr/local/include /usr/include"
++            xsh_lapack_incdirs="/opt/clapack/include /usr/local/include /usr/include /usr/include/atlas"
+ 
+             test -n "$CPLDIR" && xsh_lapack_incdirs="$CPLDIR/include \
+                 $xsh_lapack_incdirs"
+@@ -100,7 +100,7 @@
+         LAPACK_LDFLAGS="-L$xsh_lapack_libraries"
+         LDFLAGS="$LDFLAGS $LAPACK_LDFLAGS"
+         CPPFLAGS="$CPPFLAGS $LAPACK_INCLUDES"
+-        AC_CHECK_LIB([clapack], [main], [LIBLAPACKC="-lclapack"], AC_MSG_ERROR([Library clapack not found]))
++        AC_CHECK_LIB([lapack], [main], [LIBLAPACKC="-llapack"], AC_MSG_ERROR([Library lapack not found]))
+         LIBS="$LIBS $LIBLAPACKC"
+         LIBLAPACK="$LIBLAPACKC"
+     else
+--- a/xsh/xsh_subtract_sky_single.c
++++ b/xsh/xsh_subtract_sky_single.c
+@@ -67,7 +67,6 @@
+ #ifdef DARWIN
+ 	#include <vecLib/clapack.h>
+ #else
+-	#include <f2c.h>
+ 	#include <clapack.h>
+ #endif 
+ 
+@@ -258,12 +257,12 @@
+       __CLPK_integer ldb=ncoeffs;
+       __CLPK_integer info=0;
+ #else
+-      integer clpk_n=ncoeffs;
+-      integer kd=ord_minus_1;
+-      integer nrhs=1;
+-      integer ldab=ord;
+-      integer ldb=ncoeffs;
+-      integer info=0;
++      int clpk_n=ncoeffs;
++      int kd=ord_minus_1;
++      int nrhs=1;
++      int ldab=ord;
++      int ldb=ncoeffs;
++      int info=0;
+ #endif
+ 
+       /* Fill the basis function (Bn) and flux (y) matrices for the fitted lambda, 
diff --git a/debian/patches/series b/debian/patches/series
index e2c2220..99f84a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 libadd_cpl.patch
 set_plugindir.patch
 use-std-paths-for-cpl.patch
+lapack.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-xsh.git