[Debian-astro-commits] [cpl-plugin-kmos] 02/03: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Wed Oct 12 08:21:56 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-kmos.
commit e050e97c9d99ac1b997726cc9e78de3a9c708ae8
Author: Ole Streicher <olebole at debian.org>
Date: Wed Oct 12 10:10:05 2016 +0200
Rediff patches
Added Disable-priv_reconstruct-patch-on-mips.patch: <REASON>
Added Force-serial-tests-to-get-better-verbose-output.patch: <REASON>
Added Remove-several-small-spelling-errors.patch: <REASON>
Added Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch: <REASON>
Added Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch: <REASON>
Added Replace-strcat-calls-with-size-checked-strncat-calls.patch: <REASON>
Added Disable-tests-that-require-test-data-from-the-ref_data-su.patch: <REASON>
Added Use-standard-path-and-name-for-cpl.patch: <REASON>
Added Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch: <REASON>
Dropped libadd_cpl.patch: <REASON>
Dropped set_plugindir.patch: <REASON>
Dropped spellfix.patch: <REASON>
Dropped fix_test_fail.patch: <REASON>
Dropped use-std-paths-for-cpl.patch: <REASON>
Dropped no_test_data.patch: <REASON>
Dropped force-serial-tests.patch: <REASON>
Dropped kmclipm_disable_test.patch: <REASON>
Dropped fortify.patch: <REASON>
---
...ries-to-the-recips.so-and-the-test-progr.patch} | 14 ++++++--
...> Disable-priv_reconstruct-patch-on-mips.patch} | 19 ++++++++---
...t-require-test-data-from-the-ref_data-su.patch} | 20 +++++++----
...erial-tests-to-get-better-verbose-output.patch} | 37 +++++++++++++-------
...ce-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch} | 14 ++++++--
... => Remove-several-small-spelling-errors.patch} | 39 ++++++++++++++--------
...at-calls-with-size-checked-strncat-calls.patch} | 20 +++++++----
...rectory-so-that-esorex-and-python-cpl-ca.patch} | 18 +++++++---
...ch => Use-standard-path-and-name-for-cpl.patch} | 28 +++++++++++-----
debian/patches/kmos_fix_test_fail.patch | 16 ---------
debian/patches/series | 18 +++++-----
11 files changed, 155 insertions(+), 88 deletions(-)
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
similarity index 93%
rename from debian/patches/libadd_cpl.patch
rename to debian/patches/Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
index bd92432..ef5478a 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Add the cpl libraries to the recips.so and the test program
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 12 Oct 2016 10:04:37 +0200
+Subject: Add the cpl libraries to the recips.so and the test program
+
+---
+ recipes/Makefile.am | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/recipes/Makefile.am b/recipes/Makefile.am
+index 9d7abde..5a82e72 100644
--- a/recipes/Makefile.am
+++ b/recipes/Makefile.am
-@@ -56,117 +56,117 @@
+@@ -56,117 +56,117 @@ plugin_LTLIBRARIES = kmo_arithmetic.la \
kmos_sky_tweak.la
kmo_arithmetic_la_SOURCES = kmo_arithmetic.c
diff --git a/debian/patches/kmclipm_disable_test.patch b/debian/patches/Disable-priv_reconstruct-patch-on-mips.patch
similarity index 52%
rename from debian/patches/kmclipm_disable_test.patch
rename to debian/patches/Disable-priv_reconstruct-patch-on-mips.patch
index 31a56c0..7054f8e 100644
--- a/debian/patches/kmclipm_disable_test.patch
+++ b/debian/patches/Disable-priv_reconstruct-patch-on-mips.patch
@@ -1,10 +1,19 @@
-Author; Ole Streicher <olebole at debian.org>
-Description: Disable priv_reconstruct patch on mips.
- This test takes ages on MIPS and goes beyound the time limits of the buildd without
- gaining anything.
+From: Debian Astronomy Maintainers
+ <debian-astro-maintainers at lists.alioth.debian.org>
+Date: Wed, 12 Oct 2016 10:04:37 +0200
+Subject: Disable priv_reconstruct patch on mips.
+
+This test takes ages on MIPS and goes beyound the time limits of the buildd
+without gaining anything.
+---
+ kmclipm/test/Makefile.am | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/kmclipm/test/Makefile.am b/kmclipm/test/Makefile.am
+index ed98158..5436149 100644
--- a/kmclipm/test/Makefile.am
+++ b/kmclipm/test/Makefile.am
-@@ -39,14 +39,7 @@
+@@ -39,14 +39,7 @@ pkginclude_HEADERS =
noinst_HEADERS =
diff --git a/debian/patches/no_test_data.patch b/debian/patches/Disable-tests-that-require-test-data-from-the-ref_data-su.patch
similarity index 68%
rename from debian/patches/no_test_data.patch
rename to debian/patches/Disable-tests-that-require-test-data-from-the-ref_data-su.patch
index 4ab67dd..dfe0b37 100644
--- a/debian/patches/no_test_data.patch
+++ b/debian/patches/Disable-tests-that-require-test-data-from-the-ref_data-su.patch
@@ -1,9 +1,17 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Disable tests that require test data from the ref_data subdir
- These data were removed from the tar file due to their huge size.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 12 Oct 2016 10:04:37 +0200
+Subject: Disable tests that require test data from the ref_data subdir
+
+These data were removed from the tar file due to their huge size.
+---
+ kmos/tests/Makefile.am | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/kmos/tests/Makefile.am b/kmos/tests/Makefile.am
+index cfaf133..f0e28d9 100644
--- a/kmos/tests/Makefile.am
+++ b/kmos/tests/Makefile.am
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = 1.8 foreign
DISTCLEANFILES = *~
@@ -12,7 +20,7 @@ Description: Disable tests that require test data from the ref_data subdir
if MAINTAINER_MODE
-@@ -36,8 +36,6 @@
+@@ -36,8 +36,6 @@ LDADD = $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(LIBKMOS)
# Test programs
check_PROGRAMS = \
kmo_cpl_extensions-test \
@@ -21,7 +29,7 @@ Description: Disable tests that require test data from the ref_data subdir
kmo_functions-test \
kmo_priv_arithmetic-test \
kmo_priv_combine-test \
-@@ -47,20 +45,13 @@
+@@ -47,20 +45,13 @@ check_PROGRAMS = \
kmo_priv_fit_profile-test \
kmo_priv_fits_check-test \
kmo_priv_fits_stack-test \
diff --git a/debian/patches/force-serial-tests.patch b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
similarity index 63%
rename from debian/patches/force-serial-tests.patch
rename to debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
index a100a67..ae21aa5 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
@@ -1,33 +1,46 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Force serial-tests to get better verbose output
-Bug: http://bugs.debian.org/715204
---- a/kmos/tests/Makefile.am
-+++ b/kmos/tests/Makefile.am
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 12 Oct 2016 10:04:37 +0200
+Subject: Force serial-tests to get better verbose output
+
+---
+ irplib/tests/Makefile.am | 2 +-
+ kmos/tests/Makefile.am | 2 +-
+ regtests/tests/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/irplib/tests/Makefile.am b/irplib/tests/Makefile.am
+index 3637ad7..e1d5dc8 100644
+--- a/irplib/tests/Makefile.am
++++ b/irplib/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 02111-1307 USA
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
DISTCLEANFILES = *~
---- a/regtests/tests/Makefile.am
-+++ b/regtests/tests/Makefile.am
+diff --git a/kmos/tests/Makefile.am b/kmos/tests/Makefile.am
+index f0e28d9..9388c50 100644
+--- a/kmos/tests/Makefile.am
++++ b/kmos/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.13 foreign serial-tests
DISTCLEANFILES = *~
---- a/irplib/tests/Makefile.am
-+++ b/irplib/tests/Makefile.am
+diff --git a/regtests/tests/Makefile.am b/regtests/tests/Makefile.am
+index d5ae540..0213f37 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., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
+ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
similarity index 60%
rename from debian/patches/fix_test_fail.patch
rename to debian/patches/Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
index 27692fd..e3e617d 100644
--- a/debian/patches/fix_test_fail.patch
+++ b/debian/patches/Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 12 Oct 2016 10:04:37 +0200
+Subject: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
+
+---
+ irplib/tests/irplib_polynomial-test.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/irplib/tests/irplib_polynomial-test.c b/irplib/tests/irplib_polynomial-test.c
+index ff57b29..08e7eda 100644
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
-@@ -567,16 +567,16 @@
+@@ -565,16 +565,16 @@ irplib_polynomial_test_root_all_macro(const cpl_vector * self, cpl_size nreal,
const double root = cpl_vector_get(roots, i);
const double residual = cpl_polynomial_eval_1d(p1d, root, NULL);
diff --git a/debian/patches/spellfix.patch b/debian/patches/Remove-several-small-spelling-errors.patch
similarity index 58%
rename from debian/patches/spellfix.patch
rename to debian/patches/Remove-several-small-spelling-errors.patch
index dd1daec..3666a2e 100644
--- a/debian/patches/spellfix.patch
+++ b/debian/patches/Remove-several-small-spelling-errors.patch
@@ -1,19 +1,17 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Remove several small spelling errors
---- a/recipes/kmos_wave_cal.c
-+++ b/recipes/kmos_wave_cal.c
-@@ -95,7 +95,7 @@
- "-----------------\n"
- "--order\n"
- "The polynomial order to use for the fit of the wavelength solution.\n"
--"0: (default) The appropriate order is choosen automatically depending on\n"
-+"0: (default) The appropriate order is chosen automatically depending on\n"
- "the waveband (4 for IZ band, 5 for HK, 6 for the others)\n"
- "\n"
- "ADVANCED PARAMETERS\n"
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 12 Oct 2016 10:04:37 +0200
+Subject: Remove several small spelling errors
+
+---
+ recipes/kmos_gen_reflines.c | 2 +-
+ recipes/kmos_wave_cal.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/recipes/kmos_gen_reflines.c b/recipes/kmos_gen_reflines.c
+index 239901f..a60994e 100644
--- a/recipes/kmos_gen_reflines.c
+++ b/recipes/kmos_gen_reflines.c
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ static char kmos_gen_reflines_description[] =
" IZ 1 0.966044 -1 1150 80 2000\n"
" IZ 1 1.04729 -1 1730 80 200\n"
" IZ 1 1.06765 2 128 40 80\n"
@@ -22,3 +20,16 @@ Description: Remove several small spelling errors
"This recipe produces 1 file:\n"
"First product: the table with the configuration for the model.\n" ;
+diff --git a/recipes/kmos_wave_cal.c b/recipes/kmos_wave_cal.c
+index 759bf3a..482aecd 100644
+--- a/recipes/kmos_wave_cal.c
++++ b/recipes/kmos_wave_cal.c
+@@ -95,7 +95,7 @@ static char kmos_wave_cal_description[] =
+ "-----------------\n"
+ "--order\n"
+ "The polynomial order to use for the fit of the wavelength solution.\n"
+-"0: (default) The appropriate order is choosen automatically depending on\n"
++"0: (default) The appropriate order is chosen automatically depending on\n"
+ "the waveband (4 for IZ band, 5 for HK, 6 for the others)\n"
+ "\n"
+ "ADVANCED PARAMETERS\n"
diff --git a/debian/patches/fortify.patch b/debian/patches/Replace-strcat-calls-with-size-checked-strncat-calls.patch
similarity index 74%
rename from debian/patches/fortify.patch
rename to debian/patches/Replace-strcat-calls-with-size-checked-strncat-calls.patch
index 8ca590f..83dc89b 100644
--- a/debian/patches/fortify.patch
+++ b/debian/patches/Replace-strcat-calls-with-size-checked-strncat-calls.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Replace strcat calls with size checked strncat calls
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 12 Oct 2016 10:04:37 +0200
+Subject: Replace strcat calls with size checked strncat calls
+
+---
+ recipes/kmo_stats.c | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/recipes/kmo_stats.c b/recipes/kmo_stats.c
+index 8f73059..d77d31d 100644
--- a/recipes/kmo_stats.c
+++ b/recipes/kmo_stats.c
-@@ -848,9 +848,10 @@
+@@ -848,9 +848,10 @@ static int kmo_stats(cpl_parameterlist *parlist, cpl_frameset *frameset)
sub_header = kmo_dfs_load_sub_header(frameset, STATS, extnr,
FALSE));
@@ -16,7 +24,7 @@ Description: Replace strcat calls with size checked strncat calls
cpl_propertylist_delete(sub_header); sub_header = NULL;
KMO_TRY_EXIT_IF_NULL(
-@@ -868,7 +869,7 @@
+@@ -868,7 +869,7 @@ static int kmo_stats(cpl_parameterlist *parlist, cpl_frameset *frameset)
tmp_str = cpl_sprintf(" - |"));
}
@@ -25,7 +33,7 @@ Description: Replace strcat calls with size checked strncat calls
cpl_free(tmp_str); tmp_str = NULL;
}
kmclipm_vector_delete(data_out); data_out = NULL;
-@@ -877,9 +878,10 @@
+@@ -877,9 +878,10 @@ static int kmo_stats(cpl_parameterlist *parlist, cpl_frameset *frameset)
KMO_TRY_EXIT_IF_NULL(
sub_header = kmo_dfs_load_sub_header(frameset, STATS,
extnr, TRUE));
@@ -39,7 +47,7 @@ Description: Replace strcat calls with size checked strncat calls
cpl_propertylist_delete(sub_header); sub_header = NULL;
KMO_TRY_EXIT_IF_NULL(
-@@ -898,7 +900,7 @@
+@@ -898,7 +900,7 @@ static int kmo_stats(cpl_parameterlist *parlist, cpl_frameset *frameset)
tmp_str = cpl_sprintf(" - |"));
}
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
similarity index 72%
rename from debian/patches/set_plugindir.patch
rename to debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
index f6f6db7..99df721 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Set the plugin directory so that esorex and python-cpl can find it.
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 12 Oct 2016 10:04:37 +0200
+Subject: Set the plugin directory so that esorex and python-cpl can find it.
+
+---
+ acinclude.m4 | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 276da17..b8de136 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -84,15 +84,15 @@
+@@ -84,15 +84,15 @@ AC_DEFUN([KMOS_SET_VERSION_INFO],
AC_DEFUN([KMOS_SET_PATHS],
[
if test -z "$plugindir"; then
@@ -21,7 +29,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
fi
if test -z "$privatelibdir"; then
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ AC_DEFUN([KMOS_SET_PATHS],
fi
if test -z "$wkfextradir"; then
@@ -30,7 +38,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
fi
if test -z "$wkfcopydir"; then
-@@ -122,7 +122,7 @@
+@@ -122,7 +122,7 @@ AC_DEFUN([KMOS_SET_PATHS],
# Define a preprocesor symbol for the plugin search paths
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/Use-standard-path-and-name-for-cpl.patch
similarity index 68%
rename from debian/patches/use-std-paths-for-cpl.patch
rename to debian/patches/Use-standard-path-and-name-for-cpl.patch
index 8306e2a..d8d8907 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/Use-standard-path-and-name-for-cpl.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use standard path and name for cpl
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 12 Oct 2016 10:04:37 +0200
+Subject: Use standard path and name for cpl
+
+---
+ m4macros/cpl.m4 | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/m4macros/cpl.m4 b/m4macros/cpl.m4
+index b0ec8ae..195022e 100644
--- a/m4macros/cpl.m4
+++ b/m4macros/cpl.m4
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_check_version="$1"
cpl_cfitsio_check_header="fitsio.h"
@@ -11,7 +19,7 @@ Description: Use standard path and name for cpl
cpl_cfitsio_incdirs=""
cpl_cfitsio_libdirs=""
-@@ -391,7 +391,7 @@
+@@ -395,7 +395,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
AC_MSG_CHECKING([for libcext])
cpl_cext_check_header="cxtypes.h"
@@ -20,16 +28,18 @@ Description: Use standard path and name for cpl
cpl_cext_incdirs=""
cpl_cext_libdirs=""
-@@ -604,7 +604,7 @@
+@@ -607,8 +607,8 @@ AC_DEFUN([CPL_CHECK_WCS],
+
cpl_wcs_check_version="$1"
- cpl_wcs_check_header="wcslib/wcslib.h"
+- cpl_wcs_check_header="wcslib.h"
- cpl_wcs_check_lib="libwcs.a"
++ cpl_wcs_check_header="wcslib/wcslib.h"
+ cpl_wcs_check_lib="libwcs.so"
cpl_wcs_includes=""
cpl_wcs_libraries=""
-@@ -836,8 +836,8 @@
+@@ -844,8 +844,8 @@ AC_DEFUN([CPL_CHECK_FFTW],
cpl_fftw_check_version="$1"
cpl_fftw_check_header="fftw3.h"
@@ -40,7 +50,7 @@ Description: Use standard path and name for cpl
cpl_fftw_includes=""
cpl_fftw_libraries=""
-@@ -1250,7 +1250,7 @@
+@@ -1270,7 +1270,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -49,7 +59,7 @@ Description: Use standard path and name for cpl
cpl_incdirs=""
cpl_libdirs=""
-@@ -1325,6 +1325,7 @@
+@@ -1345,6 +1345,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
cpl_libdirs="$cpl_libdirs /usr/local/lib"
cpl_libdirs="$cpl_libdirs /usr/local/lib32"
cpl_libdirs="$cpl_libdirs /usr/lib64"
diff --git a/debian/patches/kmos_fix_test_fail.patch b/debian/patches/kmos_fix_test_fail.patch
deleted file mode 100644
index 37d3e04..0000000
--- a/debian/patches/kmos_fix_test_fail.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Increase tolerance to fix FTBS on i386
---- a/kmos/tests/kmo_priv_arithmetic-test.c
-+++ b/kmos/tests/kmo_priv_arithmetic-test.c
-@@ -315,9 +315,9 @@
- kmo_test_fill_image(noise_img, 2.1, 0.2);
- kmo_arithmetic_3D_2D(cube1, img, noise_cube1, noise_img, "+");
- cpl_test_abs(cpl_image_get(cpl_imagelist_get(cube1, 2), 4, 99, &rej),
-- 31376, 2*tol);
-+ 31376, 1.0);
- cpl_test_abs(cpl_image_get(cpl_imagelist_get(noise_cube1, 2), 4, 99, &rej),
-- 2194.16, tol);
-+ 2194.16, 0.5);
-
- cpl_image_delete(img);
- cpl_image_delete(noise_img);
diff --git a/debian/patches/series b/debian/patches/series
index a5d423f..d46ed59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,9 @@
-libadd_cpl.patch
-set_plugindir.patch
-use-std-paths-for-cpl.patch
-no_test_data.patch
-fortify.patch
-spellfix.patch
-fix_test_fail.patch
-force-serial-tests.patch
-kmclipm_disable_test.patch
+Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
+Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
+Use-standard-path-and-name-for-cpl.patch
+Disable-tests-that-require-test-data-from-the-ref_data-su.patch
+Replace-strcat-calls-with-size-checked-strncat-calls.patch
+Remove-several-small-spelling-errors.patch
+Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
+Force-serial-tests-to-get-better-verbose-output.patch
+Disable-priv_reconstruct-patch-on-mips.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-kmos.git
More information about the Debian-astro-commits
mailing list