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

Ole Streicher olebole at moszumanska.debian.org
Sun Jul 2 08:29:10 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-vimos.

commit bd1d4b1367700a08373d0e799d9b0b97fc412a02
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Jul 2 10:20:43 2017 +0200

    Rediff patches
    
    Dropped fix-truncation-of-cpl_size-passed-to-int-cpl_parameter-PI.patch: <REASON>
    Dropped Use-standard-path-and-name-for-cpl.patch: <REASON>
---
 ...rary-private-since-it-should-only-be-used.patch |   2 +-
 ...irectory-so-that-esorex-and-python-cpl-ca.patch |   2 +-
 .../Use-standard-path-and-name-for-cpl.patch       | 119 ---------------------
 ...rovided-sextractor-binary-instead-of-the-.patch |   6 +-
 ...f-cpl_size-passed-to-int-cpl_parameter-PI.patch |  42 --------
 debian/patches/series                              |   2 -
 6 files changed, 5 insertions(+), 168 deletions(-)

diff --git a/debian/patches/Make-the-pil-library-private-since-it-should-only-be-used.patch b/debian/patches/Make-the-pil-library-private-since-it-should-only-be-used.patch
index d305f15..1829e0c 100644
--- a/debian/patches/Make-the-pil-library-private-since-it-should-only-be-used.patch
+++ b/debian/patches/Make-the-pil-library-private-since-it-should-only-be-used.patch
@@ -9,7 +9,7 @@ Subject: Make the "pil" library private since it should only be used by this
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index b77de13..54e0d1f 100644
+index 82b455c..55a47fd 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -123,7 +123,7 @@ AC_DEFUN([VIMOS_SET_PATHS],
diff --git a/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch b/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
index 9abd27d..3f29522 100644
--- a/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
+++ b/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
@@ -7,7 +7,7 @@ Subject: Set the plugin directory so that esorex and python-cpl can find it.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index d179ba4..b77de13 100644
+index 7e31c75..82b455c 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -119,7 +119,7 @@ AC_DEFUN([VIMOS_SET_PATHS],
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 2303bf8..0000000
--- a/debian/patches/Use-standard-path-and-name-for-cpl.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-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"
--    cpl_cfitsio_check_lib="libcfitsio.a"
-+    cpl_cfitsio_check_lib="libcfitsio.so"
- 
-     cpl_cfitsio_incdirs=""
-     cpl_cfitsio_libdirs=""
-@@ -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"
-+		cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- 
-                 test -n "$CFITSIODIR" && \
-                     cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
-@@ -455,7 +456,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
-     AC_MSG_CHECKING([for libcext])
- 
-     cpl_cext_check_header="cxtypes.h"
--    cpl_cext_check_lib="libcext.a"
-+    cpl_cext_check_lib="libcext.so"
- 
-     cpl_cext_incdirs=""
-     cpl_cext_libdirs=""
-@@ -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"
-+			cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- 
-                 	test -n "$CPLDIR" && \
-                     	cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -1314,7 +1316,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=""
-@@ -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"
-+		cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-                 cpl_libdirs="$cpl_libdirs /usr/lib64"
-                 cpl_libdirs="$cpl_libdirs /usr/lib"
-                 cpl_libdirs="$cpl_libdirs /usr/lib32"
-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"
--    cpl_cfitsio_check_lib="libcfitsio.a"
-+    cpl_cfitsio_check_lib="libcfitsio.so"
- 
-     cpl_cfitsio_incdirs=""
-     cpl_cfitsio_libdirs=""
-@@ -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"
-+		cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- 
-                 test -n "$CFITSIODIR" && \
-                     cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
-@@ -455,7 +456,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
-     AC_MSG_CHECKING([for libcext])
- 
-     cpl_cext_check_header="cxtypes.h"
--    cpl_cext_check_lib="libcext.a"
-+    cpl_cext_check_lib="libcext.so"
- 
-     cpl_cext_incdirs=""
-     cpl_cext_libdirs=""
-@@ -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"
-+			cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- 
-                 	test -n "$CPLDIR" && \
-                     	cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -1314,7 +1316,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=""
-@@ -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"
-+		cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-                 cpl_libdirs="$cpl_libdirs /usr/lib64"
-                 cpl_libdirs="$cpl_libdirs /usr/lib"
-                 cpl_libdirs="$cpl_libdirs /usr/lib32"
diff --git a/debian/patches/Use-the-system-provided-sextractor-binary-instead-of-the-.patch b/debian/patches/Use-the-system-provided-sextractor-binary-instead-of-the-.patch
index 848bd9c..f3b7efb 100644
--- a/debian/patches/Use-the-system-provided-sextractor-binary-instead-of-the-.patch
+++ b/debian/patches/Use-the-system-provided-sextractor-binary-instead-of-the-.patch
@@ -10,7 +10,7 @@ Subject: Use the system provided sextractor binary instead of the convenience
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index 54e0d1f..384360e 100644
+index 55a47fd..00cd36d 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -172,7 +172,7 @@ AC_DEFUN([VIMOS_SET_PATHS],
@@ -23,7 +23,7 @@ index 54e0d1f..384360e 100644
      AC_DEFINE_UNQUOTED(VIMOS_SEXTRACTOR_PATH, "$sext_bindir",
                         [Absolute path to the sextractor executable])
 diff --git a/configure.ac b/configure.ac
-index 90a7c59..49876da 100644
+index 7157efc..c4e6c8c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -127,7 +127,7 @@ VIMOS_SET_SEX_PREFIX
@@ -34,7 +34,7 @@ index 90a7c59..49876da 100644
 +AC_CONFIG_SUBDIRS(external/psfex)
  
  AC_CONFIG_FILES(Makefile
-                 Makefile.purify
+                 doxygen/Doxyfile
 diff --git a/external/Makefile.am b/external/Makefile.am
 index a6853b3..f112b5f 100644
 --- a/external/Makefile.am
diff --git a/debian/patches/fix-truncation-of-cpl_size-passed-to-int-cpl_parameter-PI.patch b/debian/patches/fix-truncation-of-cpl_size-passed-to-int-cpl_parameter-PI.patch
deleted file mode 100644
index de09dfc..0000000
--- a/debian/patches/fix-truncation-of-cpl_size-passed-to-int-cpl_parameter-PI.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/series b/debian/patches/series
index da2b8bc..b93ebbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
 Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
-Use-standard-path-and-name-for-cpl.patch
 Make-the-pil-library-private-since-it-should-only-be-used.patch
 Use-the-system-provided-sextractor-binary-instead-of-the-.patch
 Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
 Force-serial-tests-to-get-better-verbose-output.patch
-fix-truncation-of-cpl_size-passed-to-int-cpl_parameter-PI.patch
 Define-XOPEN-to-explicitely-declare-tempnam.patch

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