[Debian-astro-commits] [cpl-plugin-vimos] 01/05: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Fri Jul 8 07:45:42 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-vimos.
commit 1c4f435b9747bb17b4cd58b6575fe6ed30bb8221
Author: Ole Streicher <olebole at debian.org>
Date: Fri Jul 8 09:30:22 2016 +0200
Rediff patches
Added 0005-Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-.patch: <REASON>
Added 0004-Use-the-system-provided-sextractor-binary-instead-of.patch: <REASON>
Added 0008-Define-XOPEN-to-explicitely-declare-tempnam-Otherwis.patch: <REASON>
Added 0003-Make-the-pil-library-private-since-it-should-only-be.patch: <REASON>
Added 0006-Force-serial-tests-to-get-better-verbose-output.patch: <REASON>
Added 0007-fix-truncation-of-cpl_size-passed-to-int-cpl_paramet.patch: <REASON>
Added 0002-Use-standard-path-and-name-for-cpl.patch: <REASON>
Dropped private_libpil.patch: <REASON>
Dropped dont_build_sextractor.patch: <REASON>
Dropped fix_hdr_endianess_fail.patch: <REASON>
Dropped tempnam.patch: <REASON>
Dropped fix_test_fail.patch: <REASON>
Dropped use-std-paths-for-cpl.patch: <REASON>
Dropped force-serial-tests.patch: <REASON>
---
... 0002-Use-standard-path-and-name-for-cpl.patch} | 47 +++++++++++-------
...-library-private-since-it-should-only-be.patch} | 48 ++++++++++++-------
...em-provided-sextractor-binary-instead-of.patch} | 56 ++++++++++++++--------
...erance-to-fix-FTBS-on-mips-mipsel64-and-.patch} | 14 ++++--
...erial-tests-to-get-better-verbose-output.patch} | 38 ++++++++++-----
...on-of-cpl_size-passed-to-int-cpl_paramet.patch} | 10 ++--
...N-to-explicitely-declare-tempnam-Otherwis.patch | 24 ++++++++++
debian/patches/series | 14 +++---
debian/patches/set_plugindir.patch | 14 ++++--
debian/patches/tempnam.patch | 16 -------
10 files changed, 180 insertions(+), 101 deletions(-)
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/0002-Use-standard-path-and-name-for-cpl.patch
similarity index 79%
rename from debian/patches/use-std-paths-for-cpl.patch
rename to debian/patches/0002-Use-standard-path-and-name-for-cpl.patch
index c0b9a57..2303bf8 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/0002-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: Fri, 8 Jul 2016 09:28:16 +0200
+Subject: Use standard path and name for cpl
+
+---
+ libpil/m4macros/cpl.m4 | 9 ++++++---
+ m4macros/cpl.m4 | 9 ++++++---
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/libpil/m4macros/cpl.m4 b/libpil/m4macros/cpl.m4
+index e1a27c1..d302edb 100644
+--- a/libpil/m4macros/cpl.m4
++++ b/libpil/m4macros/cpl.m4
+@@ -8,7 +8,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,6 +109,7 @@
+@@ -109,6 +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"
@@ -19,7 +28,7 @@ Description: Use standard path and name for cpl
test -n "$CFITSIODIR" && \
cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
-@@ -455,7 +456,7 @@
+@@ -455,7 +456,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
AC_MSG_CHECKING([for libcext])
cpl_cext_check_header="cxtypes.h"
@@ -28,7 +37,7 @@ Description: Use standard path and name for cpl
cpl_cext_incdirs=""
cpl_cext_libdirs=""
-@@ -556,6 +557,7 @@
+@@ -556,6 +557,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"
@@ -36,7 +45,7 @@ Description: Use standard path and name for cpl
test -n "$CPLDIR" && \
cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -1314,7 +1316,7 @@
+@@ -1314,7 +1316,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -45,7 +54,7 @@ Description: Use standard path and name for cpl
cpl_incdirs=""
cpl_libdirs=""
-@@ -1388,6 +1390,7 @@
+@@ -1388,6 +1390,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
cpl_libdirs="$cpl_libdirs /usr/local/lib64"
cpl_libdirs="$cpl_libdirs /usr/local/lib"
cpl_libdirs="$cpl_libdirs /usr/local/lib32"
@@ -53,9 +62,11 @@ Description: Use standard path and name for cpl
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
---- a/libpil/m4macros/cpl.m4
-+++ b/libpil/m4macros/cpl.m4
-@@ -8,7 +8,7 @@
+diff --git a/m4macros/cpl.m4 b/m4macros/cpl.m4
+index e1a27c1..d302edb 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"
@@ -64,7 +75,7 @@ Description: Use standard path and name for cpl
cpl_cfitsio_incdirs=""
cpl_cfitsio_libdirs=""
-@@ -109,6 +109,7 @@
+@@ -109,6 +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"
@@ -72,7 +83,7 @@ Description: Use standard path and name for cpl
test -n "$CFITSIODIR" && \
cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
-@@ -455,7 +456,7 @@
+@@ -455,7 +456,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
AC_MSG_CHECKING([for libcext])
cpl_cext_check_header="cxtypes.h"
@@ -81,7 +92,7 @@ Description: Use standard path and name for cpl
cpl_cext_incdirs=""
cpl_cext_libdirs=""
-@@ -556,6 +557,7 @@
+@@ -556,6 +557,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 \
-@@ -1314,7 +1316,7 @@
+@@ -1314,7 +1316,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -98,7 +109,7 @@ Description: Use standard path and name for cpl
cpl_incdirs=""
cpl_libdirs=""
-@@ -1388,6 +1390,7 @@
+@@ -1388,6 +1390,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
cpl_libdirs="$cpl_libdirs /usr/local/lib64"
cpl_libdirs="$cpl_libdirs /usr/local/lib"
cpl_libdirs="$cpl_libdirs /usr/local/lib32"
diff --git a/debian/patches/private_libpil.patch b/debian/patches/0003-Make-the-pil-library-private-since-it-should-only-be.patch
similarity index 93%
rename from debian/patches/private_libpil.patch
rename to debian/patches/0003-Make-the-pil-library-private-since-it-should-only-be.patch
index c25e8aa..c419b1a 100644
--- a/debian/patches/private_libpil.patch
+++ b/debian/patches/0003-Make-the-pil-library-private-since-it-should-only-be.patch
@@ -1,9 +1,32 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Make the "pil" library private since it should only be used
- by this pipeline.
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 8 Jul 2016 09:28:16 +0200
+Subject: Make the "pil" library private since it should only be used by this
+ pipeline.
+
+---
+ acinclude.m4 | 2 +-
+ libpil/acinclude.m4 | 5 +++
+ recipes/Makefile.am | 104 ++++++++++++++++++++++++++--------------------------
+ 3 files changed, 58 insertions(+), 53 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index b77de13..54e0d1f 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -123,7 +123,7 @@ AC_DEFUN([VIMOS_SET_PATHS],
+ fi
+
+ if test -z "$privatelibdir"; then
+- privatelibdir='${libdir}/${PACKAGE}-${VERSION}'
++ privatelibdir='${libdir}/vimos'
+ fi
+
+ if test -z "$pipedocsdir"; then
+diff --git a/libpil/acinclude.m4 b/libpil/acinclude.m4
+index fd64d9b..5f7ae2f 100644
--- a/libpil/acinclude.m4
+++ b/libpil/acinclude.m4
-@@ -109,6 +109,10 @@
+@@ -109,6 +109,10 @@ AC_DEFUN([LIBPIL_SET_PATHS],
pilprivatelibdir='${libdir}/${PACKAGE}-${VERSION}'
fi
@@ -14,27 +37,18 @@ Description: Make the "pil" library private since it should only be used
if test x"$includedir" = x'${prefix}/include'; then
includedir='${prefix}/include/pil'
fi
-@@ -129,5 +133,6 @@
+@@ -129,5 +133,6 @@ AC_DEFUN([LIBPIL_SET_PATHS],
AC_SUBST(pilprivatelibdir)
AC_SUBST(pipedocsdir)
AC_SUBST(apidocdir)
+ AC_SUBST(privatelibdir)
])
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -123,7 +123,7 @@
- fi
-
- if test -z "$privatelibdir"; then
-- privatelibdir='${libdir}/${PACKAGE}-${VERSION}'
-+ privatelibdir='${libdir}/vimos'
- fi
-
- if test -z "$pipedocsdir"; then
+diff --git a/recipes/Makefile.am b/recipes/Makefile.am
+index e0ef853..9dfd6bd 100644
--- a/recipes/Makefile.am
+++ b/recipes/Makefile.am
-@@ -57,139 +57,139 @@
+@@ -57,139 +57,139 @@ plugin_LTLIBRARIES = vmbias.la vmdark.la vmdet.la vmimcalphot.la \
endif
vmbias_la_SOURCES = vmbias.cc
diff --git a/debian/patches/dont_build_sextractor.patch b/debian/patches/0004-Use-the-system-provided-sextractor-binary-instead-of.patch
similarity index 58%
rename from debian/patches/dont_build_sextractor.patch
rename to debian/patches/0004-Use-the-system-provided-sextractor-binary-instead-of.patch
index d7fd372..9b2485b 100644
--- a/debian/patches/dont_build_sextractor.patch
+++ b/debian/patches/0004-Use-the-system-provided-sextractor-binary-instead-of.patch
@@ -1,25 +1,19 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use the system provided sextractor binary
- instead of the convenience copy
---- a/external/Makefile.am
-+++ b/external/Makefile.am
-@@ -24,10 +24,10 @@
-
- COMPILE_FIRST =
-
--TOPSUBDIRS = libwcs sextractor
-+TOPSUBDIRS = libwcs
-
--COMPILE_LAST = $(PSFEXDIR)
-+COMPILE_LAST =
-
- SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) $(COMPILE_LAST)
-
--DIST_SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) psfex
-+DIST_SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS)
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 8 Jul 2016 09:28:16 +0200
+Subject: Use the system provided sextractor binary instead of the convenience
+ copy
+
+---
+ acinclude.m4 | 2 +-
+ configure.ac | 2 +-
+ external/Makefile.am | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 54e0d1f..384360e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -172,7 +172,7 @@
+@@ -172,7 +172,7 @@ AC_DEFUN([VIMOS_SET_PATHS],
# Define the preprocessor symbols for the sextractor executable
# and the configuration files.
@@ -28,9 +22,11 @@ Description: Use the system provided sextractor binary
AC_DEFINE_UNQUOTED(VIMOS_SEXTRACTOR_PATH, "$sext_bindir",
[Absolute path to the sextractor executable])
+diff --git a/configure.ac b/configure.ac
+index c4e4a9a..8041047 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -127,7 +127,7 @@
+@@ -127,7 +127,7 @@ VIMOS_SET_SEX_PREFIX
VIMOS_SET_PSFEX_PREFIX
@@ -39,3 +35,21 @@ Description: Use the system provided sextractor binary
AC_CONFIG_FILES(Makefile
Makefile.purify
+diff --git a/external/Makefile.am b/external/Makefile.am
+index a6853b3..f112b5f 100644
+--- a/external/Makefile.am
++++ b/external/Makefile.am
+@@ -24,10 +24,10 @@ DISTCLEANFILES = *~
+
+ COMPILE_FIRST =
+
+-TOPSUBDIRS = libwcs sextractor
++TOPSUBDIRS = libwcs
+
+-COMPILE_LAST = $(PSFEXDIR)
++COMPILE_LAST =
+
+ SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) $(COMPILE_LAST)
+
+-DIST_SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) psfex
++DIST_SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS)
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/0005-Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-.patch
similarity index 60%
rename from debian/patches/fix_test_fail.patch
rename to debian/patches/0005-Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-.patch
index 27692fd..fa566a6 100644
--- a/debian/patches/fix_test_fail.patch
+++ b/debian/patches/0005-Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-.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: Fri, 8 Jul 2016 09:28:16 +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 5bbd3ff..a67028d 100644
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
-@@ -567,16 +567,16 @@
+@@ -567,16 +567,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/force-serial-tests.patch b/debian/patches/0006-Force-serial-tests-to-get-better-verbose-output.patch
similarity index 65%
rename from debian/patches/force-serial-tests.patch
rename to debian/patches/0006-Force-serial-tests-to-get-better-verbose-output.patch
index 380de28..48159fa 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/0006-Force-serial-tests-to-get-better-verbose-output.patch
@@ -1,19 +1,31 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Force serial-tests to get better verbose output
-Bug: http://bugs.debian.org/715204
---- a/libpil/tests/Makefile.am
-+++ b/libpil/tests/Makefile.am
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 8 Jul 2016 09:28:16 +0200
+Subject: Force serial-tests to get better verbose output
+
+---
+ irplib/tests/Makefile.am | 2 +-
+ libpil/tests/Makefile.am | 2 +-
+ regtests/tests/Makefile.am | 2 +-
+ tests/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/irplib/tests/Makefile.am b/irplib/tests/Makefile.am
+index 1377c13..01a9c33 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/tests/Makefile.am
-+++ b/tests/Makefile.am
+diff --git a/libpil/tests/Makefile.am b/libpil/tests/Makefile.am
+index 9c4b57b..08efcec 100644
+--- a/libpil/tests/Makefile.am
++++ b/libpil/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
@@ -23,6 +35,8 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
+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 @@
@@ -34,11 +48,13 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
---- a/irplib/tests/Makefile.am
-+++ b/irplib/tests/Makefile.am
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 020cfbe..b3c23c0 100644
+--- a/tests/Makefile.am
++++ b/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.13 foreign serial-tests
diff --git a/debian/patches/fix_hdr_endianess_fail.patch b/debian/patches/0007-fix-truncation-of-cpl_size-passed-to-int-cpl_paramet.patch
similarity index 86%
rename from debian/patches/fix_hdr_endianess_fail.patch
rename to debian/patches/0007-fix-truncation-of-cpl_size-passed-to-int-cpl_paramet.patch
index dffd9bb..de09dfc 100644
--- a/debian/patches/fix_hdr_endianess_fail.patch
+++ b/debian/patches/0007-fix-truncation-of-cpl_size-passed-to-int-cpl_paramet.patch
@@ -1,17 +1,17 @@
-From 8b10fccf58c54f51d3d13ad8c4b331c1ba260a49 Mon Sep 17 00:00:00 2001
From: jtaylor <jtaylor at 318c8218-2dab-440d-9263-6f70bac63e5b>
Date: Fri, 10 Oct 2014 08:24:55 +0000
-Subject: [PATCH] fix truncation of cpl_size passed to int cpl_parameter
- (PIPE-5461)
+Subject: fix truncation of cpl_size passed to int cpl_parameter (PIPE-5461)
git-svn-id: http://svnhq2.hq.eso.org/p2/trunk/Pipelines/common/hdrl@166234 318c8218-2dab-440d-9263-6f70bac63e5b
---
- hdrl_utils.c | 8 ++++----
+ mosca/hdrl/hdrl_utils.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
+diff --git a/mosca/hdrl/hdrl_utils.c b/mosca/hdrl/hdrl_utils.c
+index faa8a77..0e37fff 100644
--- a/mosca/hdrl/hdrl_utils.c
+++ b/mosca/hdrl/hdrl_utils.c
-@@ -294,24 +294,24 @@
+@@ -294,24 +294,24 @@ cpl_parameterlist * hdrl_rect_region_parameter_create_parlist(
hdrl_setup_vparameter(parlist, prefix, ".", name_prefix,
"llx", base_context,
"Lower left x pos. (FITS) defining the region",
diff --git a/debian/patches/0008-Define-XOPEN-to-explicitely-declare-tempnam-Otherwis.patch b/debian/patches/0008-Define-XOPEN-to-explicitely-declare-tempnam-Otherwis.patch
new file mode 100644
index 0000000..6296191
--- /dev/null
+++ b/debian/patches/0008-Define-XOPEN-to-explicitely-declare-tempnam-Otherwis.patch
@@ -0,0 +1,24 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 8 Jul 2016 09:28:16 +0200
+Subject: Define XOPEN to explicitely declare tempnam() Otherwise,
+ tempnam gets the default "int" return value which will breakcause an
+ implicit pointer conversion that may fail since sizeof(int) != sizeof(void
+ *).
+
+---
+ vimos/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vimos/Makefile.am b/vimos/Makefile.am
+index 8b4cbfe..1280cc9 100644
+--- a/vimos/Makefile.am
++++ b/vimos/Makefile.am
+@@ -29,7 +29,7 @@ MAINTAINERCLEANFILES = Makefile.in
+ endif
+
+
+-AM_CPPFLAGS = $(HDRL_INCLUDES) $(MOSCA_INCLUDES) $(GSL_CFLAGS) $(all_includes)
++AM_CPPFLAGS = -D_XOPEN_SOURCE $(HDRL_INCLUDES) $(MOSCA_INCLUDES) $(GSL_CFLAGS) $(all_includes)
+
+ pkginclude_HEADERS = vmadf.h vmadfifutable.h vmastrometrictable.h \
+ vmccdtable.h vmcpl.h vmcube.h vmdetector.h vmdistmodels.h \
diff --git a/debian/patches/series b/debian/patches/series
index b4c3edf..0a24853 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
set_plugindir.patch
-use-std-paths-for-cpl.patch
-private_libpil.patch
-dont_build_sextractor.patch
-fix_test_fail.patch
-force-serial-tests.patch
-fix_hdr_endianess_fail.patch
-tempnam.patch
+0002-Use-standard-path-and-name-for-cpl.patch
+0003-Make-the-pil-library-private-since-it-should-only-be.patch
+0004-Use-the-system-provided-sextractor-binary-instead-of.patch
+0005-Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-.patch
+0006-Force-serial-tests-to-get-better-verbose-output.patch
+0007-fix-truncation-of-cpl_size-passed-to-int-cpl_paramet.patch
+0008-Define-XOPEN-to-explicitely-declare-tempnam-Otherwis.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 7dccd13..9abd27d 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.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: Fri, 8 Jul 2016 09:28:16 +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 d179ba4..b77de13 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -119,7 +119,7 @@
+@@ -119,7 +119,7 @@ AC_DEFUN([VIMOS_SET_PATHS],
[
if test -z "$plugindir"; then
diff --git a/debian/patches/tempnam.patch b/debian/patches/tempnam.patch
deleted file mode 100644
index fe38cb8..0000000
--- a/debian/patches/tempnam.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Define XOPEN to explicitely declare tempnam()
- Otherwise, tempnam gets the default "int" return value which will breakcause
- an implicit pointer conversion that may fail since
- sizeof(int) != sizeof(void *).
---- a/vimos/Makefile.am
-+++ b/vimos/Makefile.am
-@@ -29,7 +29,7 @@
- endif
-
-
--AM_CPPFLAGS = $(HDRL_INCLUDES) $(MOSCA_INCLUDES) $(GSL_CFLAGS) $(all_includes)
-+AM_CPPFLAGS = -D_XOPEN_SOURCE $(HDRL_INCLUDES) $(MOSCA_INCLUDES) $(GSL_CFLAGS) $(all_includes)
-
- pkginclude_HEADERS = vmadf.h vmadfifutable.h vmastrometrictable.h \
- vmccdtable.h vmcpl.h vmcube.h vmdetector.h vmdistmodels.h \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-vimos.git
More information about the Debian-astro-commits
mailing list