[Debian-astro-commits] [cpl-plugin-xsh] 03/05: Rediff patches

Ole Streicher olebole at moszumanska.debian.org
Sat Jul 30 07:59:52 UTC 2016


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

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

commit cbfae741a1d0b19386ebe90c4cbed67824377a2f
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Jul 30 09:50:26 2016 +0200

    Rediff patches
    
    Dropped Replace-clapack-by-lapack.patch: <REASON>
    Dropped Remove-isnan-int-test.patch: <REASON>
---
 ...serial-tests-to-get-better-verbose-output.patch |  4 +-
 debian/patches/Remove-isnan-int-test.patch         | 24 ------
 debian/patches/Replace-clapack-by-lapack.patch     | 97 ----------------------
 ...irectory-so-that-esorex-and-python-cpl-ca.patch |  4 +-
 debian/patches/series                              |  2 -
 5 files changed, 4 insertions(+), 127 deletions(-)

diff --git a/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
index 167db93..a292044 100644
--- a/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
+++ b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
@@ -8,7 +8,7 @@ Subject: Force serial-tests to get better verbose output
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/regtests/tests/Makefile.am b/regtests/tests/Makefile.am
-index 5edc193..dbeccd8 100644
+index d5ae540..0213f37 100644
 --- a/regtests/tests/Makefile.am
 +++ b/regtests/tests/Makefile.am
 @@ -17,7 +17,7 @@
@@ -21,7 +21,7 @@ index 5edc193..dbeccd8 100644
  DISTCLEANFILES = *~
  
 diff --git a/xsh/tests/Makefile.am b/xsh/tests/Makefile.am
-index 629cf73..ac413da 100644
+index d4033d8..a25c036 100644
 --- a/xsh/tests/Makefile.am
 +++ b/xsh/tests/Makefile.am
 @@ -17,7 +17,7 @@
