[cpl-plugin-xsh] 05/05: Adjust for new version
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Apr 11 15:19:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository cpl-plugin-xsh.
commit 6d53f3dd4523553395feb8a192a7f3bade4ccd45
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Apr 11 17:06:14 2014 +0200
Adjust for new version
---
debian/changelog | 8 +
debian/control | 21 ++-
debian/patches/fix_typos.patch | 55 ------
debian/patches/lapack.patch | 27 ++-
debian/patches/libadd_cpl.patch | 314 ----------------------------------
debian/patches/series | 3 -
debian/patches/shlib-calls-exit.patch | 134 ---------------
debian/watch | 2 +-
8 files changed, 35 insertions(+), 529 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5cb3fa3..f831db9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cpl-plugin-xshoo (2.4.0+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+ * Rename package to cpl-plugin-xshoo
+ * Change maintainer and VCS location to debian-astro
+
+ -- Ole Streicher <debian at liska.ath.cx> Fri, 11 Apr 2014 16:58:53 +0200
+
cpl-plugin-xsh (2.3.0+dfsg-3) unstable; urgency=low
* Lower -doc dependency to "suggested"
diff --git a/debian/control b/debian/control
index 7e193e1..ec72941 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: cpl-plugin-xsh
+Source: cpl-plugin-xshoo
Section: science
Priority: optional
Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.debian.org>
@@ -17,11 +17,14 @@ Homepage: http://www.eso.org/sci/software/pipelines/xshooter/
Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-xsh.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-xsh.git
-Package: cpl-plugin-xsh
+Package: cpl-plugin-xshoo
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: esorex|python-cpl
-Suggests: cpl-plugin-xsh-calib, cpl-plugin-xsh-doc
+Suggests: cpl-plugin-xshoo-calib, cpl-plugin-xshoo-doc
+Provides: cpl-plugin-xsh
+Replaces: cpl-plugin-xsh
+Conflicts: cpl-plugin-xsh
Multi-Arch: same
Description: ESO data reduction pipeline for XSHOOTER
This is the data reduction pipeline for the XSHOOTER instrument of the
@@ -35,22 +38,26 @@ Description: ESO data reduction pipeline for XSHOOTER
* VIS, covering the wavelength range 559.5-1024 nm,
* NIR, covering the wavelength range 1024-2480 nm.
-Package: cpl-plugin-xsh-doc
+Package: cpl-plugin-xshoo-doc
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Replaces: cpl-plugin-xsh (= 2.3.0+dfsg-1)
-Breaks: cpl-plugin-xsh (= 2.3.0+dfsg-1)
+Provides: cpl-plugin-xsh-doc
+Replaces: cpl-plugin-xsh-doc
+Conflicts: cpl-plugin-xsh-doc
Section: doc
Description: ESO data reduction pipeline documentation for XSHOOTER
This package contains the HTML documentation and manpages for the data
reduction pipeline for the XSHOOTER instrument of the Very Large Telescope
(VLT) from the European Southern Observatory (ESO).
-Package: cpl-plugin-xsh-calib
+Package: cpl-plugin-xshoo-calib
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}, cpl-plugin-xsh, wget
+Provides: cpl-plugin-xsh-calib
+Replaces: cpl-plugin-xsh-calib
+Conflicts: cpl-plugin-xsh-calib
Section: contrib/science
Description: ESO data reduction pipeline calibration data downloader for XSHOOTER
This package downloads calibration and other static data of the
diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
deleted file mode 100644
index f4816da..0000000
--- a/debian/patches/fix_typos.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix several typos mentioned by lintian
---- a/xsh/xsh_compute_noise_map.c
-+++ b/xsh/xsh_compute_noise_map.c
-@@ -171,7 +171,7 @@
- //xsh_msg( "pixel[%d,%d] (%d) = %lf", ix, iy, idpix, fval ) ;
- if (rej > 0) {
- /* bad pixel */
-- xsh_msg_dbg_medium("Dont use pixel %d,%d [%d]", ix, iy, j);
-+ xsh_msg_dbg_medium("Don't use pixel %d,%d [%d]", ix, iy, j);
- continue;
- }
- sum += fval;
---- a/xsh/xsh_compute_response.c
-+++ b/xsh/xsh_compute_response.c
-@@ -2269,7 +2269,7 @@
-
- double flux_save=0;
-
-- cpl_error_ensure(ref_std_star_list != NULL, CPL_ERROR_NULL_INPUT,return res,"NULL input refence std star list");
-+ cpl_error_ensure(ref_std_star_list != NULL, CPL_ERROR_NULL_INPUT,return res,"NULL input reference std star list");
- cpl_error_ensure(resp_fit_points != NULL, CPL_ERROR_NULL_INPUT,return res,"NULL input table with response fit points");
- cpl_error_ensure(inst != NULL, CPL_ERROR_NULL_INPUT,return res,"NULL input instrument");
-
---- a/xsh/xsh_detmon.c
-+++ b/xsh/xsh_detmon.c
-@@ -614,7 +614,7 @@
- "CPL_TYPE_INT", ref_ury,
-
- "stacking.method",
-- "Method to be used when stacking the master. Posible values < MINMAX | MEAN | MEDIAN | KSIGMA >",
-+ "Method to be used when stacking the master. Possible values < MINMAX | MEAN | MEDIAN | KSIGMA >",
- "CPL_TYPE_STRING", stacking_method,
-
- "stacking.ks.low",
-@@ -2495,7 +2495,7 @@
- skip_if(cpl_propertylist_append(xplist, qclist));
- }
-
-- cpl_msg_info(cpl_func,"dealing with extention %d",whichext);
-+ cpl_msg_info(cpl_func,"dealing with extension %d",whichext);
-
- /* This is only used later for PAF */
- /* Get FITS header from reference file */
---- a/xsh/xsh_parameters.c
-+++ b/xsh/xsh_parameters.c
-@@ -1018,7 +1018,7 @@
- check( xsh_parameters_new_boolean( list, recipe_id,
- "detectorder-qc-mode",
- CPL_FALSE,
-- "If true allows to skip edge detection on orders below detectorder-min-sn (oly for QC mode, not to be set by normal users)"));
-+ "If true allows one to skip edge detection on orders below detectorder-min-sn (oly for QC mode, not to be set by normal users)"));
-
- cleanup:
- return;
diff --git a/debian/patches/lapack.patch b/debian/patches/lapack.patch
index 5a52345..68fc54d 100644
--- a/debian/patches/lapack.patch
+++ b/debian/patches/lapack.patch
@@ -34,13 +34,19 @@ Description: Replace clapack by lapack.
else
--- a/xsh/xsh_subtract_sky_single.c
+++ b/xsh/xsh_subtract_sky_single.c
-@@ -67,9 +67,10 @@
- #ifdef DARWIN
- #include <vecLib/clapack.h>
- #else
+@@ -71,14 +71,11 @@
+ * implements its own version of this type, which otherwise breaks
+ * complation. We do not however use the complex type in this source
+ * file so this workaround should be harmless. */
+- #ifdef complex
+- #undef complex
+- #endif
+- #define complex f2c_complex
+-
- #include <f2c.h>
- #include <clapack.h>
-#endif
++
+void spbtrf_(char *, int *, int *, float *, int *, int *);
+void spbtrs_(char *, int *, int *, int *, const float *,
+ int *, float *,int *, int *);
@@ -48,16 +54,7 @@ Description: Replace clapack by lapack.
#define REGDEBUG_MEDIAN_SPLINE 0
/*-----------------------------------------------------------------------------
-@@ -245,7 +246,7 @@
-
- double kappa2 = kappa*kappa;
- for (iii=0;iii<niter;iii++){
-- int nfit=0, err;
-+ int nfit=0;
- char uplo='U';
-
- /* Mac OS X uses different clapack.h type definitions,
-@@ -258,12 +259,12 @@
+@@ -268,12 +265,12 @@
__CLPK_integer ldb=ncoeffs;
__CLPK_integer info=0;
#else
@@ -76,7 +73,7 @@ Description: Replace clapack by lapack.
#endif
/* Fill the basis function (Bn) and flux (y) matrices for the fitted lambda,
-@@ -351,8 +352,8 @@
+@@ -361,8 +358,8 @@
}
/* Do the fit, by Cholesky decomposition, using Lapack functions sptrf and spdtrs */
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
deleted file mode 100644
index 904f297..0000000
--- a/debian/patches/libadd_cpl.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Add the cpl libraries to the recips.so and the test program
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -110,109 +110,109 @@
- #xsh_absorp_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_cfg_recover_la_SOURCES = xsh_cfg_recover.c
--xsh_cfg_recover_la_LIBADD = $(LIBXSH)
-+xsh_cfg_recover_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
- xsh_cfg_recover_la_LDFLAGS = -module -avoid-version
- xsh_cfg_recover_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_lingain_la_SOURCES = xsh_lingain.c
--xsh_lingain_la_LIBADD = $(LIBXSH)
-+xsh_lingain_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_lingain_la_LDFLAGS = -module -avoid-version
- xsh_lingain_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_mbias_la_SOURCES = xsh_mbias.c
--xsh_mbias_la_LIBADD = $(LIBXSH)
-+xsh_mbias_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_mbias_la_LDFLAGS = -module -avoid-version
- xsh_mbias_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_mdark_la_SOURCES = xsh_mdark.c
--xsh_mdark_la_LIBADD = $(LIBXSH)
-+xsh_mdark_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_mdark_la_LDFLAGS = -module -avoid-version
- xsh_mdark_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_mflat_la_SOURCES = xsh_mflat.c
--xsh_mflat_la_LIBADD = $(LIBXSH)
-+xsh_mflat_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_mflat_la_LDFLAGS = -module -avoid-version
- xsh_mflat_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_orderpos_la_SOURCES = xsh_orderpos.c
--xsh_orderpos_la_LIBADD = $(LIBXSH)
-+xsh_orderpos_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_orderpos_la_LDFLAGS = -module -avoid-version
- xsh_orderpos_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_predict_la_SOURCES = xsh_predict.c
--xsh_predict_la_LIBADD = $(LIBXSH)
-+xsh_predict_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_predict_la_LDFLAGS = -module -avoid-version
- xsh_predict_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_2dmap_la_SOURCES = xsh_2dmap.c
--xsh_2dmap_la_LIBADD = $(LIBXSH)
-+xsh_2dmap_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_2dmap_la_LDFLAGS = -module -avoid-version
- xsh_2dmap_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_wavecal_la_SOURCES = xsh_wavecal.c
--xsh_wavecal_la_LIBADD = $(LIBXSH)
-+xsh_wavecal_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_wavecal_la_LDFLAGS = -module -avoid-version
- xsh_wavecal_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_flexcomp_la_SOURCES = xsh_flexcomp.c
--xsh_flexcomp_la_LIBADD = $(LIBXSH)
-+xsh_flexcomp_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_flexcomp_la_LDFLAGS = -module -avoid-version
- xsh_flexcomp_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_respon_slit_stare_la_SOURCES = xsh_respon_slit_stare.c
--xsh_respon_slit_stare_la_LIBADD = $(LIBXSH)
-+xsh_respon_slit_stare_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_respon_slit_stare_la_LDFLAGS = -module -avoid-version
- xsh_respon_slit_stare_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_respon_slit_offset_la_SOURCES = xsh_respon_slit_offset.c
--xsh_respon_slit_offset_la_LIBADD = $(LIBXSH)
-+xsh_respon_slit_offset_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_respon_slit_offset_la_LDFLAGS = -module -avoid-version
- xsh_respon_slit_offset_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_respon_slit_nod_la_SOURCES = xsh_respon_slit_nod.c
--xsh_respon_slit_nod_la_LIBADD = $(LIBXSH)
-+xsh_respon_slit_nod_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_respon_slit_nod_la_LDFLAGS = -module -avoid-version
- xsh_respon_slit_nod_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_scired_slit_stare_la_SOURCES = xsh_scired_slit_stare.c
--xsh_scired_slit_stare_la_LIBADD = $(LIBXSH)
-+xsh_scired_slit_stare_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_scired_slit_stare_la_LDFLAGS = -module -avoid-version
- xsh_scired_slit_stare_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_scired_slit_nod_la_SOURCES = xsh_scired_slit_nod.c
--xsh_scired_slit_nod_la_LIBADD = $(LIBXSH)
-+xsh_scired_slit_nod_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_scired_slit_nod_la_LDFLAGS = -module -avoid-version
- xsh_scired_slit_nod_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_scired_slit_offset_la_SOURCES = xsh_scired_slit_offset.c
--xsh_scired_slit_offset_la_LIBADD = $(LIBXSH)
-+xsh_scired_slit_offset_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_scired_slit_offset_la_LDFLAGS = -module -avoid-version
- xsh_scired_slit_offset_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_scired_ifu_stare_la_SOURCES = xsh_util_ifu_stare.c
--xsh_scired_ifu_stare_la_LIBADD = $(LIBXSH)
-+xsh_scired_ifu_stare_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_scired_ifu_stare_la_LDFLAGS = -module -avoid-version
- xsh_scired_ifu_stare_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_scired_ifu_offset_la_SOURCES = xsh_util_ifu_offset.c
--xsh_scired_ifu_offset_la_LIBADD = $(LIBXSH)
-+xsh_scired_ifu_offset_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_scired_ifu_offset_la_LDFLAGS = -module -avoid-version
- xsh_scired_ifu_offset_la_DEPENDENCIES = $(LIBXSH)
-
-
- xsh_scired_ifu_stare_drl_la_SOURCES = xsh_scired_ifu_stare.c
--xsh_scired_ifu_stare_drl_la_LIBADD = $(LIBXSH)
-+xsh_scired_ifu_stare_drl_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_scired_ifu_stare_drl_la_LDFLAGS = -module -avoid-version
- xsh_scired_ifu_stare_drl_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_scired_ifu_offset_drl_la_SOURCES = xsh_scired_ifu_offset.c
--xsh_scired_ifu_offset_drl_la_LIBADD = $(LIBXSH)
-+xsh_scired_ifu_offset_drl_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_scired_ifu_offset_drl_la_LDFLAGS = -module -avoid-version
- xsh_scired_ifu_offset_drl_la_DEPENDENCIES = $(LIBXSH)
-
-
- xsh_util_physmod_la_SOURCES = xsh_util_physmod.c
--xsh_util_physmod_la_LIBADD = $(LIBXSH)
-+xsh_util_physmod_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_util_physmod_la_LDFLAGS = -module -avoid-version
- xsh_util_physmod_la_DEPENDENCIES = $(LIBXSH)
-
-@@ -223,141 +223,141 @@
- #xsh_util_ipml_la_CPPFLAGS=-Wall -fPIC $(CPL_INCLUDES) -rdynamic
-
- #xsh_util_bpmap2rp_la_SOURCES = xsh_util_bpmap2rp.c
--#xsh_util_bpmap2rp_la_LIBADD = $(LIBXSH)
-+#xsh_util_bpmap2rp_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_bpmap2rp_la_LDFLAGS = -module -avoid-version
- #xsh_util_bpmap2rp_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_bpmap_nl_raw2pre_la_SOURCES = xsh_util_bpmap_nl_raw2pre.c
--#xsh_util_bpmap_nl_raw2pre_la_LIBADD = $(LIBXSH)
-+#xsh_util_bpmap_nl_raw2pre_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_bpmap_nl_raw2pre_la_LDFLAGS = -module -avoid-version
- #xsh_util_bpmap_nl_raw2pre_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_bpmap_coadd_la_SOURCES = xsh_util_bpmap_coadd.c
--#xsh_util_bpmap_coadd_la_LIBADD = $(LIBXSH)
-+#xsh_util_bpmap_coadd_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_bpmap_coadd_la_LDFLAGS = -module -avoid-version
- #xsh_util_bpmap_coadd_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_afc_la_SOURCES = xsh_util_afc.c
--#xsh_util_afc_la_LIBADD = $(LIBXSH)
-+#xsh_util_afc_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_afc_la_LDFLAGS = -module -avoid-version
- #xsh_util_afc_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_crh_single_la_SOURCES = xsh_util_crh_single.c
--#xsh_util_crh_single_la_LIBADD = $(LIBXSH)
-+#xsh_util_crh_single_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_crh_single_la_LDFLAGS = -module -avoid-version
- #xsh_util_crh_single_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_efficiency2d_la_SOURCES = xsh_util_efficiency2d.c
--#xsh_util_efficiency2d_la_LIBADD = $(LIBXSH)
-+#xsh_util_efficiency2d_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_efficiency2d_la_LDFLAGS = -module -avoid-version
- #xsh_util_efficiency2d_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_efficiency1d_la_SOURCES = xsh_util_efficiency1d.c
--#xsh_util_efficiency1d_la_LIBADD = $(LIBXSH)
-+#xsh_util_efficiency1d_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_efficiency1d_la_LDFLAGS = -module -avoid-version
- #xsh_util_efficiency1d_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_integrate_la_SOURCES = xsh_util_integrate.c
--#xsh_util_integrate_la_LIBADD = $(LIBXSH)
-+#xsh_util_integrate_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_integrate_la_LDFLAGS = -module -avoid-version
- #xsh_util_integrate_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_ima_oversample_la_SOURCES = xsh_util_ima_oversample.c
--#xsh_util_ima_oversample_la_LIBADD = $(LIBXSH)
-+#xsh_util_ima_oversample_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_ima_oversample_la_LDFLAGS = -module -avoid-version
- #xsh_util_ima_oversample_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_ima_subsample_la_SOURCES = xsh_util_ima_subsample.c
--#xsh_util_ima_subsample_la_LIBADD = $(LIBXSH)
-+#xsh_util_ima_subsample_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_ima_subsample_la_LDFLAGS = -module -avoid-version
- #xsh_util_ima_subsample_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_apply_response_la_SOURCES = xsh_util_apply_response.c
--#xsh_util_apply_response_la_LIBADD = $(LIBXSH)
-+#xsh_util_apply_response_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_apply_response_la_LDFLAGS = -module -avoid-version
- #xsh_util_apply_response_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_compute_response_la_SOURCES = xsh_util_compute_response.c
--#xsh_util_compute_response_la_LIBADD = $(LIBXSH)
-+#xsh_util_compute_response_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_compute_response_la_LDFLAGS = -module -avoid-version
- #xsh_util_compute_response_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_ima_getextno_la_SOURCES = xsh_util_ima_getextno.c
--#xsh_util_ima_getextno_la_LIBADD = $(LIBXSH)
-+#xsh_util_ima_getextno_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_ima_getextno_la_LDFLAGS = -module -avoid-version
- #xsh_util_ima_getextno_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_ima_arith_la_SOURCES = xsh_util_ima_arith.c
--#xsh_util_ima_arith_la_LIBADD = $(LIBXSH)
-+#xsh_util_ima_arith_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_ima_arith_la_LDFLAGS = -module -avoid-version
- #xsh_util_ima_arith_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_ima_shift_la_SOURCES = xsh_util_ima_shift.c
--#xsh_util_ima_shift_la_LIBADD = $(LIBXSH)
-+#xsh_util_ima_shift_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_ima_shift_la_LDFLAGS = -module -avoid-version
- #xsh_util_ima_shift_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_ima_rebin_la_SOURCES = xsh_util_ima_rebin.c
--#xsh_util_ima_rebin_la_LIBADD = $(LIBXSH)
-+#xsh_util_ima_rebin_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_ima_rebin_la_LDFLAGS = -module -avoid-version
- #xsh_util_ima_rebin_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_linear_la_SOURCES = xsh_linear.c
--#xsh_linear_la_LIBADD = $(LIBXSH)
-+#xsh_linear_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_linear_la_LDFLAGS = -module -avoid-version
- #xsh_linear_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_model_compute_la_SOURCES = xsh_model_compute.c
--#xsh_model_compute_la_LIBADD = $(LIBXSH)
-+#xsh_model_compute_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_model_compute_la_LDFLAGS = -module -avoid-version
- #xsh_model_compute_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_model_anneal_la_SOURCES = xsh_model_anneal.c
--#xsh_model_anneal_la_LIBADD = $(LIBXSH)
-+#xsh_model_anneal_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_model_anneal_la_LDFLAGS = -module -avoid-version
- #xsh_model_anneal_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_model_first_anneal_la_SOURCES = xsh_model_first_anneal.c
--#xsh_model_first_anneal_la_LIBADD = $(LIBXSH)
-+#xsh_model_first_anneal_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_model_first_anneal_la_LDFLAGS = -module -avoid-version
- #xsh_model_first_anneal_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_genconfig_la_SOURCES = xsh_util_genconfig.c
--#xsh_util_genconfig_la_LIBADD = $(LIBXSH)
-+#xsh_util_genconfig_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_genconfig_la_LDFLAGS = -module -avoid-version
- #xsh_util_genconfig_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_respon_uvbvis_la_SOURCES = xsh_respon_uvbvis.c
--#xsh_respon_uvbvis_la_LIBADD = $(LIBXSH)
-+#xsh_respon_uvbvis_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_respon_uvbvis_la_LDFLAGS = -module -avoid-version
- #xsh_respon_uvbvis_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_respon_visnir_la_SOURCES = xsh_respon_visnir.c
--#xsh_respon_visnir_la_LIBADD = $(LIBXSH)
-+#xsh_respon_visnir_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_respon_visnir_la_LDFLAGS = -module -avoid-version
- #xsh_respon_visnir_la_DEPENDENCIES = $(LIBXSH)
-
- xsh_geom_ifu_la_SOURCES = xsh_geom_ifu.c
--xsh_geom_ifu_la_LIBADD = $(LIBXSH)
-+xsh_geom_ifu_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- xsh_geom_ifu_la_LDFLAGS = -module -avoid-version
- xsh_geom_ifu_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_ifu_stare_la_SOURCES = xsh_util_ifu_stare.c
--#xsh_util_ifu_stare_la_LIBADD = $(LIBXSH)
-+#xsh_util_ifu_stare_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_ifu_stare_la_LDFLAGS = -module -avoid-version
- #xsh_util_ifu_stare_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_ifu_offset_la_SOURCES = xsh_util_ifu_offset.c
--#xsh_util_ifu_offset_la_LIBADD = $(LIBXSH)
-+#xsh_util_ifu_offset_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_ifu_offset_la_LDFLAGS = -module -avoid-version
- #xsh_util_ifu_offset_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_ifu_build_cube_la_SOURCES = xsh_util_ifu_build_cube.c
--#xsh_util_ifu_build_cube_la_LIBADD = $(LIBXSH)
-+#xsh_util_ifu_build_cube_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_ifu_build_cube_la_LDFLAGS = -module -avoid-version
- #xsh_util_ifu_build_cube_la_DEPENDENCIES = $(LIBXSH)
-
- #xsh_util_guess_xy_la_SOURCES = xsh_util_guess_xy.c
--#xsh_util_guess_xy_la_LIBADD = $(LIBXSH)
-+#xsh_util_guess_xy_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #xsh_util_guess_xy_la_LDFLAGS = -module -avoid-version
- #xsh_util_guess_xy_la_DEPENDENCIES = $(LIBXSH)
---- a/xsh/Makefile.am
-+++ b/xsh/Makefile.am
-@@ -221,5 +221,5 @@
-
-
- libxsh_la_LDFLAGS = $(LAPACK_LDFLAGS) $(GSL_LDFLAGS) $(CPL_LDFLAGS) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
--libxsh_la_LIBADD = $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(GSL_LIBS) $(LIBLAPACK)
-+libxsh_la_LIBADD = $(LIBCEXT) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(GSL_LIBS) $(LIBLAPACK) $(LIBCFITSIO)
- libxsh_la_DEPENDENCIES =
diff --git a/debian/patches/series b/debian/patches/series
index 678b99d..8ef9dde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-libadd_cpl.patch
set_plugindir.patch
use-std-paths-for-cpl.patch
lapack.patch
-fix_typos.patch
-shlib-calls-exit.patch
force-serial-tests.patch
diff --git a/debian/patches/shlib-calls-exit.patch b/debian/patches/shlib-calls-exit.patch
deleted file mode 100644
index 276fa24..0000000
--- a/debian/patches/shlib-calls-exit.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Replace exit() by abort() in shared libs.
---- a/xsh/xsh_compute_response.c
-+++ b/xsh/xsh_compute_response.c
-@@ -2890,7 +2890,7 @@
- ncoeffs = 12;
- } else {
- xsh_msg("instrument arm not set");
-- exit(0);
-+ abort();
- }
- nbreak = ncoeffs + 2 - order;
-
-@@ -3400,7 +3400,7 @@
- }
-
- //response_fit=xsh_bspline_interpol(response,phigh,instrument);
-- //exit(0);
-+ //abort();
- /*
- double* spline_fit=NULL;
- int i=0;
---- a/xsh/xsh_create_master.c
-+++ b/xsh/xsh_create_master.c
-@@ -373,7 +373,7 @@
- xsh_pfits_set_qc_norm_fpn(preFrame->data_header,qc_fpn_val);
- xsh_pfits_set_qc_norm_fpn_err(preFrame->data_header,qc_fpn_err);
- }
-- //exit(0);
-+ //abort();
- /* xsh_msg("DRS fpn=%g",qc_fpn_val); */
-
- cleanup:
---- a/xsh/xsh_model_anneal.c
-+++ b/xsh/xsh_model_anneal.c
-@@ -233,7 +233,7 @@
- /* FILE * matchfile=fopen("match.dat","r");*/
- if(measfile ==NULL ){
- printf("Cannot open the measured coords file\n");
-- exit(EXIT_FAILURE);}
-+ abort();}
-
- while(fscanf(measfile, "%d %lf %lf %d %lf %d %lf %d\n",
- &meas_coord[feat_cnt].counter,
-@@ -249,7 +249,7 @@
- fclose(measfile);
- if (feat_cnt != sizearraywavelengths) {
- printf("Number of spectral features is not equal to the number of wavelengths and slit posn's supplied! \n %d != %d \n",feat_cnt, sizearraywavelengths);
-- exit(EXIT_FAILURE);}
-+ abort();}
- }
-
- /*count lines of the calibration files in order to dimension the array's size.*/
-@@ -265,7 +265,7 @@
- int linecounter=0;
- if((myfile=fopen((char*)filename,"r"))==NULL){
- printf("Cannot open file %s for reading.\n",filename);
-- exit(EXIT_FAILURE);
-+ abort();
- }
-
- do
---- a/xsh/xsh_model_metric.c
-+++ b/xsh/xsh_model_metric.c
-@@ -146,7 +146,7 @@
-
- if ( xsh_SAInit(xsh_3_energy,nparam) == 0 ) {
- fprintf(stderr,"trouble initializing in xsh_SAInit\n");
-- exit(1);
-+ abort();
- }
-
- local_p_abest=abest;
---- a/xsh/xsh_model_r250.c
-+++ b/xsh/xsh_model_r250.c
-@@ -243,14 +243,14 @@
- if ( argc != 3 )
- {
- printf("Usage -- %s nmr_bins seed\n", argv[0]);
-- exit(1);
-+ abort();
- }
-
- nmr_bins = atoi( argv[1] );
- if ( nmr_bins > MAX_BINS )
- {
- printf("ERROR -- maximum number of bins is %d\n", MAX_BINS);
-- exit(1);
-+ abort();
- }
-
- seed = atoi( argv[2] );
-@@ -261,7 +261,7 @@
- {
- for (j = 0; j < NMR_RAND; j++)
- printf("%f\n", xsh_dr250() );
-- exit(0);
-+ abort();
- }
-
- bin_inc = 1.0 / nmr_bins;
---- a/xsh/xsh_utils_efficiency.c
-+++ b/xsh/xsh_utils_efficiency.c
-@@ -1109,7 +1109,7 @@
- //check(cpl_table_save(tbl_eff,plist, x_plist,name_eff, CPL_IO_DEFAULT));
- }
-
-- //exit(0);
-+ //abort();
-
- xsh_msg("nclip_tot=%d",nclip_tot);
- HIGH_ABS_REGION * phigh=NULL;
---- a/xsh/xsh_utils_image.c
-+++ b/xsh/xsh_utils_image.c
-@@ -1789,7 +1789,7 @@
- j_stack += 2;
- if (j_stack > PIX_STACK_SIZE) {
- xsh_msg_error("stack too small : aborting");
-- exit(-2001) ;
-+ abort() ;
- }
- if (ir-i+1 >= j-l) {
- i_stack[j_stack-1] = ir;
---- a/xsh/xsh_model_io.c
-+++ b/xsh/xsh_model_io.c
-@@ -695,7 +695,7 @@
- (p_all_par+ii)->best>(p_all_par+ii)->max) {
- printf("limits wrong in config file for parameter: %s \n",
- (p_all_par+ii)->name);
-- exit (EXIT_FAILURE);
-+ abort();
- }
- }
- }
diff --git a/debian/watch b/debian/watch
index 5d6d0fc..c79fe49 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
version=3
opts=dversionmangle=s/\+dfsg// \
http://www.eso.org/sci/software/pipelines/ \
- .*/xsh-kit-(.*).tar.gz \
+ .*/xshoo-kit-(.*).tar.gz \
debian debian/repackage.sh
--
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-science-commits
mailing list