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

Ole Streicher olebole at moszumanska.debian.org
Sat Jul 1 09:47:32 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-kmos.

commit 3c14f41387bff9b7df750eadb1c6fa1992587789
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Jul 1 11:42:34 2017 +0200

    Rediff patches
    
    Dropped Use-standard-path-and-name-for-cpl.patch: <REASON>
---
 ...aries-to-the-recips.so-and-the-test-progr.patch | 31 +++++-----
 ...nce-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch |  4 +-
 .../Use-standard-path-and-name-for-cpl.patch       | 69 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 18 insertions(+), 87 deletions(-)

diff --git a/debian/patches/Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch b/debian/patches/Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
index ef5478a..8afcd07 100644
--- a/debian/patches/Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
+++ b/debian/patches/Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
@@ -3,15 +3,15 @@ Date: Wed, 12 Oct 2016 10:04:37 +0200
 Subject: Add the cpl libraries to the recips.so and the test program
 
 ---
- recipes/Makefile.am | 46 +++++++++++++++++++++++-----------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
+ recipes/Makefile.am | 52 +++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 31 insertions(+), 21 deletions(-)
 
 diff --git a/recipes/Makefile.am b/recipes/Makefile.am
-index 9d7abde..5a82e72 100644
+index d69f61b..f30b925 100644
 --- a/recipes/Makefile.am
 +++ b/recipes/Makefile.am
-@@ -56,117 +56,117 @@ plugin_LTLIBRARIES = kmo_arithmetic.la \
-                      kmos_sky_tweak.la 
+@@ -56,77 +56,87 @@ plugin_LTLIBRARIES = kmo_arithmetic.la \
+                      kmos_test.la 
  
  kmo_arithmetic_la_SOURCES = kmo_arithmetic.c
 -kmo_arithmetic_la_LIBADD = $(LIBKMOS)
@@ -73,12 +73,11 @@ index 9d7abde..5a82e72 100644
  kmo_stats_la_LDFLAGS = -module -avoid-version
  kmo_stats_la_DEPENDENCIES = $(LIBKMOS)
   
- kmo_illumination_flat_la_SOURCES = kmo_illumination_flat.c
--kmo_illumination_flat_la_LIBADD = $(LIBKMOS)
++kmo_illumination_flat_la_SOURCES = kmo_illumination_flat.c
 +kmo_illumination_flat_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- kmo_illumination_flat_la_LDFLAGS = -module -avoid-version
- kmo_illumination_flat_la_DEPENDENCIES = $(LIBKMOS)
- 
++kmo_illumination_flat_la_LDFLAGS = -module -avoid-version
++kmo_illumination_flat_la_DEPENDENCIES = $(LIBKMOS)
++
  kmo_fits_strip_la_SOURCES = kmo_fits_strip.c
 -kmo_fits_strip_la_LIBADD = $(LIBKMOS)
 +kmo_fits_strip_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
@@ -91,12 +90,11 @@ index 9d7abde..5a82e72 100644
  kmos_reconstruct_la_LDFLAGS = -module -avoid-version
  kmos_reconstruct_la_DEPENDENCIES = $(LIBKMOS)
   
- kmos_test_la_SOURCES = kmos_test.c
--kmos_test_la_LIBADD = $(LIBKMOS)
++kmos_test_la_SOURCES = kmos_test.c
 +kmos_test_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- kmos_test_la_LDFLAGS = -module -avoid-version
- kmos_test_la_DEPENDENCIES = $(LIBKMOS)
- 
++kmos_test_la_LDFLAGS = -module -avoid-version
++kmos_test_la_DEPENDENCIES = $(LIBKMOS)
++
  kmos_combine_la_SOURCES = kmos_combine.c
 -kmos_combine_la_LIBADD = $(LIBKMOS)
 +kmos_combine_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
