[Debian-astro-commits] [cpl-plugin-xsh] 01/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 94698ce71633dd23df792b79352fc74fa6914203
Author: Ole Streicher <olebole at debian.org>
Date: Sat Jul 30 09:36:43 2016 +0200
Rediff patches
Added Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch: <REASON>
Added Use-standard-path-and-name-for-cpl.patch: <REASON>
Added Replace-clapack-by-lapack.patch: <REASON>
Added Remove-isnan-int-test.patch: <REASON>
Added Force-serial-tests-to-get-better-verbose-output.patch: <REASON>
Added Add-missing-lcpldrs-to-xsh_cfg_recover-recipe.patch: <REASON>
Added Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch: <REASON>
Dropped set_plugindir.patch: <REASON>
Dropped lapack.patch: <REASON>
Dropped fix_hdr_endianess_fail.patch: <REASON>
Dropped remove_isnan_int.patch: <REASON>
Dropped force-serial-tests.patch: <REASON>
Dropped add_cpldrs.patch: <REASON>
Dropped use-std-paths-for-cpl.patch: <REASON>
---
...missing-lcpldrs-to-xsh_cfg_recover-recipe.patch | 21 +++++++++
...-of-cpl_size-passed-to-int-cpl_parameter.patch} | 15 +++++--
...erial-tests-to-get-better-verbose-output.patch} | 36 +++++++++------
debian/patches/Remove-isnan-int-test.patch | 24 ++++++++++
...apack.patch => Replace-clapack-by-lapack.patch} | 33 +++++++++-----
...irectory-so-that-esorex-and-python-cpl-ca.patch | 21 +++++++++
...ch => Use-standard-path-and-name-for-cpl.patch} | 51 +++++++++++++---------
debian/patches/add_cpldrs.patch | 13 ------
debian/patches/fix_test_fail.patch | 24 ----------
debian/patches/remove_isnan_int.patch | 18 --------
debian/patches/series | 14 +++---
debian/patches/set_plugindir.patch | 13 ------
12 files changed, 160 insertions(+), 123 deletions(-)
diff --git a/debian/patches/Add-missing-lcpldrs-to-xsh_cfg_recover-recipe.patch b/debian/patches/Add-missing-lcpldrs-to-xsh_cfg_recover-recipe.patch
new file mode 100644
index 0000000..0cdbc8e
--- /dev/null
+++ b/debian/patches/Add-missing-lcpldrs-to-xsh_cfg_recover-recipe.patch
@@ -0,0 +1,21 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 30 Jul 2016 09:34:14 +0200
+Subject: Add missing -lcpldrs to xsh_cfg_recover recipe
+
+---
+ recipes/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/recipes/Makefile.am b/recipes/Makefile.am
+index 53f1325..7f48574 100644
+--- a/recipes/Makefile.am
++++ b/recipes/Makefile.am
+@@ -72,7 +72,7 @@ plugin_LTLIBRARIES = xsh_cfg_recover.la \
+
+
+ xsh_cfg_recover_la_SOURCES = xsh_cfg_recover.c
+-xsh_cfg_recover_la_LIBADD = $(AM_LIBADD)
++xsh_cfg_recover_la_LIBADD = $(AM_LIBADD) $(LIBCPLDRS)
+
+
+ xsh_lingain_la_SOURCES = xsh_lingain.c
diff --git a/debian/patches/fix_hdr_endianess_fail.patch b/debian/patches/Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch
similarity index 63%
rename from debian/patches/fix_hdr_endianess_fail.patch
rename to debian/patches/Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch
index d18ea83..a690eea 100644
--- a/debian/patches/fix_hdr_endianess_fail.patch
+++ b/debian/patches/Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch
@@ -1,9 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix truncation of cpl_size passed to int cpl_parameter
-Bug: PIPE-5461
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 30 Jul 2016 09:34:14 +0200
+Subject: Fix truncation of cpl_size passed to int cpl_parameter
+
+---
+ hdrl/hdrl_flat.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hdrl/hdrl_flat.c b/hdrl/hdrl_flat.c
+index bd42a2b..73b0ae8 100644
--- a/hdrl/hdrl_flat.c
+++ b/hdrl/hdrl_flat.c
-@@ -272,12 +272,12 @@
+@@ -272,12 +272,12 @@ cpl_parameterlist * hdrl_flat_parameter_create_parlist(
/* --prefix.filter_size_x */
hdrl_setup_vparameter(parlist, prefix, ".", "", "filter-size-x", base_context,
"Smoothing filter size in x-direction.", CPL_TYPE_INT,
diff --git a/debian/patches/force-serial-tests.patch b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
similarity index 59%
rename from debian/patches/force-serial-tests.patch
rename to debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
index 8740296..167db93 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
@@ -1,25 +1,35 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Force serial-tests to get better verbose output
-Bug: http://bugs.debian.org/715204
---- a/xsh/tests/Makefile.am
-+++ b/xsh/tests/Makefile.am
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 30 Jul 2016 09:34:14 +0200
+Subject: Force serial-tests to get better verbose output
+
+---
+ regtests/tests/Makefile.am | 2 +-
+ xsh/tests/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/regtests/tests/Makefile.am b/regtests/tests/Makefile.am
+index 5edc193..dbeccd8 100644
+--- a/regtests/tests/Makefile.am
++++ b/regtests/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--AUTOMAKE_OPTIONS = 1.6 foreign
+-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
- DISTCLEANFILES = *~ *.dat *.dmp
+ DISTCLEANFILES = *~
---- a/regtests/tests/Makefile.am
-+++ b/regtests/tests/Makefile.am
+diff --git a/xsh/tests/Makefile.am b/xsh/tests/Makefile.am
+index 629cf73..ac413da 100644
+--- a/xsh/tests/Makefile.am
++++ b/xsh/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--AUTOMAKE_OPTIONS = 1.8 foreign
+-AUTOMAKE_OPTIONS = 1.6 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
- DISTCLEANFILES = *~
+ DISTCLEANFILES = *~ *.dat *.dmp
diff --git a/debian/patches/Remove-isnan-int-test.patch b/debian/patches/Remove-isnan-int-test.patch
new file mode 100644
index 0000000..52f9dec
--- /dev/null
+++ b/debian/patches/Remove-isnan-int-test.patch
@@ -0,0 +1,24 @@
+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/lapack.patch b/debian/patches/Replace-clapack-by-lapack.patch
similarity index 74%
rename from debian/patches/lapack.patch
rename to debian/patches/Replace-clapack-by-lapack.patch
index d67ac77..8a64421 100644
--- a/debian/patches/lapack.patch
+++ b/debian/patches/Replace-clapack-by-lapack.patch
@@ -1,10 +1,20 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: 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.
+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 @@
+@@ -7,7 +7,7 @@ AC_DEFUN([LIB_CHECK_LAPACK],
AC_MSG_CHECKING([for lapack])
xsh_lapack_check_header="clapack.h"
@@ -13,7 +23,7 @@ Description: Replace clapack by lapack.
xsh_lapack_includes=""
xsh_lapack_libraries=""
-@@ -53,8 +53,7 @@
+@@ -53,8 +53,7 @@ AC_DEFUN([LIB_CHECK_LAPACK],
xsh_lapack_incdirs="$xsh_with_lapack_includes"
fi
@@ -23,7 +33,7 @@ Description: Replace clapack by lapack.
# Check for the lapack library
-@@ -100,7 +99,7 @@
+@@ -100,7 +99,7 @@ AC_DEFUN([LIB_CHECK_LAPACK],
LAPACK_LDFLAGS="-L$xsh_lapack_libraries"
LDFLAGS="$LDFLAGS $LAPACK_LDFLAGS"
CPPFLAGS="$CPPFLAGS $LAPACK_INCLUDES"
@@ -32,6 +42,8 @@ Description: Replace clapack by lapack.
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 @@
@@ -42,11 +54,10 @@ Description: Replace clapack by lapack.
- #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 *);
@@ -54,7 +65,7 @@ Description: Replace clapack by lapack.
#define REGDEBUG_MEDIAN_SPLINE 0
/*-----------------------------------------------------------------------------
-@@ -325,12 +322,12 @@
+@@ -325,12 +322,12 @@ xsh_fit_spline( xsh_wavemap_list * wave_list, int idx,
__CLPK_integer ldb=ncoeffs;
__CLPK_integer info=0;
#else
@@ -73,7 +84,7 @@ Description: Replace clapack by lapack.
#endif
/* Fill the basis function (Bn) and flux (y) matrices for the fitted lambda,
-@@ -418,8 +415,8 @@
+@@ -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 */
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
new file mode 100644
index 0000000..c03b7d7
--- /dev/null
+++ b/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
@@ -0,0 +1,21 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 30 Jul 2016 09:34:14 +0200
+Subject: Set the plugin directory so that esorex and python-cpl can find it.
+
+---
+ acinclude.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 18725c5..09f3bf7 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -211,7 +211,7 @@ AC_DEFUN([XSH_SET_PATHS],
+ [
+
+ if test -z "$plugindir"; then
+- plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
++ plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
+ fi
+
+ if test -z "$privatelibdir"; then
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/Use-standard-path-and-name-for-cpl.patch
similarity index 81%
rename from debian/patches/use-std-paths-for-cpl.patch
rename to debian/patches/Use-standard-path-and-name-for-cpl.patch
index ac78a50..084e4af 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/Use-standard-path-and-name-for-cpl.patch
@@ -1,8 +1,17 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use standard path and name for cpl
---- a/m4macros/cpl.m4
-+++ b/m4macros/cpl.m4
-@@ -8,7 +8,7 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 30 Jul 2016 09:34:14 +0200
+Subject: Use standard path and name for cpl
+
+---
+ hdrl/m4macros/cpl.m4 | 10 +++++++---
+ m4macros/cpl.m4 | 10 +++++++---
+ 2 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/hdrl/m4macros/cpl.m4 b/hdrl/m4macros/cpl.m4
+index 956b580..2246010 100644
+--- a/hdrl/m4macros/cpl.m4
++++ b/hdrl/m4macros/cpl.m4
+@@ -9,7 +9,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_check_version="$1"
cpl_cfitsio_check_header="fitsio.h"
@@ -11,7 +20,7 @@ Description: Use standard path and name for cpl
cpl_cfitsio_incdirs=""
cpl_cfitsio_libdirs=""
-@@ -109,7 +109,7 @@
+@@ -110,7 +110,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
@@ -20,7 +29,7 @@ Description: Use standard path and name for cpl
test -n "$CFITSIODIR" && \
cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
$CFITSIODIR/lib32 $cpl_cfitsio_libdirs"
-@@ -556,6 +556,7 @@
+@@ -492,6 +492,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
@@ -28,7 +37,7 @@ Description: Use standard path and name for cpl
test -n "$CPLDIR" && \
cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -742,6 +743,7 @@
+@@ -678,6 +679,7 @@ AC_DEFUN([CPL_CHECK_WCS],
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
@@ -36,7 +45,7 @@ Description: Use standard path and name for cpl
test -n "$WCSDIR" && \
cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -976,6 +978,7 @@
+@@ -912,6 +914,7 @@ AC_DEFUN([CPL_CHECK_FFTW],
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
@@ -44,7 +53,7 @@ Description: Use standard path and name for cpl
test -n "$FFTWDIR" && \
cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1314,7 +1317,7 @@
+@@ -1250,7 +1253,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -53,7 +62,7 @@ Description: Use standard path and name for cpl
cpl_incdirs=""
cpl_libdirs=""
-@@ -1391,6 +1394,7 @@
+@@ -1327,6 +1330,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
@@ -61,9 +70,11 @@ Description: Use standard path and name for cpl
test -n "$CPLDIR" && \
cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \
---- a/hdrl/m4macros/cpl.m4
-+++ b/hdrl/m4macros/cpl.m4
-@@ -9,7 +9,7 @@
+diff --git a/m4macros/cpl.m4 b/m4macros/cpl.m4
+index e1a27c1..72d9f6c 100644
+--- a/m4macros/cpl.m4
++++ b/m4macros/cpl.m4
+@@ -8,7 +8,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_check_version="$1"
cpl_cfitsio_check_header="fitsio.h"
@@ -72,7 +83,7 @@ Description: Use standard path and name for cpl
cpl_cfitsio_incdirs=""
cpl_cfitsio_libdirs=""
-@@ -110,7 +110,7 @@
+@@ -109,7 +109,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
@@ -81,7 +92,7 @@ Description: Use standard path and name for cpl
test -n "$CFITSIODIR" && \
cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
$CFITSIODIR/lib32 $cpl_cfitsio_libdirs"
-@@ -492,6 +492,7 @@
+@@ -556,6 +556,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
@@ -89,7 +100,7 @@ Description: Use standard path and name for cpl
test -n "$CPLDIR" && \
cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -678,6 +679,7 @@
+@@ -742,6 +743,7 @@ AC_DEFUN([CPL_CHECK_WCS],
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
@@ -97,7 +108,7 @@ Description: Use standard path and name for cpl
test -n "$WCSDIR" && \
cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -912,6 +914,7 @@
+@@ -976,6 +978,7 @@ AC_DEFUN([CPL_CHECK_FFTW],
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
@@ -105,7 +116,7 @@ Description: Use standard path and name for cpl
test -n "$FFTWDIR" && \
cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1250,7 +1253,7 @@
+@@ -1314,7 +1317,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -114,7 +125,7 @@ Description: Use standard path and name for cpl
cpl_incdirs=""
cpl_libdirs=""
-@@ -1327,6 +1330,7 @@
+@@ -1391,6 +1394,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
diff --git a/debian/patches/add_cpldrs.patch b/debian/patches/add_cpldrs.patch
deleted file mode 100644
index 62c412b..0000000
--- a/debian/patches/add_cpldrs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Add missing -lcpldrs to xsh_cfg_recover recipe
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -72,7 +72,7 @@
-
-
- xsh_cfg_recover_la_SOURCES = xsh_cfg_recover.c
--xsh_cfg_recover_la_LIBADD = $(AM_LIBADD)
-+xsh_cfg_recover_la_LIBADD = $(AM_LIBADD) $(LIBCPLDRS)
-
-
- xsh_lingain_la_SOURCES = xsh_lingain.c
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
deleted file mode 100644
index 27692fd..0000000
--- a/debian/patches/fix_test_fail.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
---- a/irplib/tests/irplib_polynomial-test.c
-+++ b/irplib/tests/irplib_polynomial-test.c
-@@ -567,16 +567,16 @@
- const double root = cpl_vector_get(roots, i);
- const double residual = cpl_polynomial_eval_1d(p1d, root, NULL);
-
-- cpl_test_abs(root, cpl_vector_get(self, i), tolerance);
-+ cpl_test_abs(root, cpl_vector_get(self, i), 2*tolerance);
-
-- cpl_test_abs(residual, 0.0, resitol);
-+ cpl_test_abs(residual, 0.0, 2*resitol);
-
- }
-
- for (i = nreal; i < degree; i++) {
- const double root = cpl_vector_get(roots, i);
-
-- cpl_test_abs(root, cpl_vector_get(self, i), tolerance);
-+ cpl_test_abs(root, cpl_vector_get(self, i), 2*tolerance);
-
- /* FIXME: Verify residual as well */
-
diff --git a/debian/patches/remove_isnan_int.patch b/debian/patches/remove_isnan_int.patch
deleted file mode 100644
index 1297d21..0000000
--- a/debian/patches/remove_isnan_int.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: 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.
---- a/xsh/xsh_utils_efficiency.c
-+++ b/xsh/xsh_utils_efficiency.c
-@@ -1101,9 +1101,7 @@
- } 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/series b/debian/patches/series
index a21aef9..78b2476 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
-set_plugindir.patch
-use-std-paths-for-cpl.patch
-lapack.patch
-force-serial-tests.patch
-add_cpldrs.patch
-fix_hdr_endianess_fail.patch
-remove_isnan_int.patch
+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
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
deleted file mode 100644
index 6f90ffd..0000000
--- a/debian/patches/set_plugindir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Set the plugin directory so that esorex and python-cpl can find it.
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -211,7 +211,7 @@
- [
-
- if test -z "$plugindir"; then
-- plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
-+ plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
- fi
-
- if test -z "$privatelibdir"; then
--
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