[Debian-astro-commits] [cpl-plugin-fors] 02/03: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Tue Nov 8 21:50: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-fors.
commit 6891f9044c3e2517967a6f067b62443a98ac264d
Author: Ole Streicher <olebole at debian.org>
Date: Tue Nov 8 22:43:03 2016 +0100
Rediff patches
---
debian/patches/disable_tests_libmosca.patch | 14 +++++++---
debian/patches/dont_build_sextractor.patch | 26 +++++++++++++-----
debian/patches/fix_hdr_endianess_fail.patch | 10 +++----
debian/patches/fix_test_fail.patch | 14 +++++++---
debian/patches/force-serial-tests.patch | 41 +++++++++++++++++++----------
debian/patches/libadd_cpl.patch | 14 +++++++---
debian/patches/set_plugindir.patch | 25 +++++++++++++-----
debian/patches/use-std-paths-for-cpl.patch | 26 +++++++++++-------
8 files changed, 120 insertions(+), 50 deletions(-)
diff --git a/debian/patches/disable_tests_libmosca.patch b/debian/patches/disable_tests_libmosca.patch
index c106ab9..4a4aecf 100644
--- a/debian/patches/disable_tests_libmosca.patch
+++ b/debian/patches/disable_tests_libmosca.patch
@@ -1,9 +1,17 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: The libmosca testsuite is buggy (driver problem),
+From: Ole Streicher <olebole at debian.org>
+Date: Tue, 8 Nov 2016 22:23:20 +0100
+Subject: The libmosca testsuite is buggy (driver problem),
so we just disable it until it gets fixed.
+
+---
+ mosca/libmosca/tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mosca/libmosca/tests/Makefile.am b/mosca/libmosca/tests/Makefile.am
+index 7585263..29ec590 100644
--- a/mosca/libmosca/tests/Makefile.am
+++ b/mosca/libmosca/tests/Makefile.am
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ AM_LDFLAGS = $(HDRL_LDFLAGS) $(CPL_LDFLAGS)
LDADD = $(HDRL_LIBS) $(LIBMOSCA) $(LIBCPLCORE) $(LIBCPLUI) \
$(BOOST_UNIT_TEST_FRAMEWORK_LIB)
diff --git a/debian/patches/dont_build_sextractor.patch b/debian/patches/dont_build_sextractor.patch
index ea5c1ef..885a15d 100644
--- a/debian/patches/dont_build_sextractor.patch
+++ b/debian/patches/dont_build_sextractor.patch
@@ -1,9 +1,19 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use the system provided sextractor binary
- instead of the convenience copy
+From: Ole Streicher <olebole at debian.org>
+Date: Tue, 8 Nov 2016 22:23:20 +0100
+Subject: Use the system provided sextractor binary instead of the convenience
+ copy
+
+---
+ Makefile.am | 2 +-
+ acinclude.m4 | 2 +-
+ configure.ac | 3 ---
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 553db32..d9cf679 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ ACLOCAL_AMFLAGS = -I m4macros
DISTCLEANFILES = *~
@@ -12,9 +22,11 @@ Description: Use the system provided sextractor binary
HTML_SUBDIRS =
+diff --git a/acinclude.m4 b/acinclude.m4
+index a5cf24e..fcd79e9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -141,7 +141,7 @@
+@@ -141,7 +141,7 @@ AC_DEFUN([FORS_SET_PATHS],
# Define the preprocessor symbols for the sextractor executable
# and the configuration files.
@@ -23,9 +35,11 @@ Description: Use the system provided sextractor binary
AC_DEFINE_UNQUOTED(FORS_SEXTRACTOR_PATH, "$sext_bindir",
[Absolute path to the sextractor executable])
+diff --git a/configure.ac b/configure.ac
+index 4edbf51..5dffe32 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -96,9 +96,6 @@
+@@ -96,9 +96,6 @@ AM_WITH_DMALLOC
FORS_SET_SEX_PREFIX
diff --git a/debian/patches/fix_hdr_endianess_fail.patch b/debian/patches/fix_hdr_endianess_fail.patch
index dffd9bb..de09dfc 100644
--- a/debian/patches/fix_hdr_endianess_fail.patch
+++ b/debian/patches/fix_hdr_endianess_fail.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/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
index 27692fd..c580169 100644
--- a/debian/patches/fix_test_fail.patch
+++ b/debian/patches/fix_test_fail.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: Tue, 8 Nov 2016 22:23:20 +0100
+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/force-serial-tests.patch
index b2e9cf1..f2b8540 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/force-serial-tests.patch
@@ -1,17 +1,15 @@
-Author: Ole Streicher <olebole at 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
-@@ -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
-
--AUTOMAKE_OPTIONS = 1.6 foreign
-+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
-
- DISTCLEANFILES = *~
-
+From: Ole Streicher <olebole at debian.org>
+Date: Tue, 8 Nov 2016 22:23:20 +0100
+Subject: Force serial-tests to get better verbose output
+
+---
+ fors/tests/Makefile.am | 2 +-
+ irplib/tests/Makefile.am | 2 +-
+ recipes/tests/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/fors/tests/Makefile.am b/fors/tests/Makefile.am
+index bac770f..0d5e6ce 100644
--- a/fors/tests/Makefile.am
+++ b/fors/tests/Makefile.am
@@ -17,7 +17,7 @@
@@ -23,6 +21,8 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~ .logfile
+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 @@
@@ -34,3 +34,16 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
+diff --git a/recipes/tests/Makefile.am b/recipes/tests/Makefile.am
+index 39885ee..8250db8 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
+
+-AUTOMAKE_OPTIONS = 1.6 foreign
++AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
+
+ DISTCLEANFILES = *~
+
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index bff77fe..1d44c8c 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.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: Tue, 8 Nov 2016 22:23:19 +0100
+Subject: Add the cpl libraries to the recips.so and the test program
+
+---
+ fors/tests/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fors/tests/Makefile.am b/fors/tests/Makefile.am
+index 6898d65..bac770f 100644
--- a/fors/tests/Makefile.am
+++ b/fors/tests/Makefile.am
-@@ -37,12 +37,12 @@
+@@ -37,12 +37,12 @@ noinst_LTLIBRARIES = $(LIBTEST) $(LIBSIMULATE)
# Convenience libraries
LIBTEST = libtest.la
libtest_la_SOURCES = test.c
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 0505d92..c0a5209 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -1,8 +1,17 @@
-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: Tue, 8 Nov 2016 22:23:19 +0100
+Subject: Set the plugin directory so that esorex and python-cpl can find it.
+
+---
+ acinclude.m4 | 12 ++++++------
+ reflex/fors_spec.xml.in | 2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 98be3ae..a5cf24e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ AC_DEFUN([FORS_SET_PATHS],
[
if test -z "$plugindir"; then
@@ -11,7 +20,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
fi
if test -z "$privatelibdir"; then
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ AC_DEFUN([FORS_SET_PATHS],
fi
if test -z "$pipedocsdir"; then
@@ -20,7 +29,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
fi
htmldir='${pipedocsdir}/html'
-@@ -105,11 +105,11 @@
+@@ -105,11 +105,11 @@ AC_DEFUN([FORS_SET_PATHS],
# fi
if test -z "$configdir"; then
@@ -34,7 +43,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
fi
if test -z "$wkfcopydir"; then
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ AC_DEFUN([FORS_SET_PATHS],
# Define a preprocesor symbol for the plugin search paths
@@ -43,7 +52,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
[Plugin directory tree prefix])
eval plugin_dir="$plugindir"
-@@ -141,7 +141,7 @@
+@@ -141,7 +141,7 @@ AC_DEFUN([FORS_SET_PATHS],
# Define the preprocessor symbols for the sextractor executable
# and the configuration files.
@@ -52,6 +61,8 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
AC_DEFINE_UNQUOTED(FORS_SEXTRACTOR_PATH, "$sext_bindir",
[Absolute path to the sextractor executable])
+diff --git a/reflex/fors_spec.xml.in b/reflex/fors_spec.xml.in
+index d16fb06..0352524 100644
--- a/reflex/fors_spec.xml.in
+++ b/reflex/fors_spec.xml.in
@@ -6156,7 +6156,7 @@
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index 4697f0f..a3be386 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-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: Tue, 8 Nov 2016 22:23:19 +0100
+Subject: Use standard path and name for cpl
+
+---
+ m4macros/cpl.m4 | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+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 @@
+@@ -8,7 +8,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=""
-@@ -109,7 +109,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"
@@ -20,7 +28,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 @@
+@@ -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"
@@ -28,7 +36,7 @@ Description: Use standard path and name for cpl
test -n "$CPLDIR" && \
cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -742,6 +743,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"
@@ -36,7 +44,7 @@ Description: Use standard path and name for cpl
test -n "$WCSDIR" && \
cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -976,6 +978,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"
@@ -44,7 +52,7 @@ Description: Use standard path and name for cpl
test -n "$FFTWDIR" && \
cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1314,7 +1317,7 @@
+@@ -1314,7 +1317,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -53,7 +61,7 @@ Description: Use standard path and name for cpl
cpl_incdirs=""
cpl_libdirs=""
-@@ -1391,6 +1394,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"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-fors.git
More information about the Debian-astro-commits
mailing list