@@ -115,6 +113,9 @@ index 9d7abde..5a82e72 100644
  kmos_flat_la_LDFLAGS = -module -avoid-version
  kmos_flat_la_DEPENDENCIES = $(LIBKMOS)
  
+@@ -136,32 +146,32 @@ kmos_gen_telluric_la_LDFLAGS = -module -avoid-version
+ kmos_gen_telluric_la_DEPENDENCIES = $(LIBKMOS)
+ 
  kmos_wave_cal_la_SOURCES = kmos_wave_cal.c
 -kmos_wave_cal_la_LIBADD = $(LIBKMOS)
 +kmos_wave_cal_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
diff --git a/debian/patches/Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch b/debian/patches/Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
index e3e617d..4155ea9 100644
--- a/debian/patches/Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
+++ b/debian/patches/Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
@@ -7,10 +7,10 @@ Subject: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/irplib/tests/irplib_polynomial-test.c b/irplib/tests/irplib_polynomial-test.c
-index ff57b29..08e7eda 100644
+index c27d167..d5cdf86 100644
 --- a/irplib/tests/irplib_polynomial-test.c
 +++ b/irplib/tests/irplib_polynomial-test.c
-@@ -565,16 +565,16 @@ irplib_polynomial_test_root_all_macro(const cpl_vector * self, cpl_size nreal,
+@@ -579,16 +579,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/Use-standard-path-and-name-for-cpl.patch b/debian/patches/Use-standard-path-and-name-for-cpl.patch
deleted file mode 100644
index d8d8907..0000000
--- a/debian/patches/Use-standard-path-and-name-for-cpl.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Ole Streicher <olebole at debian.org>
-Date: Wed, 12 Oct 2016 10:04:37 +0200
-Subject: Use standard path and name for cpl
-
----
- m4macros/cpl.m4 | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/m4macros/cpl.m4 b/m4macros/cpl.m4
-index b0ec8ae..195022e 100644
---- a/m4macros/cpl.m4
-+++ b/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=""
-@@ -395,7 +395,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=""
-@@ -607,8 +607,8 @@ AC_DEFUN([CPL_CHECK_WCS],
- 
- 
-     cpl_wcs_check_version="$1"
--    cpl_wcs_check_header="wcslib.h"
--    cpl_wcs_check_lib="libwcs.a"
-+    cpl_wcs_check_header="wcslib/wcslib.h"
-+    cpl_wcs_check_lib="libwcs.so"
- 
-     cpl_wcs_includes=""
-     cpl_wcs_libraries=""
-@@ -844,8 +844,8 @@ AC_DEFUN([CPL_CHECK_FFTW],
- 
- 	cpl_fftw_check_version="$1"
-     cpl_fftw_check_header="fftw3.h"
--    cpl_fftw_check_lib="libfftw3.a"
--    cpl_fftwf_check_lib="libfftw3f.a"
-+    cpl_fftw_check_lib="libfftw3.so"
-+    cpl_fftwf_check_lib="libfftw3f.so"
- 
-     cpl_fftw_includes=""
-     cpl_fftw_libraries=""
-@@ -1270,7 +1270,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=""
-@@ -1345,6 +1345,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
-                 cpl_libdirs="$cpl_libdirs /usr/local/lib"
-                 cpl_libdirs="$cpl_libdirs /usr/local/lib32"
-                 cpl_libdirs="$cpl_libdirs /usr/lib64"
-+		cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-                 cpl_libdirs="$cpl_libdirs /usr/lib"
-                 cpl_libdirs="$cpl_libdirs /usr/lib32"
- 
diff --git a/debian/patches/series b/debian/patches/series
index d46ed59..8e85801 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
 Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
-Use-standard-path-and-name-for-cpl.patch
 Disable-tests-that-require-test-data-from-the-ref_data-su.patch
 Replace-strcat-calls-with-size-checked-strncat-calls.patch
 Remove-several-small-spelling-errors.patch

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



More information about the Debian-astro-commits mailing list