Commit faa0fee2 authored by Ole Streicher's avatar Ole Streicher

Rediff patches

Dropped use-std-paths-for-cpl.patch: <REASON>
parent ca8e2d51
Author: Ole Streicher
Description: Fix implicite function declaration
From: Ole Streicher <olebole@debian.org>
Date: Sun, 2 Jul 2017 10:54:38 +0200
Subject: Fix implicite function declaration
---
sinfoni/tests/test_atmo_disp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sinfoni/tests/test_atmo_disp.c b/sinfoni/tests/test_atmo_disp.c
index fbba183..bc57257 100644
--- a/sinfoni/tests/test_atmo_disp.c
+++ b/sinfoni/tests/test_atmo_disp.c
@@ -30,6 +30,7 @@
......
Author: Ole Streicher <olebole@debian.org>
Description: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
From: Ole Streicher <olebole@debian.org>
Date: Sun, 2 Jul 2017 10:54:38 +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 c27d167..d5cdf86 100644
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
@@ -567,16 +567,16 @@
@@ -579,16 +579,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);
......
Author: Ole Streicher <olebole@debian.org>
Description: Force serial-tests to get better verbose output
Bug: http://bugs.debian.org/715204
--- a/recipes/tests/Makefile.am
+++ b/recipes/tests/Makefile.am
From: Ole Streicher <olebole@debian.org>
Date: Sun, 2 Jul 2017 10:54:38 +0200
Subject: Force serial-tests to get better verbose output
---
irplib/tests/Makefile.am | 2 +-
recipes/tests/Makefile.am | 2 +-
regtests/tests/Makefile.am | 2 +-
sinfoni/tests/Makefile.am | 2 +-
4 files changed, 4 insertions(+), 4 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., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
......@@ -10,19 +20,23 @@ Bug: http://bugs.debian.org/715204
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
DISTCLEANFILES = *~ .logfile
DISTCLEANFILES = *~
--- a/sinfoni/tests/Makefile.am
+++ b/sinfoni/tests/Makefile.am
diff --git a/recipes/tests/Makefile.am b/recipes/tests/Makefile.am
index 5663e83..f58c0eb 100644
--- a/recipes/tests/Makefile.am
+++ b/recipes/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.6 foreign
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
DISTCLEANFILES = *~ .logfile
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 @@
......@@ -34,14 +48,16 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
--- a/irplib/tests/Makefile.am
+++ b/irplib/tests/Makefile.am
diff --git a/sinfoni/tests/Makefile.am b/sinfoni/tests/Makefile.am
index 3837777..2decd0f 100644
--- a/sinfoni/tests/Makefile.am
+++ b/sinfoni/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., 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 = *~ .logfile
set_plugindir.patch
use-std-paths-for-cpl.patch
explicite_function_declaration.patch
fix_test_fail.patch
force-serial-tests.patch
Author: Ole Streicher <olebole@debian.org>
Description: Set the plugin directory so that esorex and python-cpl can find it.
From: Ole Streicher <olebole@debian.org>
Date: Sun, 2 Jul 2017 10:54:38 +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 02b4b11..3e96b50 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -216,7 +216,7 @@
@@ -216,7 +216,7 @@ AC_DEFUN([SINFONI_SET_PATHS],
[
if test -z "$plugindir"; then
......
Author: Ole Streicher <olebole@debian.org>
Description: Use standard path and name for cpl
--- a/m4macros/cpl.m4
+++ b/m4macros/cpl.m4
@@ -8,7 +8,7 @@
cpl_cfitsio_check_version="$1"
cpl_cfitsio_check_header="fitsio.h"
- cpl_cfitsio_check_lib="libcfitsio.a"
+ cpl_cfitsio_check_lib="libcfitsio.so"
cpl_cfitsio_incdirs=""
cpl_cfitsio_libdirs=""
@@ -109,7 +109,7 @@
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
-
+ cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
test -n "$CFITSIODIR" && \
cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
$CFITSIODIR/lib32 $cpl_cfitsio_libdirs"
@@ -556,6 +556,7 @@
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
+ cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
test -n "$CPLDIR" && \
cpl_cext_libdirs="$CPLDIR/lib64 \
@@ -742,6 +743,7 @@
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
+ cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
test -n "$WCSDIR" && \
cpl_wcs_libdirs="$WCSDIR/lib64 \
@@ -976,6 +978,7 @@
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
+ cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
test -n "$FFTWDIR" && \
cpl_fftw_libdirs="$FFTWDIR/lib64 \
@@ -1314,7 +1317,7 @@
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
- cpl_check_cpl_lib="libcplcore.a"
+ cpl_check_cpl_lib="libcplcore.so"
cpl_incdirs=""
cpl_libdirs=""
@@ -1391,6 +1394,7 @@
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
+ cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
test -n "$CPLDIR" && \
cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment