[Debian-astro-commits] [cpl-plugin-uves] 01/03: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Sat Jul 1 18:58:11 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-uves.
commit 1fbf798104c6410282278add3cc23bc9e69ece3e
Author: Ole Streicher <olebole at debian.org>
Date: Sat Jul 1 20:54:16 2017 +0200
Rediff patches
Dropped use-std-paths-for-cpl.patch: <REASON>
---
debian/patches/fix-typos.patch | 42 ------
debian/patches/fix_compiler_errors.patch | 35 +++--
debian/patches/fix_test_fail.patch | 14 +-
debian/patches/force-serial-tests.patch | 42 ++++--
debian/patches/libadd_cpl.patch | 235 -----------------------------
debian/patches/series | 1 -
debian/patches/set_plugindir.patch | 14 +-
debian/patches/shlib-calls-exit.patch | 76 ----------
debian/patches/use-std-paths-for-cpl.patch | 38 -----
debian/patches/use_system_qfits.patch | 41 +++--
10 files changed, 106 insertions(+), 432 deletions(-)
diff --git a/debian/patches/fix-typos.patch b/debian/patches/fix-typos.patch
deleted file mode 100644
index 6f6b083..0000000
--- a/debian/patches/fix-typos.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix simple typos
---- a/uves/uves_parameters.c
-+++ b/uves/uves_parameters.c
-@@ -534,7 +534,7 @@
- full_name = uves_sprintf("%s.%s", context, name);
- uves_parameter_new_enum(p, full_name,
- CPL_TYPE_STRING,
-- "For RED arm data proces the "
-+ "For RED arm data process the "
- "redl, redu, or both chip(s)",
- context,
- "both",5,"both","redl","redu","REDL","REDU");
---- a/flames/flames_obs_scired_impl.c
-+++ b/flames/flames_obs_scired_impl.c
-@@ -1403,7 +1403,7 @@
- /*
- mess/out 3 {pid} "FLAMES-UVES SCIENCE Reduction Procedure"
- mess/out 3 {pid} "At runtime you should be ready to feed the procedure with: "
--mess/out 3 {pid} " - an input frame or catalog with splitted raw frame(s)"
-+mess/out 3 {pid} " - an input frame or catalog with split raw frame(s)"
- mess/out 3 {pid} " - an output product catalogue"
- mess/out 3 {pid} " - a reference frame catalogue"
- mess/out 3 {pid} " - the extraction method "
-@@ -1412,7 +1412,7 @@
-
- uves_msg("FLAMES-UVES SCIENCE Reduction Procedure");
- uves_msg("At runtime you should be ready to feed the procedure with: ");
-- uves_msg(" - an input frame or catalog with splitted raw frame(s)");
-+ uves_msg(" - an input frame or catalog with split raw frame(s)");
- uves_msg(" - an output product catalogue");
- uves_msg(" - a reference frame catalogue");
- uves_msg(" - the extraction method ");
-@@ -1926,7 +1926,7 @@
- char file[80];
-
- strcpy(null_string," ");
-- cknull(ext_sci,"Null input extention tables");
-+ cknull(ext_sci,"Null input extension tables");
- //crossref in_ima in_tab out_tab
- //define/parameter p1 ? ima "Enter input fibre mode frame in MIDAS format"
- //define/parameter p2 ? tbl "Enter fibre-order table"
diff --git a/debian/patches/fix_compiler_errors.patch b/debian/patches/fix_compiler_errors.patch
index 24cae9c..f052617 100644
--- a/debian/patches/fix_compiler_errors.patch
+++ b/debian/patches/fix_compiler_errors.patch
@@ -1,24 +1,35 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Fix format security errors
---- a/uves/tests/Makefile.am
-+++ b/uves/tests/Makefile.am
-@@ -31,7 +31,7 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 1 Jul 2017 20:53:20 +0200
+Subject: Fix format security errors
+
+---
+ flames/tests/Makefile.am | 2 +-
+ uves/tests/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/flames/tests/Makefile.am b/flames/tests/Makefile.am
+index 5aa6144..cee4cb8 100644
+--- a/flames/tests/Makefile.am
++++ b/flames/tests/Makefile.am
+@@ -31,7 +31,7 @@ endif
AM_CPPFLAGS = $(all_includes)
- LDADD = $(LIBUVES) $(LIBFLAMES) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBCFITSIO) -lqfits
+ LDADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLUI) $(LIBCPLDRS)
-LDFLAGS = $(CPL_LDFLAGS)
+AM_LDFLAGS = $(CPL_LDFLAGS)
+ #AM_LDFLAGS = -static
pkginclude_HEADERS =
-
---- a/flames/tests/Makefile.am
-+++ b/flames/tests/Makefile.am
-@@ -31,7 +31,7 @@
+diff --git a/uves/tests/Makefile.am b/uves/tests/Makefile.am
+index 228f094..0e03fff 100644
+--- a/uves/tests/Makefile.am
++++ b/uves/tests/Makefile.am
+@@ -31,7 +31,7 @@ endif
AM_CPPFLAGS = $(all_includes)
- LDADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLUI) $(LIBCPLDRS)
+ LDADD = $(LIBUVES) $(LIBFLAMES) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBCFITSIO) -lqfits
-LDFLAGS = $(CPL_LDFLAGS)
+AM_LDFLAGS = $(CPL_LDFLAGS)
- #AM_LDFLAGS = -static
pkginclude_HEADERS =
+
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
index 27692fd..c4b624a 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: Sat, 1 Jul 2017 20:53:20 +0200
+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 c27d167..d5cdf86 100644
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
-@@ -567,16 +567,16 @@
+@@ -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/force-serial-tests.patch b/debian/patches/force-serial-tests.patch
index a4da12a..aa38e38 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/force-serial-tests.patch
@@ -1,8 +1,18 @@
-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
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 1 Jul 2017 20:53:20 +0200
+Subject: Force serial-tests to get better verbose output
+
+---
+ irplib/tests/Makefile.am | 2 +-
+ recipes/tests/Makefile.am | 2 +-
+ regtests/tests/Makefile.am | 2 +-
+ uves/tests/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/irplib/tests/Makefile.am b/irplib/tests/Makefile.am
+index 3637ad7..e1d5dc8 100644
+--- a/irplib/tests/Makefile.am
++++ b/irplib/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
@@ -12,17 +22,21 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
---- a/uves/tests/Makefile.am
-+++ b/uves/tests/Makefile.am
+diff --git a/recipes/tests/Makefile.am b/recipes/tests/Makefile.am
+index 73eb692..d3db2f0 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
+ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
--AUTOMAKE_OPTIONS = 1.6 foreign
+-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
DISTCLEANFILES = *~
+diff --git a/regtests/tests/Makefile.am b/regtests/tests/Makefile.am
+index d5ae540..0213f37 100644
--- a/regtests/tests/Makefile.am
+++ b/regtests/tests/Makefile.am
@@ -17,7 +17,7 @@
@@ -34,13 +48,15 @@ Bug: http://bugs.debian.org/715204
DISTCLEANFILES = *~
---- a/irplib/tests/Makefile.am
-+++ b/irplib/tests/Makefile.am
+diff --git a/uves/tests/Makefile.am b/uves/tests/Makefile.am
+index 0e03fff..d762fd3 100644
+--- a/uves/tests/Makefile.am
++++ b/uves/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
+ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--AUTOMAKE_OPTIONS = 1.8 foreign
+-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
deleted file mode 100644
index 3646636..0000000
--- a/debian/patches/libadd_cpl.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Add the cpl and UVES libraries to the recipes.so, and cext to
- libuves to avoid missing symbols.
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -74,170 +74,170 @@
-
-
- uves_cal_orderpos_la_SOURCES = uves_orderpos.c
--uves_cal_orderpos_la_LIBADD = $(LIBUVES)
-+uves_cal_orderpos_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_orderpos_la_LDFLAGS = -module -avoid-version
- uves_cal_orderpos_la_DEPENDENCIES = $(LIBUVES)
-
- uves_cal_mbias_la_SOURCES = uves_mbias.c
--uves_cal_mbias_la_LIBADD = $(LIBUVES)
-+uves_cal_mbias_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_mbias_la_LDFLAGS = -module -avoid-version
- uves_cal_mbias_la_DEPENDENCIES = $(LIBUVES)
-
-
- uves_cal_mdark_la_SOURCES = uves_mdark.c
--uves_cal_mdark_la_LIBADD = $(LIBUVES)
-+uves_cal_mdark_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_mdark_la_LDFLAGS = -module -avoid-version
- uves_cal_mdark_la_DEPENDENCIES = $(LIBUVES)
-
- uves_cal_mflat_la_SOURCES = uves_mflat.c
--uves_cal_mflat_la_LIBADD = $(LIBUVES)
-+uves_cal_mflat_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_mflat_la_LDFLAGS = -module -avoid-version
- uves_cal_mflat_la_DEPENDENCIES = $(LIBUVES)
-
- uves_cal_mflat_combine_la_SOURCES = uves_mflat_combine.c
--uves_cal_mflat_combine_la_LIBADD = $(LIBUVES)
-+uves_cal_mflat_combine_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_mflat_combine_la_LDFLAGS = -module -avoid-version
- uves_cal_mflat_combine_la_DEPENDENCIES = $(LIBUVES)
-
- uves_cal_mkmaster_la_SOURCES = uves_cal_mkmaster.c
--uves_cal_mkmaster_la_LIBADD = $(LIBUVES)
-+uves_cal_mkmaster_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_mkmaster_la_LDFLAGS = -module -avoid-version
- uves_cal_mkmaster_la_DEPENDENCIES = $(LIBUVES)
-
- uves_cal_wavecal_la_SOURCES = uves_wavecal.c
--uves_cal_wavecal_la_LIBADD = $(LIBUVES)
-+uves_cal_wavecal_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_wavecal_la_LDFLAGS = -module -avoid-version
- uves_cal_wavecal_la_DEPENDENCIES = $(LIBUVES)
-
- uves_obs_scired_la_SOURCES = uves_scired.c
--uves_obs_scired_la_LIBADD = $(LIBUVES)
-+uves_obs_scired_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_obs_scired_la_LDFLAGS = -module -avoid-version
- uves_obs_scired_la_DEPENDENCIES = $(LIBUVES)
-
- uves_cal_tflat_la_SOURCES = uves_tflat.c
--uves_cal_tflat_la_LIBADD = $(LIBUVES)
-+uves_cal_tflat_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_tflat_la_LDFLAGS = -module -avoid-version
- uves_cal_tflat_la_DEPENDENCIES = $(LIBUVES)
-
- uves_cal_cd_align_la_SOURCES = uves_cal_cd_align.c
--uves_cal_cd_align_la_LIBADD = $(LIBUVES)
-+uves_cal_cd_align_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_cd_align_la_LDFLAGS = -module -avoid-version
- uves_cal_cd_align_la_DEPENDENCIES = $(LIBUVES)
-
- uves_cal_response_la_SOURCES = uves_response.c
--uves_cal_response_la_LIBADD = $(LIBUVES)
-+uves_cal_response_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_response_la_LDFLAGS = -module -avoid-version
- uves_cal_response_la_DEPENDENCIES = $(LIBUVES)
-
- uves_cal_predict_la_SOURCES = uves_physmod.c
--uves_cal_predict_la_LIBADD = $(LIBUVES)
-+uves_cal_predict_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_cal_predict_la_LDFLAGS = -module -avoid-version
- uves_cal_predict_la_DEPENDENCIES = $(LIBUVES)
-
- uves_obs_redchain_la_SOURCES = uves_redchain.c
--uves_obs_redchain_la_LIBADD = $(LIBUVES)
-+uves_obs_redchain_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_obs_redchain_la_LDFLAGS = -module -avoid-version
- uves_obs_redchain_la_DEPENDENCIES = $(LIBUVES)
-
- flames_cal_predict_la_SOURCES = flames_cal_predict.c
--flames_cal_predict_la_LIBADD = $(LIBFLAMES)
-+flames_cal_predict_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- flames_cal_predict_la_LDFLAGS = -module -avoid-version
--flames_cal_predict_la_DEPENDENCIES = $(LIBFLAMES)
-+flames_cal_predict_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- flames_cal_orderpos_la_SOURCES = flames_cal_orderpos.c
--flames_cal_orderpos_la_LIBADD = $(LIBFLAMES)
-+flames_cal_orderpos_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- flames_cal_orderpos_la_LDFLAGS = -module -avoid-version
--flames_cal_orderpos_la_DEPENDENCIES = $(LIBFLAMES)
-+flames_cal_orderpos_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- flames_cal_wavecal_la_SOURCES = flames_cal_wavecal.c
--flames_cal_wavecal_la_LIBADD = $(LIBFLAMES)
-+flames_cal_wavecal_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- flames_cal_wavecal_la_LDFLAGS = -module -avoid-version
--flames_cal_wavecal_la_DEPENDENCIES = $(LIBFLAMES)
-+flames_cal_wavecal_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- flames_cal_prep_sff_ofpos_la_SOURCES = flames_cal_prep_sff_ofpos.c
--flames_cal_prep_sff_ofpos_la_LIBADD = $(LIBFLAMES)
-+flames_cal_prep_sff_ofpos_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- flames_cal_prep_sff_ofpos_la_LDFLAGS = -module -avoid-version
--flames_cal_prep_sff_ofpos_la_DEPENDENCIES = $(LIBFLAMES)
-+flames_cal_prep_sff_ofpos_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- flames_cal_mkmaster_la_SOURCES = flames_cal_mkmaster.c
--flames_cal_mkmaster_la_LIBADD = $(LIBFLAMES)
-+flames_cal_mkmaster_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- flames_cal_mkmaster_la_LDFLAGS = -module -avoid-version
- flames_cal_mkmaster_la_DEPENDENCIES = $(LIBFLAMES)
-
- flames_obs_scired_la_SOURCES = flames_obs_scired.c
--flames_obs_scired_la_LIBADD = $(LIBFLAMES)
-+flames_obs_scired_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- flames_obs_scired_la_LDFLAGS = -module -avoid-version
--flames_obs_scired_la_DEPENDENCIES = $(LIBFLAMES)
-+flames_obs_scired_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- flames_obs_redchain_la_SOURCES = flames_obs_redchain.c
--flames_obs_redchain_la_LIBADD = $(LIBFLAMES)
-+flames_obs_redchain_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- flames_obs_redchain_la_LDFLAGS = -module -avoid-version
--flames_obs_redchain_la_DEPENDENCIES = $(LIBFLAMES)
-+flames_obs_redchain_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- flames_utl_unpack_la_SOURCES = flames_utl_unpack.c
--flames_utl_unpack_la_LIBADD = $(LIBFLAMES)
-+flames_utl_unpack_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- flames_utl_unpack_la_LDFLAGS = -module -avoid-version
--flames_utl_unpack_la_DEPENDENCIES = $(LIBFLAMES)
-+flames_utl_unpack_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- uves_utl_remove_crh_single_la_SOURCES = uves_utl_remove_crh_single.c
--uves_utl_remove_crh_single_la_LIBADD = $(LIBUVES)
-+uves_utl_remove_crh_single_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_utl_remove_crh_single_la_LDFLAGS = -module -avoid-version
- uves_utl_remove_crh_single_la_DEPENDENCIES = $(LIBUVES)
-
-
- #uves_utl_rcosmic_la_SOURCES = uves_utl_rcosmic.c
--#uves_utl_rcosmic_la_LIBADD = $(LIBFLAMES)
-+#uves_utl_rcosmic_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #uves_utl_rcosmic_la_LDFLAGS = -module -avoid-version
--#uves_utl_rcosmic_la_DEPENDENCIES = $(LIBFLAMES)
-+#uves_utl_rcosmic_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- #uves_utl_physmod_la_SOURCES = uves_utl_physmod.c
--#uves_utl_physmod_la_LIBADD = $(LIBFLAMES)
-+#uves_utl_physmod_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #uves_utl_physmod_la_LDFLAGS = -module -avoid-version
--#uves_utl_physmod_la_DEPENDENCIES = $(LIBFLAMES)
-+#uves_utl_physmod_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- uves_utl_ima_arith_la_SOURCES = uves_utl_ima_arith.c
--uves_utl_ima_arith_la_LIBADD = $(LIBUVES)
-+uves_utl_ima_arith_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- uves_utl_ima_arith_la_LDFLAGS = -module -avoid-version
- uves_utl_ima_arith_la_DEPENDENCIES = $(LIBUVES)
-
- #uves_utl_dflat_la_SOURCES = uves_utl_dflat.c
--#uves_utl_dflat_la_LIBADD = $(LIBFLAMES)
-+#uves_utl_dflat_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #uves_utl_dflat_la_LDFLAGS = -module -avoid-version
--#uves_utl_dflat_la_DEPENDENCIES = $(LIBFLAMES)
-+#uves_utl_dflat_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
-
- #flames_extract_la_SOURCES = flames_extract.c
--#flames_extract_la_LIBADD = $(LIBFLAMES)
-+#flames_extract_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #flames_extract_la_LDFLAGS = -module -avoid-version
--#flames_extract_la_DEPENDENCIES = $(LIBFLAMES)
-+#flames_extract_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- #flames_fillordtab_la_SOURCES = flames_fillordtab.c
--#flames_fillordtab_la_LIBADD = $(LIBFLAMES)
-+#flames_fillordtab_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #flames_fillordtab_la_LDFLAGS = -module -avoid-version
--#flames_fillordtab_la_DEPENDENCIES = $(LIBFLAMES)
-+#flames_fillordtab_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- #flames_mes_slitff_size_la_SOURCES = flames_mes_slitff_size.c
--#flames_mes_slitff_size_la_LIBADD = $(LIBFLAMES)
-+#flames_mes_slitff_size_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #flames_mes_slitff_size_la_LDFLAGS = -module -avoid-version
--#flames_mes_slitff_size_la_DEPENDENCIES = $(LIBFLAMES)
-+#flames_mes_slitff_size_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- #flames_prepbkg_la_SOURCES = flames_prepbkg.c
--#flames_prepbkg_la_LIBADD = $(LIBFLAMES)
-+#flames_prepbkg_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #flames_prepbkg_la_LDFLAGS = -module -avoid-version
--#flames_prepbkg_la_DEPENDENCIES = $(LIBFLAMES)
-+#flames_prepbkg_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- #flames_prepfibreff_la_SOURCES = flames_prepfibreff.c
--#flames_prepfibreff_la_LIBADD = $(LIBFLAMES)
-+#flames_prepfibreff_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #flames_prepfibreff_la_LDFLAGS = -module -avoid-version
--#flames_prepfibreff_la_DEPENDENCIES = $(LIBFLAMES)
-+#flames_prepfibreff_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- #flames_prepnorm_la_SOURCES = flames_prepnorm.c
--#flames_prepnorm_la_LIBADD = $(LIBFLAMES)
-+#flames_prepnorm_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #flames_prepnorm_la_LDFLAGS = -module -avoid-version
--#flames_prepnorm_la_DEPENDENCIES = $(LIBFLAMES)
-+#flames_prepnorm_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
- #flames_prepslitff_la_SOURCES = flames_prepslitff.c
--#flames_prepslitff_la_LIBADD = $(LIBFLAMES)
-+#flames_prepslitff_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #flames_prepslitff_la_LDFLAGS = -module -avoid-version
--#flames_prepslitff_la_DEPENDENCIES = $(LIBFLAMES)
-+#flames_prepslitff_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
-
---- a/uves/Makefile.am
-+++ b/uves/Makefile.am
-@@ -184,5 +184,5 @@
-
-
- libuves_la_LDFLAGS = $(LDFLAGS) $(CPL_LDFLAGS) $(CFITSIO_LDFLAGS) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
--libuves_la_LIBADD = $(LIBIRPLIB) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(LIBQFITS) $(LIBCFITSIO)
-+libuves_la_LIBADD = $(LIBIRPLIB) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(LIBCEXT) $(LIBQFITS) $(LIBCFITSIO)
- libuves_la_DEPENDENCIES = $(LIBIRPLIB)
diff --git a/debian/patches/series b/debian/patches/series
index cb76689..d809ff5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
set_plugindir.patch
-use-std-paths-for-cpl.patch
use_system_qfits.patch
fix_compiler_errors.patch
fix_test_fail.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 1424f5f..1c5fc6b 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -1,8 +1,16 @@
-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: Sat, 1 Jul 2017 20:53:20 +0200
+Subject: Set the plugin directory so that esorex and python-cpl can find it.
+
+---
+ acinclude.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index f3bc885..aada0ff 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -213,7 +213,7 @@
+@@ -213,7 +213,7 @@ AC_DEFUN([UVES_SET_PATHS],
[
if test -z "$plugindir"; then
diff --git a/debian/patches/shlib-calls-exit.patch b/debian/patches/shlib-calls-exit.patch
deleted file mode 100644
index 4d76393..0000000
--- a/debian/patches/shlib-calls-exit.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Replace exit() by abort() in shared libs.
---- a/flames/flames_fileutils.c
-+++ b/flames/flames_fileutils.c
-@@ -180,7 +180,7 @@
- if (len > (PATHSET_MAX-1))
- {
- cpl_msg_error (cpl_func, "Buffer overflow in filename '%s' - fatal error", name);
-- exit (EXIT_FAILURE);
-+ abort();
- }
- (void) strcpy (str, name);
- }
-@@ -191,7 +191,7 @@
- if (cpp == NULL)
- {
- cpl_msg_error (cpl_func, "Env. variable HOME not set, could not replace `~'");
-- exit (EXIT_FAILURE);
-+ abort();
- }
-
- (void) strcpy (str,cpp);
-@@ -199,7 +199,7 @@
- if (len > PATHSET_MAX) /* -1 for (name+1) below */
- {
- cpl_msg_error (cpl_func, "Buffer overflow in filename '%s' - fatal error", name);
-- exit (EXIT_FAILURE);
-+ abort();
- }
-
- (void) strcat (str, name + 1);
-@@ -274,7 +274,7 @@
- if (len > (PATHSET_MAX-1))
- {
- cpl_msg_error (cpl_func, "Buffer overflow in filename '%s' - fatal error", name);
-- exit (EXIT_FAILURE);
-+ abort();
- }
-
- (void) strcpy (str, name);
-@@ -291,7 +291,7 @@
- if (len > (PATHSET_MAX-1))
- {
- cpl_msg_error (cpl_func, "Buffer overflow in filename '%s' - fatal error", name);
-- exit (EXIT_FAILURE);
-+ abort();
- }
-
- (void) strcpy (str,cpp);
-@@ -299,7 +299,7 @@
- else
- {
- cpl_msg_error (cpl_func, "Env. variable PWD not set - fatal errorn");
-- exit (EXIT_FAILURE);
-+ abort();
- }
-
-
-@@ -310,7 +310,7 @@
- if ((len+2) > (PATHSET_MAX-1))
- {
- cpl_msg_error (cpl_func, "Buffer overflow in filename '%s' - fatal error", name);
-- exit (EXIT_FAILURE);
-+ abort();
- }
- (void) strcat (str, "/.");
- len += 2;
-@@ -322,7 +322,7 @@
- cpl_msg_error (cpl_func, "Buffer overflow in filename '%s'", name);
- cpl_msg_error (cpl_func, "Fatal error replacing current working "
- "directory symbol due to buffer overflow");
-- exit (EXIT_FAILURE);
-+ abort();
- }
- (void) strcat(str, name + 1); /* Add the rest of the file name */
-
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 b56a67b..0000000
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use standard path and name for cpl
---- a/m4macros/cpl.m4
-+++ b/m4macros/cpl.m4
-@@ -8,7 +8,7 @@
-
- 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=""
-@@ -107,6 +107,7 @@
- cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/local/lib"
- cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/local/lib32"
- cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
-+ cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
- cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
-
-@@ -1314,7 +1315,7 @@
- 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=""
-@@ -1389,6 +1390,7 @@
- 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/use_system_qfits.patch b/debian/patches/use_system_qfits.patch
index b11282d..708cb55 100644
--- a/debian/patches/use_system_qfits.patch
+++ b/debian/patches/use_system_qfits.patch
@@ -1,6 +1,19 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use the qfits library provided by Debian instead of the
- convienience copy.
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 1 Jul 2017 20:53:20 +0200
+Subject: Use the qfits library provided by Debian instead of the convienience
+ copy.
+
+---
+ Makefile.am | 4 +---
+ acinclude.m4 | 2 +-
+ configure.ac | 1 -
+ flames/Makefile.am | 4 ++--
+ uves/Makefile.am | 4 ++--
+ uves/tests/Makefile.am | 2 +-
+ 6 files changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a8f7eed..a940693 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,11 +19,10 @@
@@ -16,7 +29,7 @@ Description: Use the qfits library provided by Debian instead of the
TOPSUBDIRS = irplib uves flames recipes regtests reflex
#TOPSUBDIRS = irplib uves recipes
-@@ -31,7 +30,6 @@
+@@ -31,7 +30,6 @@ TOPSUBDIRS = irplib uves flames recipes regtests reflex
COMPILE_LAST =
@@ -24,9 +37,11 @@ Description: Use the qfits library provided by Debian instead of the
SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) $(COMPILE_LAST)
+diff --git a/acinclude.m4 b/acinclude.m4
+index aada0ff..a195131 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -278,7 +278,7 @@
+@@ -278,7 +278,7 @@ AC_DEFUN([UVES_CREATE_SYMBOLS],
IRPLIB_INCLUDES='-I$(top_srcdir)/irplib'
# No -L for IRPLIB which is statically linked
@@ -35,9 +50,11 @@ Description: Use the qfits library provided by Debian instead of the
QF_LDFLAGS=""
+diff --git a/configure.ac b/configure.ac
+index ad4aad1..57922c2 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -108,7 +108,6 @@
+@@ -112,7 +112,6 @@ AM_WITH_DMALLOC
# uves/tests/Makefile
# recipes/Makefile)
@@ -45,9 +62,11 @@ Description: Use the qfits library provided by Debian instead of the
AC_CONFIG_FILES(Makefile
Makefile.purify
+diff --git a/flames/Makefile.am b/flames/Makefile.am
+index d3464ca..eb58111 100644
--- a/flames/Makefile.am
+++ b/flames/Makefile.am
-@@ -23,8 +23,8 @@
+@@ -23,8 +23,8 @@ DISTCLEANFILES = *~
SUBDIRS = . tests
@@ -58,9 +77,11 @@ Description: Use the qfits library provided by Debian instead of the
if MAINTAINER_MODE
+diff --git a/uves/Makefile.am b/uves/Makefile.am
+index 7bb62d8..70d1383 100644
--- a/uves/Makefile.am
+++ b/uves/Makefile.am
-@@ -23,8 +23,8 @@
+@@ -23,8 +23,8 @@ DISTCLEANFILES = *~
SUBDIRS = . tests
@@ -71,9 +92,11 @@ Description: Use the qfits library provided by Debian instead of the
if MAINTAINER_MODE
+diff --git a/uves/tests/Makefile.am b/uves/tests/Makefile.am
+index e5e41c3..228f094 100644
--- a/uves/tests/Makefile.am
+++ b/uves/tests/Makefile.am
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ endif
AM_CPPFLAGS = $(all_includes)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-uves.git
More information about the Debian-astro-commits
mailing list