[cpl-plugin-vimos] 39/45: First adaption for VIMOS
Ole Streicher
olebole-guest at alioth.debian.org
Thu Nov 7 08:20:57 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-vimos.
commit 6eb04bdc16b4c27d890d8de7a9a1966d9ef3381e
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Nov 4 17:52:29 2013 +0100
First adaption for VIMOS
---
debian/changelog | 5 +
debian/control | 26 ++---
debian/patches/libadd_cpl.patch | 172 +++++++++++++++++++++++++---
debian/patches/set_plugindir.patch | 2 +-
debian/patches/use-std-paths-for-cpl.patch | 26 ++---
debian/watch | 2 +-
6 files changed, 188 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..92743d7
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+cpl-plugin-vimos (2.9.7-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #XXXXXX)
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 21 Oct 2013 10:09:22 +0200
diff --git a/debian/control b/debian/control
index f882cf9..c1054ed 100644
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,33 @@
-Source: cpl-plugin-template
+Source: cpl-plugin-vimos
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/vimos
+Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-vimos.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-vimos.git
-Package: cpl-plugin-template
+Package: cpl-plugin-vimos
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: esorex|python-cpl
-Suggests: cpl-plugin-template-calib
+Suggests: cpl-plugin-vimos-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 vimos
+ This is the data reduction pipeline for the Vimos 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
+ This package is used as a vimos for the other ESO recipes. It is not
meant to built as a package.
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-vimos-calib
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, cpl-plugin-template, wget
+Depends: ${misc:Depends}, cpl-plugin-vimos, wget
Section: contrib/science
-Description: ESO data reduction pipeline calibration data downloaded template
+Description: ESO data reduction pipeline calibration data downloaded vimos
This package downloads calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+ data reduction pipeline for the Vimos instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 1f4ee35..2be8ab8 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,24 +1,162 @@
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
+@@ -62,87 +62,87 @@
+ vmbias_la_DEPENDENCIES = $(LIBVIMOS)
- INCLUDES = $(all_includes)
--LDADD = $(LIBTEMPLATE)
-+LDADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLUI)
+ vmdark_la_SOURCES = vmdark.c
+-vmdark_la_LIBADD = $(LIBVIMOS)
++vmdark_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmdark_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmdark_la_DEPENDENCIES = $(LIBVIMOS)
- check_PROGRAMS = template_dfs-test
+ vmifucalib_la_SOURCES = vmifucalib.c
+-vmifucalib_la_LIBADD = $(LIBVIMOS)
++vmifucalib_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmifucalib_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifucalib_la_DEPENDENCIES = $(LIBVIMOS)
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -36,7 +36,7 @@
- plugin_LTLIBRARIES = rrrecipe.la rrrecipe_calib.la
+ vmifucombine_la_SOURCES = vmifucombine.c
+-vmifucombine_la_LIBADD = $(LIBVIMOS)
++vmifucombine_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmifucombine_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifucombine_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmifucombinecube_la_SOURCES = vmifucombinecube.cc
+-vmifucombinecube_la_LIBADD = $(LIBVIMOS)
++vmifucombinecube_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmifucombinecube_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifucombinecube_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmifuscience_la_SOURCES = vmifuscience.c
+-vmifuscience_la_LIBADD = $(LIBVIMOS)
++vmifuscience_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmifuscience_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifuscience_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmifustandard_la_SOURCES = vmifustandard.c
+-vmifustandard_la_LIBADD = $(LIBVIMOS)
++vmifustandard_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmifustandard_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifustandard_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmmosstandard_la_SOURCES = vmmosstandard.c
+-vmmosstandard_la_LIBADD = $(LIBVIMOS)
++vmmosstandard_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmmosstandard_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmosstandard_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmmoscombine_la_SOURCES = vmmoscombine.c
+-vmmoscombine_la_LIBADD = $(LIBVIMOS)
++vmmoscombine_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmmoscombine_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmoscombine_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmspphot_la_SOURCES = vmspphot.c
+-vmspphot_la_LIBADD = $(LIBVIMOS)
++vmspphot_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmspphot_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmspphot_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmdet_la_SOURCES = vmdet.c
+-vmdet_la_LIBADD = $(LIBVIMOS)
++vmdet_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmdet_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmdet_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmimcalphot_la_SOURCES = vmimcalphot.c
+-vmimcalphot_la_LIBADD = $(LIBVIMOS)
++vmimcalphot_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmimcalphot_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimcalphot_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmimflatscreen_la_SOURCES = vmimflatscreen.c
+-vmimflatscreen_la_LIBADD = $(LIBVIMOS)
++vmimflatscreen_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmimflatscreen_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimflatscreen_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmimflatsky_la_SOURCES = vmimflatsky.c
+-vmimflatsky_la_LIBADD = $(LIBVIMOS)
++vmimflatsky_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmimflatsky_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimflatsky_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmimobsjitter_la_SOURCES = vmimobsjitter.c
+-vmimobsjitter_la_LIBADD = $(LIBVIMOS)
++vmimobsjitter_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmimobsjitter_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimobsjitter_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmimobsstare_la_SOURCES = vmimobsstare.c
+-vmimobsstare_la_LIBADD = $(LIBVIMOS)
++vmimobsstare_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmimobsstare_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimobsstare_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmimpreimaging_la_SOURCES = vmimpreimaging.c
+-vmimpreimaging_la_LIBADD = $(LIBVIMOS)
++vmimpreimaging_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmimpreimaging_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimpreimaging_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmimstandard_la_SOURCES = vmimstandard.c
+-vmimstandard_la_LIBADD = $(LIBVIMOS)
++vmimstandard_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmimstandard_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimstandard_la_DEPENDENCIES = $(LIBVIMOS)
+
+@@ -151,17 +151,17 @@
+ else
+ vmmasktoccd_la_SOURCES =
+ endif
+-vmmasktoccd_la_LIBADD = $(LIBVIMOS)
++vmmasktoccd_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmmasktoccd_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmasktoccd_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmmosobsjitter_la_SOURCES = vmmosobsjitter.c
+-vmmosobsjitter_la_LIBADD = $(LIBVIMOS)
++vmmosobsjitter_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmmosobsjitter_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmosobsjitter_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmmosobsstare_la_SOURCES = vmmosobsstare.c
+-vmmosobsstare_la_LIBADD = $(LIBVIMOS)
++vmmosobsstare_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmmosobsstare_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmosobsstare_la_DEPENDENCIES = $(LIBVIMOS)
+
+@@ -170,26 +170,26 @@
+ else
+ vmskyccd_la_SOURCES =
+ endif
+-vmskyccd_la_LIBADD = $(LIBVIMOS)
++vmskyccd_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmskyccd_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmskyccd_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmspcaldisp_la_SOURCES = vmspcaldisp.c
+-vmspcaldisp_la_LIBADD = $(LIBVIMOS)
++vmspcaldisp_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmspcaldisp_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmspcaldisp_la_DEPENDENCIES = $(LIBVIMOS)
+
+ vmspflat_la_SOURCES = vmspflat.c
+-vmspflat_la_LIBADD = $(LIBVIMOS)
++vmspflat_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmspflat_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmspflat_la_DEPENDENCIES = $(LIBVIMOS)
- 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)
+ vmmoscalib_la_SOURCES = vimos_calib.c
+-vmmoscalib_la_LIBADD = $(LIBVIMOS)
++vmmoscalib_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmmoscalib_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmoscalib_la_DEPENDENCIES = $(LIBVIMOS)
+ vmmosscience_la_SOURCES = vimos_science.c
+-vmmosscience_la_LIBADD = $(LIBVIMOS)
++vmmosscience_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmmosscience_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmosscience_la_DEPENDENCIES = $(LIBVIMOS)
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9c9230a..8d360fe 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 @@
+@@ -105,7 +105,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..ba47ce7 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -2,20 +2,20 @@ 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 @@
+@@ -1314,7 +1314,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"
-
- test -n "$CPLDIR" && cpl_libdirs="$CPLDIR/lib $cpl_libdirs"
+ cpl_incdirs=""
+ cpl_libdirs=""
+@@ -1388,6 +1388,7 @@
+ cpl_libdirs="$cpl_libdirs /usr/local/lib64"
+ cpl_libdirs="$cpl_libdirs /usr/local/lib"
+ cpl_libdirs="$cpl_libdirs /usr/local/lib32"
++ cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+ cpl_libdirs="$cpl_libdirs /usr/lib64"
+ cpl_libdirs="$cpl_libdirs /usr/lib"
+ cpl_libdirs="$cpl_libdirs /usr/lib32"
diff --git a/debian/watch b/debian/watch
index 4e895da..1557bdf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
http://www.eso.org/sci/software/pipelines/ \
- .*/template-kit-(.*).tar.gz \
+ .*/vimos-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-vimos.git
More information about the debian-science-commits
mailing list