[Debian-astro-commits] [cpl-plugin-template] 02/76: Adjust debian files for GIRAF
Ole Streicher
olebole at moszumanska.debian.org
Wed Sep 23 09:59:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository cpl-plugin-template.
commit 330935a58e267c578e827b5a3fad29ee7fedf5f0
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Jan 4 13:40:45 2013 +0100
Adjust debian files for GIRAF
---
debian/changelog | 5 ++
debian/control | 29 ++++----
debian/copyright | 4 +-
debian/cpl-plugin-calib.install.template | 1 -
debian/cpl-plugin-giraffe-calib.install | 1 +
...install.template => cpl-plugin-giraffe.install} | 0
debian/patches/libadd_cpl.patch | 84 +++++++++++++++++-----
debian/patches/set_plugindir.patch | 6 +-
debian/patches/use-std-paths-for-cpl.patch | 54 ++++++++++----
debian/watch | 2 +-
10 files changed, 134 insertions(+), 52 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..14f56c2
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+cpl-plugin-giraf (2.9.2-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #XXXXXX)
+
+ -- Ole Streicher <debian at liska.ath.cx> Fri, 04 Jan 2013 13:26:21 +0100
diff --git a/debian/control b/debian/control
index b83f1ae..dea1a40 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,35 @@
-Source: cpl-plugin-template
+Source: cpl-plugin-giraf
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/giraf
+Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-giraf.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-giraf.git
-Package: cpl-plugin-template
+Package: cpl-plugin-giraf
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: cpl-plugin-template-calib
+Suggests: cpl-plugin-giraf-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 for GIRAFFE
+ This is the data reduction pipeline for the GIRAFFE 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.
+ GIRAFFE is a medium-high resolution (R=7500-30000) spectrograph for the
+ entire visible range 370-900 nm. GIRAFFE is aimed at carrying out
+ intermediate and high resolution spectroscopy of galactic and extragalactic
+ objects having a high spatial density. The name comes from the first design,
+ where the spectrograph was standing vertically on a platform.
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-giraf-calib
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Description: ESO data reduction pipeline calibration data template
+Description: ESO data reduction pipeline calibration data for GIRAFFE
This package contains calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+ data reduction pipeline for the GIRAFFE instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --git a/debian/copyright b/debian/copyright
index 9d4c5a3..088a314 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: giraf
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/giraf/
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-giraffe-calib.install b/debian/cpl-plugin-giraffe-calib.install
new file mode 100644
index 0000000..7734967
--- /dev/null
+++ b/debian/cpl-plugin-giraffe-calib.install
@@ -0,0 +1 @@
+calib/* usr/share/cpl-plugins/giraf
diff --git a/debian/cpl-plugin.install.template b/debian/cpl-plugin-giraffe.install
similarity index 100%
rename from debian/cpl-plugin.install.template
rename to debian/cpl-plugin-giraffe.install
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 1f4ee35..d34b4c2 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,24 +1,72 @@
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
+@@ -36,47 +36,47 @@
+ giscience.la gistandard.la giwavecalibration.la
- INCLUDES = $(all_includes)
--LDADD = $(LIBTEMPLATE)
-+LDADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLUI)
+ gimasterflat_la_SOURCES = gimasterflat.c
+-gimasterflat_la_LIBADD = $(LIBGIRAFFE)
++gimasterflat_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ gimasterflat_la_LDFLAGS = -module -avoid-version
+ gimasterflat_la_DEPENDENCIES = $(LIBGIRAFFE)
- check_PROGRAMS = template_dfs-test
+ gimasterbias_la_SOURCES = gimasterbias.c
+-gimasterbias_la_LIBADD = $(LIBGIRAFFE)
++gimasterbias_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ gimasterbias_la_LDFLAGS = -module -avoid-version
+ gimasterbias_la_DEPENDENCIES = $(LIBGIRAFFE)
---- 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)
+ gimasterdark_la_SOURCES = gimasterdark.c
+-gimasterdark_la_LIBADD = $(LIBGIRAFFE)
++gimasterdark_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ gimasterdark_la_LDFLAGS = -module -avoid-version
+ gimasterdark_la_DEPENDENCIES = $(LIBGIRAFFE)
+
+ giwavecalibration_la_SOURCES = giwavecalibration.c
+-giwavecalibration_la_LIBADD = $(LIBGIRAFFE)
++giwavecalibration_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ giwavecalibration_la_LDFLAGS = -module -avoid-version
+ giwavecalibration_la_DEPENDENCIES = $(LIBGIRAFFE)
+
+ giscience_la_SOURCES = giscience.c
+-giscience_la_LIBADD = $(LIBGIRAFFE)
++giscience_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ giscience_la_LDFLAGS = -module -avoid-version
+ giscience_la_DEPENDENCIES = $(LIBGIRAFFE)
+
+ gistandard_la_SOURCES = gistandard.c
+-gistandard_la_LIBADD = $(LIBGIRAFFE)
++gistandard_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ gistandard_la_LDFLAGS = -module -avoid-version
+ gistandard_la_DEPENDENCIES = $(LIBGIRAFFE)
+
+ giframestack_la_SOURCES = giframestack.c
+-giframestack_la_LIBADD = $(LIBGIRAFFE)
++giframestack_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ giframestack_la_LDFLAGS = -module -avoid-version
+ giframestack_la_DEPENDENCIES = $(LIBGIRAFFE)
+
+
+ giccdlin_la_SOURCES = giccdlin.c
+-giccdlin_la_LIBADD = $(LIBGIRAFFE)
++giccdlin_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ giccdlin_la_LDFLAGS = -avoid-version -module
+ giccdlin_la_DEPENDENCIES = $(LIBGIRAFFE)
+
+ giccdron_la_SOURCES = giccdron.c
+-giccdron_la_LIBADD = $(LIBGIRAFFE)
++giccdron_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ giccdron_la_LDFLAGS = -avoid-version -module
+ giccdron_la_DEPENDENCIES = $(LIBGIRAFFE)
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -32,7 +32,7 @@
+ LIBGIRAFFE = $(top_builddir)/giraffe/libgiraffe.la
+
+ INCLUDES = -I$(top_builddir)/giraffe -I$(top_srcdir)/giraffe
+-LDADD = $(LIBGIRAFFE)
++LDADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLUI)
+
+ check_PROGRAMS =
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9c9230a..7282953 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -2,12 +2,12 @@ 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 @@
+@@ -91,7 +91,7 @@
[
if test -z "$plugindir"; then
- plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
+ plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
fi
-
- if test -z "$privatelibdir"; then
+
+ if test -z "$configdir"; then
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index ae95068..7810af2 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -1,21 +1,47 @@
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 @@
+--- a/m4/cpl.m4
++++ b/m4/cpl.m4
+@@ -8,7 +8,7 @@
+
+ cpl_cfitsio_check_version="3.270"
+ 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 \
+@@ -840,7 +841,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=""
+@@ -917,6 +918,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..42aba01 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
http://www.eso.org/sci/software/pipelines/ \
- .*/template-kit-(.*).tar.gz \
+ .*/giraf-kit-(.*).tar.gz \
debian debian/repackage.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-template.git
More information about the Debian-astro-commits
mailing list