diff --git a/debian/patches/Remove-isnan-int-test.patch b/debian/patches/Remove-isnan-int-test.patch
deleted file mode 100644
index 52f9dec..0000000
--- a/debian/patches/Remove-isnan-int-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Ole Streicher <olebole at debian.org>
-Date: Sat, 30 Jul 2016 09:34:14 +0200
-Subject: Remove isnan(int) test
-
-On Ubuntu, isnan() needs to be called with a floating point number, not an int. It also does not make sense to call it with int, since integers are never NaNs.
----
- xsh/xsh_utils_efficiency.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/xsh/xsh_utils_efficiency.c b/xsh/xsh_utils_efficiency.c
-index df49d20..6d6d1f2 100644
---- a/xsh/xsh_utils_efficiency.c
-+++ b/xsh/xsh_utils_efficiency.c
-@@ -1101,9 +1101,7 @@ xsh_efficiency_compute(cpl_frame* frm_sci,
-      } else {
-         cpl_table_insert(tot_eff,tbl_eff,neff_tot);
-      }
--     if(!isnan(nclip)) {
--        nclip_tot+=nclip;
--     }
-+     nclip_tot+=nclip;
-      //sprintf(name_eff,"eff_ord%d.fits",ord);
-      //check(cpl_table_save(tbl_eff,plist, x_plist,name_eff, CPL_IO_DEFAULT));
-   }
diff --git a/debian/patches/Replace-clapack-by-lapack.patch b/debian/patches/Replace-clapack-by-lapack.patch
deleted file mode 100644
index 8a64421..0000000
--- a/debian/patches/Replace-clapack-by-lapack.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From: Ole Streicher <olebole at debian.org>
-Date: Sat, 30 Jul 2016 09:34:14 +0200
-Subject: Replace clapack by lapack.
-
-Gnu Fortran uses the same calling interface as F2c. Therefore, just
-the C prototypes are needed. The only recipe using lapack is
-xsh_subtract_sky_single.
----
- acinclude.m4                  |  7 +++----
- xsh/xsh_subtract_sky_single.c | 27 ++++++++++++---------------
- 2 files changed, 15 insertions(+), 19 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 09f3bf7..b35c5df 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -7,7 +7,7 @@ AC_DEFUN([LIB_CHECK_LAPACK],
-     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=""
-@@ -53,8 +53,7 @@ AC_DEFUN([LIB_CHECK_LAPACK],
-             xsh_lapack_incdirs="$xsh_with_lapack_includes"
-         fi
- 
--        ESO_FIND_FILE($xsh_lapack_check_header, $xsh_lapack_incdirs,
--                      xsh_lapack_includes)
-+	xsh_lapack_includes=notneeded
- 
- 
-         # Check for the lapack library
-@@ -100,7 +99,7 @@ AC_DEFUN([LIB_CHECK_LAPACK],
-         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 lapacke not found]))
-         LIBS="$LIBS $LIBLAPACKC"
-         LIBLAPACK="$LIBLAPACKC"
-     else
-diff --git a/xsh/xsh_subtract_sky_single.c b/xsh/xsh_subtract_sky_single.c
-index 2ce9a7e..9d9f36f 100644
---- a/xsh/xsh_subtract_sky_single.c
-+++ b/xsh/xsh_subtract_sky_single.c
-@@ -71,14 +71,11 @@
-          * implements its own version of this type, which otherwise breaks
-          * complation. We do not however use the complex type in this source
-          * file so this workaround should be harmless. */
--        #ifdef complex
--                #undef complex
--        #endif
--        #define complex f2c_complex
- 
--	#include <f2c.h>
--	#include <clapack.h>
--#endif 
-+void spbtrf_(char *, int *, int *, float *, int *, int *);
-+void spbtrs_(char *, int *, int *, int *, const float *,
-+	     int *, float *,int *, int *);
-+#endif
- 
- #define REGDEBUG_MEDIAN_SPLINE 0
- /*-----------------------------------------------------------------------------
-@@ -325,12 +322,12 @@ xsh_fit_spline( xsh_wavemap_list * wave_list, int idx,
-       __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, 
-@@ -418,8 +415,8 @@ xsh_fit_spline( xsh_wavemap_list * wave_list, int idx,
-       }
- 		
-       /* Do the fit, by Cholesky decomposition, using Lapack functions sptrf and spdtrs */
--      err=spbtrf_(&uplo,&clpk_n,&kd,Xtp,&ldab,&info);
--      err=spbtrs_(&uplo,&clpk_n,&kd,&nrhs,Xtp,&ldab,c,&ldb,&info);
-+      spbtrf_(&uplo,&clpk_n,&kd,Xtp,&ldab,&info);
-+      spbtrs_(&uplo,&clpk_n,&kd,&nrhs,Xtp,&ldab,c,&ldb,&info);
- 		
-       /* Fill y with the predicted flux from the fit, over all values (using Bn_full) */
- 		
diff --git a/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch b/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
index c03b7d7..cee80b2 100644
--- a/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
+++ b/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
@@ -7,10 +7,10 @@ Subject: Set the plugin directory so that esorex and python-cpl can find it.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index 18725c5..09f3bf7 100644
+index 22d3053..3985f9e 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -211,7 +211,7 @@ AC_DEFUN([XSH_SET_PATHS],
+@@ -86,7 +86,7 @@ AC_DEFUN([XSH_SET_PATHS],
  [
  
      if test -z "$plugindir"; then
diff --git a/debian/patches/series b/debian/patches/series
index 78b2476..9fc3c93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
 Use-standard-path-and-name-for-cpl.patch
-Replace-clapack-by-lapack.patch
 Force-serial-tests-to-get-better-verbose-output.patch
 Add-missing-lcpldrs-to-xsh_cfg_recover-recipe.patch
 Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch
-Remove-isnan-int-test.patch

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



More information about the Debian-astro-commits mailing list