[Debian-astro-commits] [cpl-plugin-xsh] 01/03: Rediff patches

Ole Streicher olebole at moszumanska.debian.org
Sun Jul 2 08:47:15 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-xsh.

commit e6a81459aea31219eb2d6f09c1f6f8a72c2b66d3
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Jul 2 10:41:14 2017 +0200

    Rediff patches
    
    Dropped Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch: <REASON>
    Dropped Use-standard-path-and-name-for-cpl.patch: <REASON>
---
 ...n-of-cpl_size-passed-to-int-cpl_parameter.patch |  27 -----
 ...serial-tests-to-get-better-verbose-output.patch |   2 +-
 .../Use-standard-path-and-name-for-cpl.patch       | 135 ---------------------
 debian/patches/series                              |   2 -
 4 files changed, 1 insertion(+), 165 deletions(-)

diff --git a/debian/patches/Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch b/debian/patches/Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch
deleted file mode 100644
index a690eea..0000000
--- a/debian/patches/Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Ole Streicher <olebole at debian.org>
-Date: Sat, 30 Jul 2016 09:34:14 +0200
-Subject: Fix truncation of cpl_size passed to int cpl_parameter
-
----
- hdrl/hdrl_flat.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hdrl/hdrl_flat.c b/hdrl/hdrl_flat.c
-index bd42a2b..73b0ae8 100644
---- a/hdrl/hdrl_flat.c
-+++ b/hdrl/hdrl_flat.c
-@@ -272,12 +272,12 @@ cpl_parameterlist * hdrl_flat_parameter_create_parlist(
-     /* --prefix.filter_size_x */
-     hdrl_setup_vparameter(parlist, prefix, ".", "", "filter-size-x", base_context,
-             "Smoothing filter size in x-direction.", CPL_TYPE_INT,
--            filter_size_x_def) ;
-+            (int)filter_size_x_def) ;
- 
-     /* --prefix.filter_size_y */
-     hdrl_setup_vparameter(parlist, prefix, ".", "", "filter-size-y", base_context,
-             "Smoothing filter size in y-direction.", CPL_TYPE_INT,
--            filter_size_y_def) ;
-+            (int)filter_size_y_def) ;
- 
-     /* --prefix.method */
-     name = hdrl_join_string(".", 2, context, "method");
diff --git a/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
index a292044..f1f61ee 100644
--- a/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
+++ b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
@@ -21,7 +21,7 @@ index d5ae540..0213f37 100644
  DISTCLEANFILES = *~
  
 diff --git a/xsh/tests/Makefile.am b/xsh/tests/Makefile.am
-index d4033d8..a25c036 100644
+index 8161478..cfc6390 100644
 --- a/xsh/tests/Makefile.am
 +++ b/xsh/tests/Makefile.am
 @@ -17,7 +17,7 @@
diff --git a/debian/patches/Use-standard-path-and-name-for-cpl.patch b/debian/patches/Use-standard-path-and-name-for-cpl.patch
deleted file mode 100644
index 084e4af..0000000
--- a/debian/patches/Use-standard-path-and-name-for-cpl.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From: Ole Streicher <olebole at debian.org>
-Date: Sat, 30 Jul 2016 09:34:14 +0200
-Subject: Use standard path and name for cpl
-
----
- hdrl/m4macros/cpl.m4 | 10 +++++++---
- m4macros/cpl.m4      | 10 +++++++---
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/hdrl/m4macros/cpl.m4 b/hdrl/m4macros/cpl.m4
-index 956b580..2246010 100644
---- a/hdrl/m4macros/cpl.m4
-+++ b/hdrl/m4macros/cpl.m4
-@@ -9,7 +9,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=""
-@@ -110,7 +110,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"
-@@ -492,6 +492,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 \
-@@ -678,6 +679,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 \
-@@ -912,6 +914,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 \
-@@ -1250,7 +1253,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=""
-@@ -1327,6 +1330,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 \
-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 \
diff --git a/debian/patches/series b/debian/patches/series
index 75f682b..b5461a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
-Use-standard-path-and-name-for-cpl.patch
 Force-serial-tests-to-get-better-verbose-output.patch
 Add-missing-lcpldrs-to-xsh_cfg_recover-recipe.patch
-Fix-truncation-of-cpl_size-passed-to-int-cpl_parameter.patch
 Temporarily-disable-XSH_SDP_KEYWORD_APERTURE-test.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-xsh.git



More information about the Debian-astro-commits mailing list