[cpl-plugin-xsh] 05/33: Adjust debian files for Xshooter
Ole Streicher
olebole-guest at alioth.debian.org
Fri Oct 18 08:11:00 UTC 2013
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 a65534958fe34a0a98a76febc9400cece3ee6fbb
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Jan 10 15:07:09 2013 +0100
Adjust debian files for Xshooter
---
debian/changelog | 5 +
debian/control | 35 ++-
debian/copyright | 8 +-
debian/cpl-plugin-calib.install.template | 1 -
debian/cpl-plugin-xsh-calib.install | 1 +
...gin.install.template => cpl-plugin-xsh.install} | 0
debian/patches/libadd_cpl.patch | 315 ++++++++++++++++++--
debian/patches/set_plugindir.patch | 2 +-
debian/patches/use-std-paths-for-cpl.patch | 66 +++-
debian/watch | 2 +-
10 files changed, 384 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..6a03d8b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+cpl-plugin-xsh (2.0.0-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #XXXXXX)
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 10 Jan 2013 14:45:43 +0100
diff --git a/debian/control b/debian/control
index b83f1ae..e7f7d05 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,37 @@
-Source: cpl-plugin-template
+Source: cpl-plugin-xsh
Section: science
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 9), dh-autoreconf, libcpl-dev (>= 5.3.1)
+Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
+ libcpl-dev (>= 5.3.1),
+ libgsl0-dev,
+ liblapack-dev
Standards-Version: 3.9.4
-Homepage: http://www.eso.org/sci/software/pipelines/template
-Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-template.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-template.git
+Homepage: http://www.eso.org/sci/software/pipelines/xsh
+Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-xsh.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-xsh.git
-Package: cpl-plugin-template
+Package: cpl-plugin-xsh
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: cpl-plugin-template-calib
+Suggests: cpl-plugin-xsh-calib
Recommends: esorex|python-cpl
Multi-Arch: same
-Description: ESO data reduction pipeline template
- This is the data reduction pipeline for the Template instrument of the
+Description: ESO data reduction pipeline XSHOOTER
+ This is the data reduction pipeline for the XSHOOTER instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
.
- This package is used as a template for the other ESO recipes. It is not
- meant to built as a package.
+ XSHOOTER is a multi wavelength (300-2500nm) medium resolution spectrograph
+ mounted at the UT2 Cassegrain focus. XSHOOTER consists of 3 arms, each with
+ optimized optics, dispersive elements and detectors.
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-xsh-calib
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Description: ESO data reduction pipeline calibration data template
- This package contains calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+Description: ESO data reduction pipeline calibration data XSHOOTER
+ This package contains calibration and other static data of the
+ data reduction pipeline for the XSHOOTER instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --git a/debian/copyright b/debian/copyright
index 9d4c5a3..f7eab08 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: template
-Upstream-Author: Firstname Lastname <flastname at eso.org>
-Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
+Upstream-Name: xsh
+Upstream-Author: Andrea Modigliani <Andrea.Modigliani at eso.org>
+Source: ftp://ftp.eso.org/pub/dfs/pipelines/xsh/
-Files: *
+Files: *
Copyright: Copyright (C) 2001-2012 European Southern Observatory
License: GPL-v2+
This program is free software; you can redistribute it and/or modify
diff --git a/debian/cpl-plugin-calib.install.template b/debian/cpl-plugin-calib.install.template
deleted file mode 100644
index 5de4a5c..0000000
--- a/debian/cpl-plugin-calib.install.template
+++ /dev/null
@@ -1 +0,0 @@
-calib/* usr/share/cpl-plugins/template
diff --git a/debian/cpl-plugin-xsh-calib.install b/debian/cpl-plugin-xsh-calib.install
new file mode 100644
index 0000000..838f976
--- /dev/null
+++ b/debian/cpl-plugin-xsh-calib.install
@@ -0,0 +1 @@
+calib/* usr/share/cpl-plugins/xsh
diff --git a/debian/cpl-plugin.install.template b/debian/cpl-plugin-xsh.install
similarity index 100%
rename from debian/cpl-plugin.install.template
rename to debian/cpl-plugin-xsh.install
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 1f4ee35..b4ade80 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,24 +1,305 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Add the cpl libraries to the recips.so and the test program
---- a/template/tests/Makefile.am
-+++ b/template/tests/Makefile.am
-@@ -32,7 +32,7 @@
- LIBTEMPLATE = $(top_builddir)/template/libtemplate.la
+--- a/recipes/Makefile.am
++++ b/recipes/Makefile.am
+@@ -110,109 +110,109 @@
+ #xsh_absorp_la_DEPENDENCIES = $(LIBXSH)
- INCLUDES = $(all_includes)
--LDADD = $(LIBTEMPLATE)
-+LDADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLUI)
+ xsh_cfg_recover_la_SOURCES = xsh_cfg_recover.c
+-xsh_cfg_recover_la_LIBADD = $(LIBXSH)
++xsh_cfg_recover_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ xsh_cfg_recover_la_LDFLAGS = -module -avoid-version
+ xsh_cfg_recover_la_DEPENDENCIES = $(LIBXSH)
- check_PROGRAMS = template_dfs-test
+ 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)
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -36,7 +36,7 @@
- plugin_LTLIBRARIES = rrrecipe.la rrrecipe_calib.la
+ 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)
- rrrecipe_la_SOURCES = rrrecipe.c
--rrrecipe_la_LIBADD = $(LIBTEMPLATE)
-+rrrecipe_la_LIBADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- rrrecipe_la_LDFLAGS = -module -avoid-version
- rrrecipe_la_DEPENDENCIES = $(LIBTEMPLATE)
+ #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)
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9c9230a..9bd7b0e 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Set the plugin directory so that esorex and python-cpl can find it.
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -86,7 +86,7 @@
+@@ -339,7 +339,7 @@
[
if test -z "$plugindir"; then
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index ae95068..e212670 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -2,20 +2,62 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Use standard path and name for cpl
--- a/m4macros/cpl.m4
+++ b/m4macros/cpl.m4
-@@ -41,7 +41,7 @@
+@@ -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=""
+@@ -109,7 +109,7 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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_MSG_CHECKING([for CPL])
- cpl_check_cpl_header="cpl_macros.h"
-- cpl_check_cpl_lib="libcplcore.la"
+ cpl_check_cpl_header="cpl.h"
+- cpl_check_cpl_lib="libcplcore.a"
+ cpl_check_cpl_lib="libcplcore.so"
- cpl_includes=""
- cpl_libraries=""
-@@ -97,6 +97,7 @@
- cpl_libdirs="/opt/cpl/lib \
- /usr/local/lib \
- /usr/local/cpl/lib \
-+ /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
- /usr/lib"
+ cpl_incdirs=""
+ cpl_libdirs=""
+@@ -1391,6 +1394,7 @@
+ 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/lib $cpl_libdirs"
+ test -n "$CPLDIR" && \
+ cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \
diff --git a/debian/watch b/debian/watch
index 4e895da..24a11b4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
http://www.eso.org/sci/software/pipelines/ \
- .*/template-kit-(.*).tar.gz \
+ .*/xsh-kit-(.*).tar.gz \
debian debian/repackage.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-xsh.git
More information about the debian-science-commits
mailing list