[cpl-plugin-hawki] 06/39: Adjust debian files for HAWK-I
Ole Streicher
olebole-guest at alioth.debian.org
Mon Sep 16 19:36:08 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-hawki.
commit 49992c61b6c9e1ac8b9d864d49b2b25383b78c3d
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Jan 7 11:18:58 2013 +0100
Adjust debian files for HAWK-I
---
debian/changelog | 5 +
debian/control | 30 ++--
debian/copyright | 6 +-
debian/cpl-plugin-calib.install.template | 1 -
debian/cpl-plugin-hawki-calib.install | 1 +
...n.install.template => cpl-plugin-hawki.install} | 0
debian/patches/libadd_cpl.patch | 143 +++++++++++++++++---
debian/patches/set_plugindir.patch | 4 +-
debian/patches/use-std-paths-for-cpl.patch | 66 +++++++--
debian/watch | 2 +-
10 files changed, 208 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..4fe3af4
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+cpl-plugin-hawki (1.8.9-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #XXXXXX)
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 07 Jan 2013 11:07:35 +0100
diff --git a/debian/control b/debian/control
index b83f1ae..4bf1b1a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,36 @@
-Source: cpl-plugin-template
+Source: cpl-plugin-hawki
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/hawki
+Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-hawki.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-hawki.git
-Package: cpl-plugin-template
+Package: cpl-plugin-hawki
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: cpl-plugin-template-calib
+Suggests: cpl-plugin-hawki-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 HAWK-I
+ This is the data reduction pipeline for the HAWK-I 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.
+ HAWK-I is a near-infrared (0.85-2.5 μm ) wide-field imager. It is being
+ offered for the first time in Period 81. The instrument is cryogenic (120 K,
+ detectors at 80 K) and has a full reflective design. The light passes four
+ mirrors and two filter wheels before hitting a mosaic of four Hawaii 2RG 2048
+ * 2048 pixels detectors. The final F-ratio is F/4.36 ( 1 arcsec on the sky
+ corresponds to 169 μm on the detector).
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-hawki-calib
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Description: ESO data reduction pipeline calibration data template
+Description: ESO data reduction pipeline calibration data HAWK-I
This package contains calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+ data reduction pipeline for the HAWK-I instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --git a/debian/copyright b/debian/copyright
index 9d4c5a3..10ac044 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: hawki
+Upstream-Author: César Enrique García Dabó <cgarcia at eso.org>
+Source: ftp://ftp.eso.org/pub/dfs/pipelines/hawki/
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-hawki-calib.install b/debian/cpl-plugin-hawki-calib.install
new file mode 100644
index 0000000..9a451a6
--- /dev/null
+++ b/debian/cpl-plugin-hawki-calib.install
@@ -0,0 +1 @@
+calib/* usr/share/cpl-plugins/hawki
diff --git a/debian/cpl-plugin.install.template b/debian/cpl-plugin-hawki.install
similarity index 100%
rename from debian/cpl-plugin.install.template
rename to debian/cpl-plugin-hawki.install
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 1f4ee35..3acc45e 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,24 +1,131 @@
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
+@@ -54,96 +54,96 @@
+ hawki_util_extinction.la
- INCLUDES = $(all_includes)
--LDADD = $(LIBTEMPLATE)
-+LDADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLUI)
+ hawki_cal_dark_la_SOURCES = hawki_cal_dark.c
+-hawki_cal_dark_la_LIBADD = $(LIBHAWKI)
++hawki_cal_dark_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_cal_dark_la_LDFLAGS = -module -avoid-version
+ hawki_cal_dark_la_DEPENDENCIES = $(LIBHAWKI)
- check_PROGRAMS = template_dfs-test
+ hawki_cal_flat_la_SOURCES = hawki_cal_flat.c
+-hawki_cal_flat_la_LIBADD = $(LIBHAWKI)
++hawki_cal_flat_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_cal_flat_la_LDFLAGS = -module -avoid-version
+ hawki_cal_flat_la_DEPENDENCIES = $(LIBHAWKI)
---- 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)
+ hawki_cal_zpoint_la_SOURCES = hawki_cal_zpoint.c
+-hawki_cal_zpoint_la_LIBADD = $(LIBHAWKI)
++hawki_cal_zpoint_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_cal_zpoint_la_LDFLAGS = -module -avoid-version
+ hawki_cal_zpoint_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_util_extinction_la_SOURCES = hawki_util_extinction.c
+-hawki_util_extinction_la_LIBADD = $(LIBHAWKI)
++hawki_util_extinction_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_util_extinction_la_LDFLAGS = -module -avoid-version
+ hawki_util_extinction_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_cal_distortion_la_SOURCES = hawki_cal_distortion.c
+-hawki_cal_distortion_la_LIBADD = $(LIBHAWKI)
++hawki_cal_distortion_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_cal_distortion_la_LDFLAGS = -module -avoid-version
+ hawki_cal_distortion_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_sci_jitter_la_SOURCES = hawki_sci_jitter.c
+-hawki_sci_jitter_la_LIBADD = $(LIBHAWKI)
++hawki_sci_jitter_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_sci_jitter_la_LDFLAGS = -module -avoid-version
+ hawki_sci_jitter_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_basic_calib_la_SOURCES = hawki_step_basic_calib.c
+-hawki_step_basic_calib_la_LIBADD = $(LIBHAWKI)
++hawki_step_basic_calib_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_basic_calib_la_LDFLAGS = -module -avoid-version
+ hawki_step_basic_calib_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_stats_la_SOURCES = hawki_step_stats.c
+-hawki_step_stats_la_LIBADD = $(LIBHAWKI)
++hawki_step_stats_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_stats_la_LDFLAGS = -module -avoid-version
+ hawki_step_stats_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_compute_bkg_la_SOURCES = hawki_step_compute_bkg.c
+-hawki_step_compute_bkg_la_LIBADD = $(LIBHAWKI)
++hawki_step_compute_bkg_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_compute_bkg_la_LDFLAGS = -module -avoid-version
+ hawki_step_compute_bkg_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_subtract_bkg_la_SOURCES = hawki_step_subtract_bkg.c
+-hawki_step_subtract_bkg_la_LIBADD = $(LIBHAWKI)
++hawki_step_subtract_bkg_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_subtract_bkg_la_LDFLAGS = -module -avoid-version
+ hawki_step_subtract_bkg_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_stitch_la_SOURCES = hawki_step_stitch.c
+-hawki_step_stitch_la_LIBADD = $(LIBHAWKI)
++hawki_step_stitch_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_stitch_la_LDFLAGS = -module -avoid-version
+ hawki_step_stitch_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_apply_dist_la_SOURCES = hawki_step_apply_dist.c
+-hawki_step_apply_dist_la_LIBADD = $(LIBHAWKI)
++hawki_step_apply_dist_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_apply_dist_la_LDFLAGS = -module -avoid-version
+ hawki_step_apply_dist_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_refine_offsets_la_SOURCES = hawki_step_refine_offsets.c
+-hawki_step_refine_offsets_la_LIBADD = $(LIBHAWKI)
++hawki_step_refine_offsets_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_refine_offsets_la_LDFLAGS = -module -avoid-version
+ hawki_step_refine_offsets_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_combine_la_SOURCES = hawki_step_combine.c
+-hawki_step_combine_la_LIBADD = $(LIBHAWKI)
++hawki_step_combine_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_combine_la_LDFLAGS = -module -avoid-version
+ hawki_step_combine_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_detect_obj_la_SOURCES = hawki_step_detect_obj.c
+-hawki_step_detect_obj_la_LIBADD = $(LIBHAWKI)
++hawki_step_detect_obj_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_detect_obj_la_LDFLAGS = -module -avoid-version
+ hawki_step_detect_obj_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_step_photom_2mass_la_SOURCES = hawki_step_photom_2mass.c
+-hawki_step_photom_2mass_la_LIBADD = $(LIBHAWKI)
++hawki_step_photom_2mass_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_step_photom_2mass_la_LDFLAGS = -module -avoid-version
+ hawki_step_photom_2mass_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_tec_filtchk_la_SOURCES = hawki_tec_filtchk.c
+-hawki_tec_filtchk_la_LIBADD = $(LIBHAWKI)
++hawki_tec_filtchk_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_tec_filtchk_la_LDFLAGS = -module -avoid-version
+ hawki_tec_filtchk_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_util_gendist_la_SOURCES = hawki_util_gendist.c
+-hawki_util_gendist_la_LIBADD = $(LIBHAWKI)
++hawki_util_gendist_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_util_gendist_la_LDFLAGS = -module -avoid-version
+ hawki_util_gendist_la_DEPENDENCIES = $(LIBHAWKI)
+
+ hawki_util_stdstars_la_SOURCES = hawki_util_stdstars.c
+-hawki_util_stdstars_la_LIBADD = $(LIBHAWKI)
++hawki_util_stdstars_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ hawki_util_stdstars_la_LDFLAGS = -module -avoid-version
+ hawki_util_stdstars_la_DEPENDENCIES = $(LIBHAWKI)
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -32,7 +32,7 @@
+ LIBHAWKI = $(top_builddir)/hawki/libhawki.la
+
+ INCLUDES = -I$(top_builddir)hawki/
+-LDADD = $(LIBHAWKI)
++LDADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLUI)
+
+ check_PROGRAMS =
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9c9230a..76a59e6 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -2,9 +2,9 @@ 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 @@
+@@ -66,7 +66,7 @@
+ AC_DEFUN([HAWKI_SET_PATHS],
[
-
if test -z "$plugindir"; then
- plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
+ plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
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..e58cd91 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
http://www.eso.org/sci/software/pipelines/ \
- .*/template-kit-(.*).tar.gz \
+ .*/hawki-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-hawki.git
More information about the debian-science-commits
mailing list