[cpl-plugin-fors] 05/40: Adjust debian files for fors
Ole Streicher
olebole-guest at alioth.debian.org
Wed Sep 18 19:01:45 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-fors.
commit b7303ca7a0b5dd9d4a5760f9fc19edd3cc2c2d69
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Jan 3 18:10:29 2013 +0100
Adjust debian files for fors
---
debian/changelog | 5 +
debian/control | 46 ++++--
debian/copyright | 4 +-
debian/patches/libadd_cpl.patch | 215 +++++++++++++++++++++++++---
debian/patches/set_plugindir.patch | 4 +-
debian/patches/use-std-paths-for-cpl.patch | 66 +++++++--
debian/watch | 2 +-
7 files changed, 294 insertions(+), 48 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..78ed990
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+cpl-plugin-fors (4.9.18-1) unstable; urgency=low
+
+ * New package. Closes: #00000
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 08 Dec 2011 09:38:00 +0200
diff --git a/debian/control b/debian/control
index b83f1ae..b425a0c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,50 @@
-Source: cpl-plugin-template
+Source: cpl-plugin-fors
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/fors
+Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-fors.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-fors.git
-Package: cpl-plugin-template
+Package: cpl-plugin-fors
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: cpl-plugin-template-calib
+Suggests: cpl-plugin-fors-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
- Very Large Telescope (VLT) from the European Southern Observatory (ESO).
+Description: ESO data reduction pipeline FORS
+ FORS pipeline recipes for the reduction of data obtained with the FORS1 and
+ FORS2 instruments in the LSS, MOS, MXU, PMOS, and direct imaging instrument
+ modes.
.
- This package is used as a template for the other ESO recipes. It is not
- meant to built as a package.
+ FORS is the visual and near UV FOcal Reducer and low dispersion Spectrograph
+ for the Very Large Telescope (VLT) of the European Southern Observatory
+ (ESO). Two versions of FORS have been built, upgraded and moved to the
+ Cassegrain foci of different telescopes in the past years. In April 2009,
+ FORS1 was dismounted to make room for X-shooter, so only FORS2 is in
+ operation. FORS is designed as an all-dioptric instrument for the wavelength
+ range from 330 nm to 1100 nm and provides an image scale of 0".25/pixel (or
+ 0".125/pixel with the high resolution collimator) in the standard readout
+ mode (2x2 binning). FORS2 is installed on UT1 (Antu) and is by default
+ equipped with a detector system that is optimised for the red with a very low
+ level of fringes thanks to a mosaic of two 2k x 4k MIT CCDs (with 15 μm
+ pixels). However, the blue-optimised detector system that was previously
+ available on FORS1 has been commissioned on FORS2 and can be requested for
+ Visitor Mode observation. The geometries of both detector systems are
+ similar, with the optical axis falling ~30" above the gap and offsets of a
+ few arc-seconds between the two chips. FORS2 has many modes, including
+ multi-object spectroscopy with exchangable masks, long-slit spectroscopy,
+ imaging and spectro-polarimetry and high-time resolution imaging and
+ spectroscopy.
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-fors-calib
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Description: ESO data reduction pipeline calibration data template
+Description: ESO data reduction pipeline calibration data FORS
This package contains calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+ data reduction pipeline for the FORS instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --git a/debian/copyright b/debian/copyright
index 9d4c5a3..779da71 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-Name: fors
Upstream-Author: Firstname Lastname <flastname at eso.org>
-Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
+Source: ftp://ftp.eso.org/pub/dfs/pipelines/fors/
Files: *
Copyright: Copyright (C) 2001-2012 European Southern Observatory
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 1f4ee35..a8fe1e7 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,24 +1,205 @@
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
+@@ -71,167 +71,167 @@
+ endif
- INCLUDES = $(all_includes)
--LDADD = $(LIBTEMPLATE)
-+LDADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLUI)
+ fors_calib_la_SOURCES = fors_calib.c
+-fors_calib_la_LIBADD = $(LIBFORS)
++fors_calib_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_calib_la_LDFLAGS = -module -avoid-version
+ fors_calib_la_DEPENDENCIES = $(LIBFORS)
- check_PROGRAMS = template_dfs-test
+ fors_science_la_SOURCES = fors_science.c
+-fors_science_la_LIBADD = $(LIBFORS)
++fors_science_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_science_la_LDFLAGS = -module -avoid-version
+ fors_science_la_DEPENDENCIES = $(LIBFORS)
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -36,7 +36,7 @@
- plugin_LTLIBRARIES = rrrecipe.la rrrecipe_calib.la
+ fors_config_la_SOURCES = fors_config.c
+-fors_config_la_LIBADD = $(LIBFORS)
++fors_config_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_config_la_LDFLAGS = -module -avoid-version
+ fors_config_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_sumflux_la_SOURCES = fors_sumflux.c
+-fors_sumflux_la_LIBADD = $(LIBFORS)
++fors_sumflux_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_sumflux_la_LDFLAGS = -module -avoid-version
+ fors_sumflux_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_extract_la_SOURCES = fors_extract.c
+-fors_extract_la_LIBADD = $(LIBFORS)
++fors_extract_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_extract_la_LDFLAGS = -module -avoid-version
+ fors_extract_la_DEPENDENCIES = $(LIBFORS)
+
+ test_hough_la_SOURCES = test_hough.c
+
+-test_hough_la_LIBADD = $(LIBFORS)
++test_hough_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ test_hough_la_LDFLAGS = -module -avoid-version
+ test_hough_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_bias_la_SOURCES = fors_bias.c
+-fors_bias_la_LIBADD = $(LIBFORS)
++fors_bias_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_bias_la_LDFLAGS = -module -avoid-version
+ fors_bias_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_remove_bias_la_SOURCES = fors_remove_bias.c
+-fors_remove_bias_la_LIBADD = $(LIBFORS)
++fors_remove_bias_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_remove_bias_la_LDFLAGS = -module -avoid-version
+ fors_remove_bias_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_flat_la_SOURCES = fors_flat.c
+-fors_flat_la_LIBADD = $(LIBFORS)
++fors_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_flat_la_LDFLAGS = -module -avoid-version
+ fors_flat_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_detect_spectra_la_SOURCES = fors_detect_spectra.c
+-fors_detect_spectra_la_LIBADD = $(LIBFORS)
++fors_detect_spectra_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_detect_spectra_la_LDFLAGS = -module -avoid-version
+ fors_detect_spectra_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_trace_flat_la_SOURCES = fors_trace_flat.c
+-fors_trace_flat_la_LIBADD = $(LIBFORS)
++fors_trace_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_trace_flat_la_LDFLAGS = -module -avoid-version
+ fors_trace_flat_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_normalise_flat_la_SOURCES = fors_normalise_flat.c
+-fors_normalise_flat_la_LIBADD = $(LIBFORS)
++fors_normalise_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_normalise_flat_la_LDFLAGS = -module -avoid-version
+ fors_normalise_flat_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_flatfield_la_SOURCES = fors_flatfield.c
+-fors_flatfield_la_LIBADD = $(LIBFORS)
++fors_flatfield_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_flatfield_la_LDFLAGS = -module -avoid-version
+ fors_flatfield_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_extract_slits_la_SOURCES = fors_extract_slits.c
+-fors_extract_slits_la_LIBADD = $(LIBFORS)
++fors_extract_slits_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_extract_slits_la_LDFLAGS = -module -avoid-version
+ fors_extract_slits_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_wave_calib_la_SOURCES = fors_wave_calib.c
+-fors_wave_calib_la_LIBADD = $(LIBFORS)
++fors_wave_calib_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_wave_calib_la_LDFLAGS = -module -avoid-version
+ fors_wave_calib_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_wave_calib_lss_la_SOURCES = fors_wave_calib_lss.c
+-fors_wave_calib_lss_la_LIBADD = $(LIBFORS)
++fors_wave_calib_lss_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_wave_calib_lss_la_LDFLAGS = -module -avoid-version
+ fors_wave_calib_lss_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_align_sky_la_SOURCES = fors_align_sky.c
+-fors_align_sky_la_LIBADD = $(LIBFORS)
++fors_align_sky_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_align_sky_la_LDFLAGS = -module -avoid-version
+ fors_align_sky_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_align_sky_lss_la_SOURCES = fors_align_sky_lss.c
+-fors_align_sky_lss_la_LIBADD = $(LIBFORS)
++fors_align_sky_lss_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_align_sky_lss_la_LDFLAGS = -module -avoid-version
+ fors_align_sky_lss_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_subtract_sky_la_SOURCES = fors_subtract_sky.c
+-fors_subtract_sky_la_LIBADD = $(LIBFORS)
++fors_subtract_sky_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_subtract_sky_la_LDFLAGS = -module -avoid-version
+ fors_subtract_sky_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_subtract_sky_lss_la_SOURCES = fors_subtract_sky_lss.c
+-fors_subtract_sky_lss_la_LIBADD = $(LIBFORS)
++fors_subtract_sky_lss_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_subtract_sky_lss_la_LDFLAGS = -module -avoid-version
+ fors_subtract_sky_lss_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_resample_la_SOURCES = fors_resample.c
+-fors_resample_la_LIBADD = $(LIBFORS)
++fors_resample_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_resample_la_LDFLAGS = -module -avoid-version
+ fors_resample_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_detect_objects_la_SOURCES = fors_detect_objects.c
+-fors_detect_objects_la_LIBADD = $(LIBFORS)
++fors_detect_objects_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_detect_objects_la_LDFLAGS = -module -avoid-version
+ fors_detect_objects_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_extract_objects_la_SOURCES = fors_extract_objects.c
+-fors_extract_objects_la_LIBADD = $(LIBFORS)
++fors_extract_objects_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_extract_objects_la_LDFLAGS = -module -avoid-version
+ fors_extract_objects_la_DEPENDENCIES = $(LIBFORS)
+
+ montecarlo_la_SOURCES = montecarlo.c
+-montecarlo_la_LIBADD = $(LIBFORS)
++montecarlo_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ montecarlo_la_LDFLAGS = -module -avoid-version
+ montecarlo_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_dark_la_SOURCES = fors_dark.c
+-fors_dark_la_LIBADD = $(LIBFORS)
++fors_dark_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_dark_la_LDFLAGS = -module -avoid-version
+ fors_dark_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_img_screen_flat_la_SOURCES = fors_img_screen_flat.c
+-fors_img_screen_flat_la_LIBADD = $(LIBFORS)
++fors_img_screen_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_img_screen_flat_la_LDFLAGS = -module -avoid-version
+ fors_img_screen_flat_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_img_sky_flat_la_SOURCES = fors_img_sky_flat.c
+-fors_img_sky_flat_la_LIBADD = $(LIBFORS)
++fors_img_sky_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_img_sky_flat_la_LDFLAGS = -module -avoid-version
+ fors_img_sky_flat_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_zeropoint_la_SOURCES = fors_zeropoint.c
+-fors_zeropoint_la_LIBADD = $(LIBFORS)
++fors_zeropoint_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_zeropoint_la_LDFLAGS = -module -avoid-version
+ fors_zeropoint_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_photometry_la_SOURCES = fors_photometry.c
+-fors_photometry_la_LIBADD = $(LIBFORS)
++fors_photometry_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_photometry_la_LDFLAGS = -module -avoid-version
+ fors_photometry_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_img_science_la_SOURCES = fors_img_science.c
+-fors_img_science_la_LIBADD = $(LIBFORS)
++fors_img_science_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_img_science_la_LDFLAGS = -module -avoid-version
+ fors_img_science_la_DEPENDENCIES = $(LIBFORS)
+
+ fors_pmos_calib_la_SOURCES = fors_pmos_calib.c
+-fors_pmos_calib_la_LIBADD = $(LIBFORS)
++fors_pmos_calib_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_pmos_calib_la_LDFLAGS = -module -avoid-version
+ fors_pmos_calib_la_DEPENDENCIES = $(LIBFORS)
- 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)
+ fors_pmos_science_la_SOURCES = fors_pmos_science.c
+-fors_pmos_science_la_LIBADD = $(LIBFORS)
++fors_pmos_science_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_pmos_science_la_LDFLAGS = -module -avoid-version
+ fors_pmos_science_la_DEPENDENCIES = $(LIBFORS)
+ fors_pmos_extract_la_SOURCES = fors_pmos_extract.c
+-fors_pmos_extract_la_LIBADD = $(LIBFORS)
++fors_pmos_extract_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ fors_pmos_extract_la_LDFLAGS = -module -avoid-version
+ fors_pmos_extract_la_DEPENDENCIES = $(LIBFORS)
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9c9230a..c765176 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -2,10 +2,10 @@ 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 @@
- [
+@@ -105,7 +105,7 @@
if test -z "$plugindir"; then
+ # plugindir='${libdir}/${PACKAGE}/plugins/${PACKAGE}-${VERSION}'
- plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
+ plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
fi
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..b7dcb5d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
http://www.eso.org/sci/software/pipelines/ \
- .*/template-kit-(.*).tar.gz \
+ .*/fors-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-fors.git
More information about the debian-science-commits
mailing list