[Debian-astro-commits] [cpl-plugin-fors] 02/04: Rediff patches

Ole Streicher olebole at moszumanska.debian.org
Fri Jun 30 14:45:39 UTC 2017


This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository cpl-plugin-fors.

commit 727cb71b55e6db14d9cc40fb6feae50428e5cae6
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jun 30 16:35:56 2017 +0200

    Rediff patches
    
    Dropped fix_hdr_endianess_fail.patch: <REASON>
    Dropped use-std-paths-for-cpl.patch: <REASON>
---
 debian/patches/dont_build_sextractor.patch  |  9 ++--
 debian/patches/fix_hdr_endianess_fail.patch | 42 -----------------
 debian/patches/force-serial-tests.patch     |  4 +-
 debian/patches/libadd_cpl.patch             |  6 +--
 debian/patches/series                       |  2 -
 debian/patches/set_plugindir.patch          |  2 +-
 debian/patches/use-std-paths-for-cpl.patch  | 71 -----------------------------
 7 files changed, 11 insertions(+), 125 deletions(-)

diff --git a/debian/patches/dont_build_sextractor.patch b/debian/patches/dont_build_sextractor.patch
index 885a15d..be924b1 100644
--- a/debian/patches/dont_build_sextractor.patch
+++ b/debian/patches/dont_build_sextractor.patch
@@ -6,8 +6,8 @@ Subject: Use the system provided sextractor binary instead of the convenience
 ---
  Makefile.am  | 2 +-
  acinclude.m4 | 2 +-
- configure.ac | 3 ---
- 3 files changed, 2 insertions(+), 5 deletions(-)
+ configure.ac | 4 ----
+ 3 files changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index 553db32..d9cf679 100644
@@ -36,13 +36,14 @@ index a5cf24e..fcd79e9 100644
      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
+index 0404784..d99f002 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -96,9 +96,6 @@ AM_WITH_DMALLOC
+@@ -96,10 +96,6 @@ AM_WITH_DMALLOC
  
  FORS_SET_SEX_PREFIX
  
+-
 -AC_CONFIG_SUBDIRS([sextractor])
 -
 -
diff --git a/debian/patches/fix_hdr_endianess_fail.patch b/debian/patches/fix_hdr_endianess_fail.patch
deleted file mode 100644
index de09dfc..0000000
--- a/debian/patches/fix_hdr_endianess_fail.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: jtaylor <jtaylor at 318c8218-2dab-440d-9263-6f70bac63e5b>
-Date: Fri, 10 Oct 2014 08:24:55 +0000
-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
----
- 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 @@ 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",
--                         CPL_TYPE_INT, hdrl_rect_region_get_llx(defaults));
-+                         CPL_TYPE_INT, (int)hdrl_rect_region_get_llx(defaults));
-     /* --prefix.lly */
-     hdrl_setup_vparameter(parlist, prefix, ".", name_prefix,
-                          "lly", base_context,
-                          "Lower left y pos. (FITS) defining the region",
--                         CPL_TYPE_INT, hdrl_rect_region_get_lly(defaults));
-+                         CPL_TYPE_INT, (int)hdrl_rect_region_get_lly(defaults));
- 
-     /* --prefix.urx */
-     hdrl_setup_vparameter(parlist, prefix, ".", name_prefix,
-                          "urx", base_context,
-                          "Upper right x pos. (FITS) defining the region",
--                         CPL_TYPE_INT, hdrl_rect_region_get_urx(defaults));
-+                         CPL_TYPE_INT, (int)hdrl_rect_region_get_urx(defaults));
- 
-     /* --prefix.ury */
-     hdrl_setup_vparameter(parlist, prefix, ".", name_prefix,
-                          "ury", base_context,
-                          "Upper right y pos. (FITS) defining the region",
--                         CPL_TYPE_INT, hdrl_rect_region_get_ury(defaults));
-+                         CPL_TYPE_INT, (int)hdrl_rect_region_get_ury(defaults));
- 
-     if (cpl_error_get_code()) {
-         cpl_parameterlist_delete(parlist);
diff --git a/debian/patches/force-serial-tests.patch b/debian/patches/force-serial-tests.patch
index f2b8540..3891430 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/force-serial-tests.patch
@@ -9,7 +9,7 @@ Subject: Force serial-tests to get better verbose output
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/fors/tests/Makefile.am b/fors/tests/Makefile.am
-index bac770f..0d5e6ce 100644
+index 6c23608..a656ced 100644
 --- a/fors/tests/Makefile.am
 +++ b/fors/tests/Makefile.am
 @@ -17,7 +17,7 @@
@@ -35,7 +35,7 @@ index 1377c13..01a9c33 100644
  DISTCLEANFILES = *~
  
 diff --git a/recipes/tests/Makefile.am b/recipes/tests/Makefile.am
-index 39885ee..8250db8 100644
+index 88d4e84..0bea54d 100644
 --- a/recipes/tests/Makefile.am
 +++ b/recipes/tests/Makefile.am
 @@ -17,7 +17,7 @@
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 1d44c8c..672dbbe 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -7,10 +7,10 @@ Subject: Add the cpl libraries to the recips.so and the test program
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/fors/tests/Makefile.am b/fors/tests/Makefile.am
-index 6898d65..bac770f 100644
+index 29e6903..6c23608 100644
 --- a/fors/tests/Makefile.am
 +++ b/fors/tests/Makefile.am
-@@ -37,12 +37,12 @@ noinst_LTLIBRARIES = $(LIBTEST) $(LIBSIMULATE)
+@@ -37,12 +37,12 @@ noinst_LTLIBRARIES = $(LIBTEST) $(LIBSIMULATE) $(LIBFSTEST)
  # Convenience libraries
  LIBTEST = libtest.la
  libtest_la_SOURCES =  test.c
@@ -24,4 +24,4 @@ index 6898d65..bac770f 100644
 +libsimulate_la_LIBADD = $(LIBCPLUI) $(LIBCPLCORE)
  libsimulate_la_DEPENDENCIES =
  
- 
+ LIBFSTEST = libfstest.la
diff --git a/debian/patches/series b/debian/patches/series
index 6a4d705..aa827f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
 libadd_cpl.patch
 set_plugindir.patch
-use-std-paths-for-cpl.patch
 dont_build_sextractor.patch
 disable_tests_libmosca.patch
 fix_test_fail.patch
 force-serial-tests.patch
-fix_hdr_endianess_fail.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index c0a5209..35d3110 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -62,7 +62,7 @@ index 98be3ae..a5cf24e 100644
      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
+index 35f4347..27bfd41 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
deleted file mode 100644
index a3be386..0000000
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
-         
-     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 @@ 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"
--
-+                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 @@ 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"
-+			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 @@ 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"
-+		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 @@ 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"
-+		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_DEFUN([CPL_CHECK_LIBS],
-     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 @@ AC_DEFUN([CPL_CHECK_LIBS],
-                 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 \

-- 
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