[cpl-plugin-sinfo] 06/42: Adjust debian files for SINFONI
Ole Streicher
olebole-guest at alioth.debian.org
Mon Sep 16 11:16:18 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-sinfo.
commit 1c8a482711b4b6499c1bc22e7c539f77c9563b76
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Jan 7 16:49:32 2013 +0100
Adjust debian files for SINFONI
---
debian/changelog | 5 +
debian/control | 34 ++-
debian/copyright | 6 +-
debian/cpl-plugin-calib.install.template | 1 -
debian/cpl-plugin-sinfo-calib.install | 1 +
...n.install.template => cpl-plugin-sinfo.install} | 0
debian/patches/libadd_cpl.patch | 254 ++++++++++++++++++--
debian/patches/set_plugindir.patch | 2 +-
debian/patches/use-std-paths-for-cpl.patch | 66 ++++-
debian/watch | 2 +-
10 files changed, 322 insertions(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..d821cf4
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+cpl-plugin-sinfo (2.3.2-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #XXXXXX)
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 07 Jan 2013 16:44:39 +0100
diff --git a/debian/control b/debian/control
index b83f1ae..06d6e06 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,40 @@
-Source: cpl-plugin-template
+Source: cpl-plugin-sinfo
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)
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/sinfo
+Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-sinfo.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-sinfo.git
-Package: cpl-plugin-template
+Package: cpl-plugin-sinfo
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: cpl-plugin-template-calib
+Suggests: cpl-plugin-sinfo-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 SINFONI
+ This is the data reduction pipeline for the SINFONI 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.
+ SINFONI is a near-infrared (1.1 - 2.45 µm) integral field spectrograph fed by
+ an adaptive optics module, currently installed at the Cassegrain focus of
+ UT4. The spectrograph operates with 4 gratings (J, H, K, H+K) providing a
+ spectral resolution around 2000, 3000, 4000 in J, H, K, respectively, and
+ 1500 in H+K - each wavelength band fitting fully on the 2048 pixels of the
+ Hawaii 2RG (2kx2k) detector in the dispersion direction. The spatial
+ resolution is selectable from 0.25", 0.1" to 0.025" per image slice, which
+ corresponds to a field-of-view of 8"x8", 3"x3", or 0.8"x0.8"
+ respectively. The instrument can be also used for seeing limited open loop
+ observations.
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-sinfo-calib
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Description: ESO data reduction pipeline calibration data template
+Description: ESO data reduction pipeline calibration data SINFONI
This package contains calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+ data reduction pipeline for the SINFONI instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --git a/debian/copyright b/debian/copyright
index 9d4c5a3..e6d512c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
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: sinfo
+Upstream-Author: Andrea Modigliani <amodigli at eso.org>
+Source: ftp://ftp.eso.org/pub/dfs/pipelines/sinfo/
Files: *
Copyright: Copyright (C) 2001-2012 European Southern Observatory
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-sinfo-calib.install b/debian/cpl-plugin-sinfo-calib.install
new file mode 100644
index 0000000..5e6a211
--- /dev/null
+++ b/debian/cpl-plugin-sinfo-calib.install
@@ -0,0 +1 @@
+calib/* usr/share/cpl-plugins/sinfo
diff --git a/debian/cpl-plugin.install.template b/debian/cpl-plugin-sinfo.install
similarity index 100%
rename from debian/cpl-plugin.install.template
rename to debian/cpl-plugin-sinfo.install
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 1f4ee35..3dc067d 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,24 +1,242 @@
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
+@@ -74,199 +74,199 @@
+ #New recipes
- INCLUDES = $(all_includes)
--LDADD = $(LIBTEMPLATE)
-+LDADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLUI)
+ #sinfo_utl_table_test_la_SOURCES = sinfo_utl_table_test.c
+-#sinfo_utl_table_test_la_LIBADD = $(LIBSINFONI)
++#sinfo_utl_table_test_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_utl_table_test_la_LDFLAGS = -module -avoid-version
+ #sinfo_utl_table_test_la_DEPENDENCIES = $(LIBSINFONI)
- check_PROGRAMS = template_dfs-test
+ #sinfo_rec_mdark_detmon_la_SOURCES = sinfo_rec_mdark_detmon.c
+-#sinfo_rec_mdark_detmon_la_LIBADD = $(LIBSINFONI)
++#sinfo_rec_mdark_detmon_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_rec_mdark_detmon_la_LDFLAGS = -module -avoid-version
+ #sinfo_rec_mdark_detmon_la_DEPENDENCIES = $(LIBSINFONI)
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -36,7 +36,7 @@
- plugin_LTLIBRARIES = rrrecipe.la rrrecipe_calib.la
-
- 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)
+ sinfo_rec_detlin_la_SOURCES = sinfo_rec_detlin.c
+-sinfo_rec_detlin_la_LIBADD = $(LIBSINFONI)
++sinfo_rec_detlin_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_rec_detlin_la_LDFLAGS = -module -avoid-version
+ sinfo_rec_detlin_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_rec_distortion_la_SOURCES = sinfo_rec_distortion.c
+-sinfo_rec_distortion_la_LIBADD = $(LIBSINFONI)
++sinfo_rec_distortion_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_rec_distortion_la_LDFLAGS = -module -avoid-version
+ sinfo_rec_distortion_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_rec_jitter_la_SOURCES = sinfo_rec_jitter.c
+-sinfo_rec_jitter_la_LIBADD = $(LIBSINFONI)
++sinfo_rec_jitter_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_rec_jitter_la_LDFLAGS = -module -avoid-version
+ sinfo_rec_jitter_la_DEPENDENCIES = $(LIBSINFONI)
+
+
+ #sinfo_rec_lingain_la_SOURCES = sinfo_rec_lingain.c
+-#sinfo_rec_lingain_la_LIBADD = $(LIBSINFONI)
++#sinfo_rec_lingain_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_rec_lingain_la_LDFLAGS = -module -avoid-version
+ #sinfo_rec_lingain_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_rec_mdark_la_SOURCES = sinfo_rec_mdark.c
+-sinfo_rec_mdark_la_LIBADD = $(LIBSINFONI)
++sinfo_rec_mdark_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_rec_mdark_la_LDFLAGS = -module -avoid-version
+ sinfo_rec_mdark_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_rec_mflat_la_SOURCES = sinfo_rec_mflat.c
+-sinfo_rec_mflat_la_LIBADD = $(LIBSINFONI)
++sinfo_rec_mflat_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_rec_mflat_la_LDFLAGS = -module -avoid-version
+ sinfo_rec_mflat_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_rec_objnod_la_SOURCES = sinfo_rec_objnod.c
+-#sinfo_rec_objnod_la_LIBADD = $(LIBSINFONI)
++#sinfo_rec_objnod_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_rec_objnod_la_LDFLAGS = -module -avoid-version
+ #sinfo_rec_objnod_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_rec_psf_la_SOURCES = sinfo_rec_psf.c
+-#sinfo_rec_psf_la_LIBADD = $(LIBSINFONI)
++#sinfo_rec_psf_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_rec_psf_la_LDFLAGS = -module -avoid-version
+ #sinfo_rec_psf_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_rec_pupil_la_SOURCES = sinfo_rec_pupil.c
+-sinfo_rec_pupil_la_LIBADD = $(LIBSINFONI)
++sinfo_rec_pupil_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_rec_pupil_la_LDFLAGS = -module -avoid-version
+ sinfo_rec_pupil_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_rec_stdstar_la_SOURCES = sinfo_rec_stdstar.c
+-#sinfo_rec_stdstar_la_LIBADD = $(LIBSINFONI)
++#sinfo_rec_stdstar_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_rec_stdstar_la_LDFLAGS = -module -avoid-version
+ #sinfo_rec_stdstar_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_rec_wavecal_la_SOURCES = sinfo_rec_wavecal.c
+-sinfo_rec_wavecal_la_LIBADD = $(LIBSINFONI)
++sinfo_rec_wavecal_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_rec_wavecal_la_LDFLAGS = -module -avoid-version
+ sinfo_rec_wavecal_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_step_jitter_la_SOURCES = sinfo_step_jitter.c
+-#sinfo_step_jitter_la_LIBADD = $(LIBSINFONI)
++#sinfo_step_jitter_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_step_jitter_la_LDFLAGS = -module -avoid-version
+ #sinfo_step_jitter_la_DEPENDENCIES = $(LIBSINFONI)
+
+
+ #sinfo_step_psf_la_SOURCES = sinfo_step_psf.c
+-#sinfo_step_psf_la_LIBADD = $(LIBSINFONI)
++#sinfo_step_psf_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_step_psf_la_LDFLAGS = -module -avoid-version
+ #sinfo_step_psf_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_step_stdstar_la_SOURCES = sinfo_step_stdstar.c
+-#sinfo_step_stdstar_la_LIBADD = $(LIBSINFONI)
++#sinfo_step_stdstar_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_step_stdstar_la_LDFLAGS = -module -avoid-version
+ #sinfo_step_stdstar_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_step_objnod_la_SOURCES = sinfo_step_objnod.c
+-#sinfo_step_objnod_la_LIBADD = $(LIBSINFONI)
++#sinfo_step_objnod_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_step_objnod_la_LDFLAGS = -module -avoid-version
+ #sinfo_step_objnod_la_DEPENDENCIES = $(LIBSINFONI)
+
+
+ #sinfo_step_distortion_la_SOURCES = sinfo_step_distortion.c
+-#sinfo_step_distortion_la_LIBADD = $(LIBSINFONI)
++#sinfo_step_distortion_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_step_distortion_la_LDFLAGS = -module -avoid-version
+ #sinfo_step_distortion_la_DEPENDENCIES = $(LIBSINFONI)
+
+
+ sinfo_utl_bp_mask_add_la_SOURCES = sinfo_utl_bp_mask_add.c
+-sinfo_utl_bp_mask_add_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_bp_mask_add_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_bp_mask_add_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_bp_mask_add_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_cube2ima_la_SOURCES = sinfo_utl_cube2ima.c
+-sinfo_utl_cube2ima_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_cube2ima_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_cube2ima_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_cube2ima_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_utl_ima_cube_ks_test_la_SOURCES = sinfo_utl_ima_cube_ks_test.c
+-#sinfo_utl_ima_cube_ks_test_la_LIBADD = $(LIBSINFONI)
++#sinfo_utl_ima_cube_ks_test_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_utl_ima_cube_ks_test_la_LDFLAGS = -module -avoid-version
+ #sinfo_utl_ima_cube_ks_test_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_eff_la_SOURCES = sinfo_utl_eff.c
+-sinfo_utl_eff_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_eff_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_eff_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_eff_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_cube2spectrum_la_SOURCES = sinfo_utl_cube2spectrum.c
+-sinfo_utl_cube2spectrum_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_cube2spectrum_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_cube2spectrum_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_cube2spectrum_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_cube_arith_la_SOURCES = sinfo_utl_cube_arith.c
+-sinfo_utl_cube_arith_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_cube_arith_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_cube_arith_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_cube_arith_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_cube_combine_la_SOURCES = sinfo_utl_cube_combine.c
+-sinfo_utl_cube_combine_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_cube_combine_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_cube_combine_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_cube_combine_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_cube_create_la_SOURCES = sinfo_utl_cube_create.c
+-sinfo_utl_cube_create_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_cube_create_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_cube_create_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_cube_create_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_utl_illumcorr_la_SOURCES = sinfo_utl_illumcorr.c
+-#sinfo_utl_illumcorr_la_LIBADD = $(LIBSINFONI)
++#sinfo_utl_illumcorr_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_utl_illumcorr_la_LDFLAGS = -module -avoid-version
+ #sinfo_utl_illumcorr_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_ima_arith_la_SOURCES = sinfo_utl_ima_arith.c
+-sinfo_utl_ima_arith_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_ima_arith_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_ima_arith_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_ima_arith_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_utl_ima_gauss_la_SOURCES = sinfo_utl_ima_gauss.c
+-#sinfo_utl_ima_gauss_la_LIBADD = $(LIBSINFONI)
++#sinfo_utl_ima_gauss_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_utl_ima_gauss_la_LDFLAGS = -module -avoid-version
+ #sinfo_utl_ima_gauss_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_ima_line_corr_la_SOURCES = sinfo_utl_ima_line_corr.c
+-sinfo_utl_ima_line_corr_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_ima_line_corr_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_ima_line_corr_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_ima_line_corr_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_skycor_la_SOURCES = sinfo_utl_skycor.c
+-sinfo_utl_skycor_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_skycor_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_skycor_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_skycor_la_DEPENDENCIES = $(LIBSINFONI)
+
+
+ sinfo_utl_skymap_la_SOURCES = sinfo_utl_skymap.c
+-sinfo_utl_skymap_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_skymap_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_skymap_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_skymap_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_utl_table_ex_la_SOURCES = sinfo_utl_table_ex.c
+-#sinfo_utl_table_ex_la_LIBADD = $(LIBSINFONI)
++#sinfo_utl_table_ex_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_utl_table_ex_la_LDFLAGS = -module -avoid-version
+ #sinfo_utl_table_ex_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_img_noise_la_SOURCES = sinfo_img_noise.c
+-#sinfo_img_noise_la_LIBADD = $(LIBSINFONI)
++#sinfo_img_noise_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_img_noise_la_LDFLAGS = -module -avoid-version
+ #sinfo_img_noise_la_DEPENDENCIES = $(LIBSINFONI)
+
+ sinfo_utl_spectrum_divide_by_blackbody_la_SOURCES = sinfo_utl_spectrum_divide_by_blackbody.c
+-sinfo_utl_spectrum_divide_by_blackbody_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_spectrum_divide_by_blackbody_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_spectrum_divide_by_blackbody_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_spectrum_divide_by_blackbody_la_DEPENDENCIES = $(LIBSINFONI)
+
+
+ sinfo_utl_spectrum_wavelength_shift_la_SOURCES = sinfo_utl_spectrum_wavelength_shift.c
+-sinfo_utl_spectrum_wavelength_shift_la_LIBADD = $(LIBSINFONI)
++sinfo_utl_spectrum_wavelength_shift_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ sinfo_utl_spectrum_wavelength_shift_la_LDFLAGS = -module -avoid-version
+ sinfo_utl_spectrum_wavelength_shift_la_DEPENDENCIES = $(LIBSINFONI)
+
+ #sinfo_utl_stdstars_la_SOURCES = sinfo_utl_stdstars.c
+-#sinfo_utl_stdstars_la_LIBADD = $(LIBSINFONI)
++#sinfo_utl_stdstars_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_utl_stdstars_la_LDFLAGS = -module -avoid-version
+ #sinfo_utl_stdstars_la_DEPENDENCIES = $(LIBSINFONI)
+
+
+ #sinfo_utl_seds_la_SOURCES = sinfo_utl_seds.c
+-#sinfo_utl_seds_la_LIBADD = $(LIBSINFONI)
++#sinfo_utl_seds_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #sinfo_utl_seds_la_LDFLAGS = -module -avoid-version
+ #sinfo_utl_seds_la_DEPENDENCIES = $(LIBSINFONI)
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9c9230a..9640cb1 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 @@
+@@ -216,7 +216,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..bea4dd6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
http://www.eso.org/sci/software/pipelines/ \
- .*/template-kit-(.*).tar.gz \
+ .*/sinfo-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-sinfo.git
More information about the debian-science-commits
mailing list