[cpl-plugin-kmos] 26/26: Adjust debian files for kmos
Ole Streicher
olebole-guest at alioth.debian.org
Wed Oct 16 11:17:09 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-kmos.
commit 399c0cc8b5dbdcba98255d23c1f258db72da3222
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Oct 16 13:16:40 2013 +0200
Adjust debian files for kmos
---
debian/changelog | 5 +
debian/control | 37 ++++---
debian/copyright | 4 +-
debian/cpl-plugin.install.in | 2 +
debian/patches/libadd_cpl.patch | 161 +++++++++++++++++++++++++---
debian/patches/no_test_data.patch | 101 +++++++++++++++++
debian/patches/series | 1 +
debian/patches/set_plugindir.patch | 32 +++++-
debian/patches/use-std-paths-for-cpl.patch | 62 ++++++++---
debian/watch | 2 +-
10 files changed, 358 insertions(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..c86de6a
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+cpl-plugin-kmos (1.2.4-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #XXXXXX)
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 16 Oct 2013 10:08:49 +0200
diff --git a/debian/control b/debian/control
index f882cf9..1ea0044 100644
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,40 @@
-Source: cpl-plugin-template
+Source: cpl-plugin-kmos
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 (>= 6.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/kmos
+Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-kmos.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-kmos.git
-Package: cpl-plugin-template
+Package: cpl-plugin-kmos
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: esorex|python-cpl
-Suggests: cpl-plugin-template-calib
+Suggests: cpl-plugin-kmos-calib
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 KMOS
+ This is the data reduction pipeline for the KMOS 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.
+ The K-band Multi Object Spectrograph (KMOS) is a second-generation instrument
+ designed for operation on the VLT. The key feature of KMOS is its ability to
+ perform Integral Field Spectroscopy in the near-infrared bands for 24 targets
+ simultaneously.
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-kmos-calib
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, cpl-plugin-template, wget
+Depends: ${misc:Depends}, cpl-plugin-kmos, wget
Section: contrib/science
-Description: ESO data reduction pipeline calibration data downloaded template
+Description: ESO data reduction pipeline calibration data downloaded KMOS
This package downloads calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+ data reduction pipeline for the KMOS instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
+ .
+ The K-band Multi Object Spectrograph (KMOS) is a second-generation instrument
+ designed for operation on the VLT. The key feature of KMOS is its ability to
+ perform Integral Field Spectroscopy in the near-infrared bands for 24 targets
+ simultaneously.
diff --git a/debian/copyright b/debian/copyright
index 755dceb..5df26d3 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: kmos
Upstream-Contact: ESO User Support Department <usd-help at eso.org>
-Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
+Source: ftp://ftp.eso.org/pub/dfs/pipelines/kmos
Files: *
Copyright: Copyright (C) 2001-2012 European Southern Observatory
diff --git a/debian/cpl-plugin.install.in b/debian/cpl-plugin.install.in
index f2a276b..43b2301 100644
--- a/debian/cpl-plugin.install.in
+++ b/debian/cpl-plugin.install.in
@@ -1,3 +1,5 @@
usr/lib/*
+usr/share/reflex/*
+usr/share/cpl-plugins/__PIPELINE__-__VERSION__
calib/dic usr/share/cpl-plugins/__PIPELINE__-__VERSION__
calib/gasgano usr/share/cpl-plugins/__PIPELINE__-__VERSION__
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 1f4ee35..d001632 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,24 +1,151 @@
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
+@@ -64,122 +64,122 @@
+ kmo_dev_setup.la
- INCLUDES = $(all_includes)
--LDADD = $(LIBTEMPLATE)
-+LDADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLUI)
+ kmo_arithmetic_la_SOURCES = kmo_arithmetic.c
+-kmo_arithmetic_la_LIBADD = $(LIBKMOS)
++kmo_arithmetic_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_arithmetic_la_LDFLAGS = -module -avoid-version
+ kmo_arithmetic_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_combine_la_SOURCES = kmo_combine.c
+-kmo_combine_la_LIBADD = $(LIBKMOS)
++kmo_combine_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_combine_la_LDFLAGS = -module -avoid-version
+ kmo_combine_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_multi_reconstruct_la_SOURCES = kmo_multi_reconstruct.c
+-kmo_multi_reconstruct_la_LIBADD = $(LIBKMOS)
++kmo_multi_reconstruct_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_multi_reconstruct_la_LDFLAGS = -module -avoid-version
+ kmo_multi_reconstruct_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_copy_la_SOURCES = kmo_copy.c
+-kmo_copy_la_LIBADD = $(LIBKMOS)
++kmo_copy_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
+ kmo_copy_la_LDFLAGS = -module -avoid-version
+ kmo_copy_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_extract_spec_la_SOURCES = kmo_extract_spec.c
+-kmo_extract_spec_la_LIBADD = $(LIBKMOS)
++kmo_extract_spec_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_extract_spec_la_LDFLAGS = -module -avoid-version
+ kmo_extract_spec_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_fit_profile_la_SOURCES = kmo_fit_profile.c
+-kmo_fit_profile_la_LIBADD = $(LIBKMOS)
++kmo_fit_profile_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_fit_profile_la_LDFLAGS = -module -avoid-version
+ kmo_fit_profile_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_fits_check_la_SOURCES = kmo_fits_check.c
+-kmo_fits_check_la_LIBADD = $(LIBKMOS)
++kmo_fits_check_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_fits_check_la_LDFLAGS = -module -avoid-version
+ kmo_fits_check_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_fits_stack_la_SOURCES = kmo_fits_stack.c
+-kmo_fits_stack_la_LIBADD = $(LIBKMOS)
++kmo_fits_stack_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_fits_stack_la_LDFLAGS = -module -avoid-version
+ kmo_fits_stack_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_make_image_la_SOURCES = kmo_make_image.c
+-kmo_make_image_la_LIBADD = $(LIBKMOS)
++kmo_make_image_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_make_image_la_LDFLAGS = -module -avoid-version
+ kmo_make_image_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_noise_map_la_SOURCES = kmo_noise_map.c
+-kmo_noise_map_la_LIBADD = $(LIBKMOS)
++kmo_noise_map_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_noise_map_la_LDFLAGS = -module -avoid-version
+ kmo_noise_map_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_rotate_la_SOURCES = kmo_rotate.c
+-kmo_rotate_la_LIBADD = $(LIBKMOS)
++kmo_rotate_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_rotate_la_LDFLAGS = -module -avoid-version
+ kmo_rotate_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_shift_la_SOURCES = kmo_shift.c
+-kmo_shift_la_LIBADD = $(LIBKMOS)
++kmo_shift_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_shift_la_LDFLAGS = -module -avoid-version
+ kmo_shift_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_sky_mask_la_SOURCES = kmo_sky_mask.c
+-kmo_sky_mask_la_LIBADD = $(LIBKMOS)
++kmo_sky_mask_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_sky_mask_la_LDFLAGS = -module -avoid-version
+ kmo_sky_mask_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_sky_tweak_la_SOURCES = kmo_sky_tweak.c
+-kmo_sky_tweak_la_LIBADD = $(LIBKMOS)
++kmo_sky_tweak_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_sky_tweak_la_LDFLAGS = -module -avoid-version
+ kmo_sky_tweak_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_stats_la_SOURCES = kmo_stats.c
+-kmo_stats_la_LIBADD = $(LIBKMOS)
++kmo_stats_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_stats_la_LDFLAGS = -module -avoid-version
+ kmo_stats_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_dark_la_SOURCES = kmo_dark.c
+-kmo_dark_la_LIBADD = $(LIBKMOS)
++kmo_dark_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_dark_la_LDFLAGS = -module -avoid-version
+ kmo_dark_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_flat_la_SOURCES = kmo_flat.c
+-kmo_flat_la_LIBADD = $(LIBKMOS)
++kmo_flat_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_flat_la_LDFLAGS = -module -avoid-version
+ kmo_flat_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_wave_cal_la_SOURCES = kmo_wave_cal.c
+-kmo_wave_cal_la_LIBADD = $(LIBKMOS)
++kmo_wave_cal_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_wave_cal_la_LDFLAGS = -module -avoid-version
+ kmo_wave_cal_la_DEPENDENCIES = $(LIBKMOS)
- check_PROGRAMS = template_dfs-test
+ kmo_reconstruct_la_SOURCES = kmo_reconstruct.c
+-kmo_reconstruct_la_LIBADD = $(LIBKMOS)
++kmo_reconstruct_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_reconstruct_la_LDFLAGS = -module -avoid-version
+ kmo_reconstruct_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_illumination_la_SOURCES = kmo_illumination.c
+-kmo_illumination_la_LIBADD = $(LIBKMOS)
++kmo_illumination_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_illumination_la_LDFLAGS = -module -avoid-version
+ kmo_illumination_la_DEPENDENCIES = $(LIBKMOS)
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -36,7 +36,7 @@
- plugin_LTLIBRARIES = rrrecipe.la rrrecipe_calib.la
+ kmo_dev_setup_la_SOURCES = kmo_dev_setup.c
+-kmo_dev_setup_la_LIBADD = $(LIBKMOS)
++kmo_dev_setup_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_dev_setup_la_LDFLAGS = -module -avoid-version
+ kmo_dev_setup_la_DEPENDENCIES = $(LIBKMOS)
+
+ kmo_std_star_la_SOURCES = kmo_std_star.c
+-kmo_std_star_la_LIBADD = $(LIBKMOS)
++kmo_std_star_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_std_star_la_LDFLAGS = -module -avoid-version
+ kmo_std_star_la_DEPENDENCIES = $(LIBKMOS)
- 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)
+ kmo_sci_red_la_SOURCES = kmo_sci_red.c
+-kmo_sci_red_la_LIBADD = $(LIBKMOS)
++kmo_sci_red_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_sci_red_la_LDFLAGS = -module -avoid-version
+ kmo_sci_red_la_DEPENDENCIES = $(LIBKMOS)
+ kmo_fits_strip_la_SOURCES = kmo_fits_strip.c
+-kmo_fits_strip_la_LIBADD = $(LIBKMOS)
++kmo_fits_strip_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmo_fits_strip_la_LDFLAGS = -module -avoid-version
+ kmo_fits_strip_la_DEPENDENCIES = $(LIBKMOS)
+
diff --git a/debian/patches/no_test_data.patch b/debian/patches/no_test_data.patch
new file mode 100644
index 0000000..ad25935
--- /dev/null
+++ b/debian/patches/no_test_data.patch
@@ -0,0 +1,101 @@
+--- a/kmos/tests/Makefile.am
++++ b/kmos/tests/Makefile.am
+@@ -21,7 +21,7 @@
+
+ DISTCLEANFILES = *~
+
+-SUBDIRS = ref_data
++SUBDIRS =
+
+ if MAINTAINER_MODE
+
+@@ -36,8 +36,6 @@
+ # Test programs
+ check_PROGRAMS = \
+ kmo_cpl_extensions-test \
+- kmo_debug-test \
+- kmo_dfs-test \
+ kmo_functions-test \
+ kmo_priv_arithmetic-test \
+ kmo_priv_combine-test \
+@@ -47,20 +45,13 @@
+ kmo_priv_fit_profile-test \
+ kmo_priv_fits_check-test \
+ kmo_priv_fits_stack-test \
+- kmo_priv_flat-test \
+- kmo_priv_functions-test \
+ kmo_priv_make_image-test \
+ kmo_priv_noise_map-test \
+- kmo_priv_reconstruct-test \
+ kmo_priv_rotate-test \
+ kmo_priv_shift-test \
+ kmo_priv_sky_mask-test \
+ kmo_priv_stats-test \
+- kmo_priv_std_star-test \
+- kmo_priv_wave_cal-test \
+- kmo_utils-test \
+- kmo_priv_lcorr-test \
+- kmo_priv_sky_tweak-test
++ kmo_priv_wave_cal-test
+
+ kmo_cpl_extensions_test_SOURCES = kmo_cpl_extensions-test.c
+ kmo_cpl_extensions_test_LDFLAGS = $(CPL_LDFLAGS)
+--- a/recipes/tests/Makefile.am
++++ b/recipes/tests/Makefile.am
+@@ -21,7 +21,7 @@
+
+ DISTCLEANFILES = *~
+
+-SUBDIRS = ref_data
++SUBDIRS =
+
+ if MAINTAINER_MODE
+
+@@ -36,30 +36,7 @@
+ #check_PROGRAMS = kmo_fits_strip-test
+
+ # Test programs
+-check_PROGRAMS = kmo_arithmetic-test \
+- kmo_combine-test \
+- kmo_copy-test \
+- kmo_dev_setup-test \
+- kmo_extract_spec-test \
+- kmo_fit_profile-test \
+- kmo_fits_check-test \
+- kmo_fits_stack-test \
+- kmo_make_image-test \
+- kmo_noise_map-test \
+- kmo_rotate-test \
+- kmo_shift-test \
+- kmo_sky_mask-test \
+- kmo_stats-test \
+- kmo_dark-test \
+- kmo_flat-test \
+- kmo_wave_cal-test \
+- kmo_reconstruct-test \
+- kmo_illumination-test \
+- kmo_std_star-test \
+- kmo_sci_red-test \
+- kmo_multi_reconstruct-test \
+- kmo_fits_strip-test \
+- leak_check-test
++check_PROGRAMS = leak_check-test
+
+
+ kmo_arithmetic_test_SOURCES = kmo_arithmetic-test.c
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,13 +92,11 @@
+ doxygen/Doxyfile
+ kmos/Makefile
+ kmos/tests/Makefile
+- kmos/tests/ref_data/Makefile
+ tools/easySPARK/Makefile
+ reflex/Makefile
+ reflex/kmos.xml
+ recipes/Makefile
+ recipes/tests/Makefile
+- recipes/tests/ref_data/Makefile
+ regtests/Makefile
+ regtests/tests/Makefile
+ irplib/Makefile
diff --git a/debian/patches/series b/debian/patches/series
index e2c2220..df2cb46 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
libadd_cpl.patch
set_plugindir.patch
use-std-paths-for-cpl.patch
+no_test_data.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9c9230a..a3dd429 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -2,12 +2,40 @@ 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 @@
+@@ -84,15 +84,15 @@
+ AC_DEFUN([KMOS_SET_PATHS],
[
-
if test -z "$plugindir"; then
- plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
+ plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
fi
+ if test -z "$pipedocsdir"; then
+- pipedocsdir='${datadir}/doc/esopipes/${PACKAGE}-${VERSION}/'
++ pipedocsdir='${datadir}/doc/cpl-plugin-${PACKAGE}-${VERSION}/'
+ fi
+
+ if test -z "$apidocdir"; then
+- apidocdir='${datadir}/doc/esopipes/${PACKAGE}-${VERSION}/html'
++ apidocdir='${datadir}/doc/cpl-plugin-${PACKAGE}-${VERSION}/html'
+ fi
+
if test -z "$privatelibdir"; then
+@@ -104,7 +104,7 @@
+ fi
+
+ if test -z "$wkfextradir"; then
+- wkfextradir='${datadir}/esopipes/${PACKAGE}-${VERSION}/reflex'
++ wkfextradir='${datadir}/cpl-plugins/${PACKAGE}-${VERSION}/reflex'
+ fi
+
+ if test -z "$wkfcopydir"; then
+@@ -122,7 +122,7 @@
+
+ # Define a preprocesor symbol for the plugin search paths
+
+- AC_DEFINE_UNQUOTED(KMOS_PLUGIN_DIR, "esopipes-plugins",
++ AC_DEFINE_UNQUOTED(KMOS_PLUGIN_DIR, "cpl/plugins",
+ [Plugin directory tree prefix])
+
+ eval plugin_dir="$plugindir"
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index ae95068..f768445 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -2,20 +2,58 @@ 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 @@
+@@ -9,7 +9,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=""
+@@ -391,7 +391,7 @@
+ AC_MSG_CHECKING([for libcext])
+
+ cpl_cext_check_header="cxtypes.h"
+- cpl_cext_check_lib="libcext.a"
++ cpl_cext_check_lib="libcext.so"
+
+ cpl_cext_incdirs=""
+ cpl_cext_libdirs=""
+@@ -604,7 +604,7 @@
+
+ cpl_wcs_check_version="$1"
+ cpl_wcs_check_header="wcslib/wcslib.h"
+- cpl_wcs_check_lib="libwcs.a"
++ cpl_wcs_check_lib="libwcs.so"
+
+ cpl_wcs_includes=""
+ cpl_wcs_libraries=""
+@@ -836,8 +836,8 @@
+
+ cpl_fftw_check_version="$1"
+ cpl_fftw_check_header="fftw3.h"
+- cpl_fftw_check_lib="libfftw3.a"
+- cpl_fftwf_check_lib="libfftw3f.a"
++ cpl_fftw_check_lib="libfftw3.so"
++ cpl_fftwf_check_lib="libfftw3f.so"
+
+ cpl_fftw_includes=""
+ cpl_fftw_libraries=""
+@@ -1250,7 +1250,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=""
+@@ -1325,6 +1325,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"
- test -n "$CPLDIR" && cpl_libdirs="$CPLDIR/lib $cpl_libdirs"
diff --git a/debian/watch b/debian/watch
index 4e895da..74174e7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
http://www.eso.org/sci/software/pipelines/ \
- .*/template-kit-(.*).tar.gz \
+ .*/kmos-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-kmos.git
More information about the debian-science-commits
mailing list