[SCM] Execution Tool for European Southern Observatory pipelines branch, debian, updated. upstream/3.9.0-3-ga1f9dd1
Ole Streicher
debian at liska.ath.cx
Tue Nov 29 08:53:42 UTC 2011
The following commit has been merged in the debian branch:
commit b47d697f21640b44ca17c51a53b5f7528b5c8dac
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Nov 11 19:10:17 2011 +0100
Initial debian packaging files
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..0911392
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+esorex (3.9.0-1) unstable; urgency=low
+
+ * New package. Closes: #641634
+
+ -- Ole Streicher <debian at liska.ath.cx> Fri, 13 Nov 2011 17:52:00 +0200
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..12a2dd1
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,76 @@
+Makefile.in
+aclocal.m4
+admin/compile
+admin/config.guess
+admin/config.sub
+admin/depcomp
+admin/install-sh
+admin/ltmain.sh
+admin/missing
+configure
+etc/Makefile.in
+libltdl/configure
+libltdl/lt_error.c
+libltdl/lt_dlloader.c
+libltdl/lt__alloc.c
+libltdl/config.h
+libltdl/config-h.in
+libltdl/ltdl.h
+libltdl/loaders/preopen.c
+libltdl/loaders/load_add_on.c
+libltdl/loaders/dlopen.c
+libltdl/loaders/dyld.c
+libltdl/loaders/loadlibrary.c
+libltdl/loaders/dld_link.c
+libltdl/loaders/shl_load.c
+libltdl/COPYING.LIB
+libltdl/config/ltmain.sh
+libltdl/config/compile
+libltdl/config/depcomp
+libltdl/config/config.guess
+libltdl/config/missing
+libltdl/config/config.sub
+libltdl/config/install-sh
+libltdl/config.log
+libltdl/config.status
+libltdl/slist.c
+libltdl/aclocal.m4
+libltdl/libltdl/lt_system.h
+libltdl/libltdl/lt__dirent.h
+libltdl/libltdl/lt_dlloader.h
+libltdl/libltdl/slist.h
+libltdl/libltdl/lt__strl.h
+libltdl/libltdl/lt__alloc.h
+libltdl/libltdl/lt_error.h
+libltdl/libltdl/lt__private.h
+libltdl/libltdl/lt__glibc.h
+libltdl/README
+libltdl/m4/argz.m4
+libltdl/m4/ltoptions.m4
+libltdl/m4/libtool.m4
+libltdl/m4/ltversion.m4
+libltdl/m4/ltsugar.m4
+libltdl/m4/ltdl.m4
+libltdl/m4/lt~obsolete.m4
+libltdl/argz.c
+libltdl/configure.ac
+libltdl/ltdl.c
+libltdl/lt__dirent.c
+libltdl/lt__strl.c
+libltdl/Makefile
+libltdl/Makefile.in
+libltdl/Makefile.am
+libltdl/argz_.h
+libltdl/stamp-h1
+libltdl/libtool
+m4macros/libtool.m4
+m4macros/ltdl.m4
+m4macros/ltoptions.m4
+m4macros/ltsugar.m4
+m4macros/ltversion.m4
+m4macros/lt~obsolete.m4
+src/Makefile.in
+src/esorex.man
+src/.logfile
+src/tests/Makefile.in
+tests/Makefile.in
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..eb24c14
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,24 @@
+Source: esorex
+Section: science
+Priority: optional
+Maintainer: Ole Streicher <debian at liska.ath.cx>
+Build-Depends: debhelper (>= 7.0.50), dh-autoreconf,
+ libcpl-dev (>= 5.1.0), libcfitsio3-dev, wcslib-dev, help2man, libltdl-dev
+Standards-Version: 3.9.2
+Homepage: http://www.eso.org/sci/software/cpl/esorex.html
+
+Package: esorex
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Execution Tool for European Southern Observatory pipelines
+ EsoRex is the European Southern Observatory (ESO) Recipe Execution Tool. It
+ can list, configure and execute CPL-based recipes from the command line.
+ .
+ The Common Pipeline Library (CPL) comprises a set of ISO-C libraries that
+ provide a comprehensive, efficient and robust software toolkit. It forms a
+ basis for the creation of automated astronomical data-reduction tasks.
+ .
+ One of the features provided by the CPL is the ability to create
+ data-reduction algorithms that run as plugins (dynamic libraries). These are
+ called "recipes" and are one of the main aspects of the CPL data-reduction
+ development environment.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..5299124
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,56 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Upstream-Name: esorex
+Upstream-Author: Derek McKay <dmckay at eso.org>,
+ Michael Kiesgen <mkiesgen at eso.org>,
+ Neil Ferguson <nferguso at eso.org>,
+ Ralf Palsa <rpalsa at eso.org
+Source: http://www.eso.org/sci/software/cpl/download.html
+
+Files: *
+Copyright: Copyright (C) 2001-2010 European Southern Observatory
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: */Makefile.in aclocal.m4 configure src/getopt*
+Copyright: Copyright (C) 1994-2009 Free Software Foundation, Inc.
+License: Free
+ This file is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+
+Files: src/getopt*
+Copyright: Copyright (C) 1994-2009 Free Software Foundation, Inc.
+License: LGPL-2.1
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: debian/*
+Copyright: 2011 Ole Streicher <debian at liska.ath.cx>
+License: GPL-2
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..ace3e76
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+usr/local/lib/cpl/plugins
+usr/lib/cpl/plugins
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..b5c7362
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,4 @@
+BUGS
+NEWS
+README
+TODO
diff --git a/debian/esorex.lintian-overrides b/debian/esorex.lintian-overrides
new file mode 100644
index 0000000..1b643d0
--- /dev/null
+++ b/debian/esorex.lintian-overrides
@@ -0,0 +1,2 @@
+# Don't complain about empty directories needed to avoid runtime warnings
+package-contains-empty-directory usr/lib/cpl/plugins
diff --git a/debian/patches/add-cplcore-link.patch b/debian/patches/add-cplcore-link.patch
new file mode 100644
index 0000000..24a30e6
--- /dev/null
+++ b/debian/patches/add-cplcore-link.patch
@@ -0,0 +1,12 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Explicitely link cplcore to avoid build errors in unstable
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -49,6 +49,6 @@
+
+ esorex_LDFLAGS = $(CPL_LDFLAGS) $(CFITSIO_LDFLAGS) $(LIBLTDL)
+-esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBLTDL)
++esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
+ esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL)
+
+ if PURIFY
diff --git a/debian/patches/check-for-cpl-so.patch b/debian/patches/check-for-cpl-so.patch
new file mode 100644
index 0000000..bd4e70c
--- /dev/null
+++ b/debian/patches/check-for-cpl-so.patch
@@ -0,0 +1,24 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Since the Debian version of CPL does not provide .la files, we
+ check for the existence of the .so files. These are also used for the
+ build process.
+--- a/m4macros/cpl.m4
++++ b/m4macros/cpl.m4
+@@ -186,7 +186,7 @@
+ AC_MSG_CHECKING([for libcext])
+
+ cpl_cext_check_header="cxmacros.h"
+- cpl_cext_check_lib="libcext.la"
++ cpl_cext_check_lib="libcext.so"
+
+ cpl_cext_includes=""
+ cpl_cext_libraries=""
+@@ -335,7 +335,7 @@
+ AC_MSG_CHECKING([for CPL])
+
+ cpl_check_cpl_header="cpl_macros.h"
+- cpl_check_cpl_lib="libcplcore.la"
++ cpl_check_cpl_lib="libcplcore.so"
+
+ cpl_includes=""
+ cpl_libraries=""
diff --git a/debian/patches/fix-autotools.patch b/debian/patches/fix-autotools.patch
new file mode 100644
index 0000000..57bebda
--- /dev/null
+++ b/debian/patches/fix-autotools.patch
@@ -0,0 +1,20 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Subject: Fix autotools files to allow the current version.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -59,4 +59,4 @@
+
+ uninstall-local: uninstall-html
+
+-include $(top_srcdir)/admin/html.am
++#include $(top_srcdir)/admin/html.am
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,7 @@
+
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_AUX_DIR([admin])
++AC_CONFIG_MACRO_DIR([m4macros])
+
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
diff --git a/debian/patches/fix-spelling.patch b/debian/patches/fix-spelling.patch
new file mode 100644
index 0000000..cddafd3
--- /dev/null
+++ b/debian/patches/fix-spelling.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix small spelling error found by lintian
+--- a/src/er_paf.c
++++ b/src/er_paf.c
+@@ -335,7 +335,7 @@
+ REG_EXTENDED|REG_NOSUB);
+ if(regstatus)
+ {
+- cpl_msg_error(er_func, "Bad formatted PRO CATG regular expresion");
++ cpl_msg_error(er_func, "Bad formatted PRO CATG regular expression");
+ cpl_error_set(er_func, CPL_ERROR_ILLEGAL_INPUT);
+ cpl_msg_indent_less();
+ regfree(&pattern);
diff --git a/debian/patches/generate-manpage.patch b/debian/patches/generate-manpage.patch
new file mode 100644
index 0000000..884bd57
--- /dev/null
+++ b/debian/patches/generate-manpage.patch
@@ -0,0 +1,123 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Subject: Generate a manpage for esorex.
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -59,3 +59,7 @@
+ include $(top_builddir)/Makefile.purify
+ endif
+
++esorex.man: esorex
++ sh esorex_create_man.sh
++
++man1_MANS = esorex.man
+--- /dev/null
++++ b/src/esorex_create_man.sh
+@@ -0,0 +1,108 @@
++#!/bin/sh
++
++help2man -N -i $0 ./esorex | sed s/^:\ // | fgrep -v "***" > esorex.man
++<< instrument.
++
++[NAME]
++esorex \- ESO Recipe Execution Tool
++
++[DESCRIPTION]
++EsoRex is the ESO Recipe Execution Tool. It can list, configure and execute
++CPL-based recipes from the command line.
++
++One of the features provided by the CPL is the ability to create
++data-reduction algorithms that run as plugins (dynamic libraries). These are
++called recipes and are one of the main aspects of the CPL data-reduction
++development environment.
++
++As these recipes are dynamic libraries, it is not possible to run them
++directly from the command line. However, ESO provides several tools to do
++this, thus saving recipe developers the need to write such an application
++themselves. One of these is GASGANO (a GUI-based tool) and the other is
++ EsoRex (which runs from the command line) and is described here.
++
++[ENVIRONMENT]
++All options can be set as environment parameters as well. See the previous
++paragraph for details.
++
++[HINTS]
++.TP
++.SH File permissions
++When a recipe is used with the \fB\-\-suppress\-prefix\fR option, and the
++\fB\-\-output\-dir\fR is set to the current working directory, then the first
++execution of a recipe will work correctly, but subsequent executions may
++fail. This is due to output products being given \`read-only\' permission
++(to avoid the potential inadvertant loss of products). The recipe itself
++is unable to modify the permissions, and thus it fails when attempting to
++create the file. The solution (other than using a different output directory
++or prefixes) is to change the permission of these output files or delete
++them prior to any subsequent execution of that recipe.
++
++This problem is less likely to occur in EsoRex v2+, due to the replacement of
++the \fB\-\-output\-overwrite\fR option with the \fB\-\-output\-readonly\fR
++(which is disabled by default). However, a determined user can still reach
++this situation, in which case the non-readable products must have their
++permissions changed, as described above.
++
++.TP
++.SH Configuration files
++When creating configuration files, if the the recipe is provided on the
++command line, then EsoRex will generate the configuration file for this
++recipe. If no recipe name is given, then EsoRex will generate a configuration
++file for EsoRex itself. All configuration files are written in the
++$HOME/.esorex/ directory.
++
++.TP
++.SH Memory checking
++It is possible to get EsoRex to check for memory leaks in the recipe
++that it is running, by enabling the \fB\-\-mem\-check\fR option. Then, at the
++conclusion of the recipe execution, and after memory deallocation, a list of
++all remaining allocated memory will be printed to screen. If there are no
++memory leaks, then no addition output is displayed.
++
++[FILES]
++.TP
++.SH /etc/esorex.rc $HOME/.esorex/esorex.rc
++Default configuration files
++
++The configuration file contains the EsoRex options, less the \`\-\-\'
++switch, but prefixed with \`esorex.caller.\'. Blank lines are ignored and
++lines beginning with \`#\' are treated as comments.
++
++Here is an example configuration file.
++
++ # Example EsoRex configuration file
++ #
++ esorex.caller.recipe-dir=/home/username/EsoRex/Plugins
++ esorex.caller.log-dir=.
++ esorex.caller.log-file=esorex.log
++ esorex.caller.log-file=esorex.log
++ esorex.caller.output-dir=.
++ esorex.caller.output-prefix=out_
++
++.TP
++.SH filename.sof
++A sof file contains a list of the input data. This data is specified in an sof
++file (which is just a text file), where each input file is specified with its
++associated classification and category. The format of each line in the sof
++file is as follows:
++
++ full-path-to-file classification
++
++Optionally, a third column may be provided. Permitted values are either RAW or
++CALIB. This is for when a recipe does not identify the type of input file, but
++as all ESO recipes are required to do so, this column is typically not needed.
++
++An example sof file, for the mythological "ZIMOS" instrument, might look like this:
++
++ /data/mos/ZIMOS.03-12-26T01:05:06.fits MOS_SCIENCE
++ /data/mos/ZIMOS.03-12-26T01:26:00.fits MOS_SCIENCE
++ /data/mos/ZIMOS.03-12-26T01:47:04.fits MOS_SCIENCE
++ /data/cal/master_bias4.fits MASTER_BIAS
++ /data/cal/grs_LR_red.3.tfits GRISM_TABLE
++ /data/gasgano/extract_table2.fits EXTRACT_TABLE
++ /data/cal/badpixel.3.tfits CCD_TABLE
++
++For an concrete example for a specific instrument, check the documentation for that
++instrument.
++
diff --git a/debian/patches/move-rcfile-to-etc.patch b/debian/patches/move-rcfile-to-etc.patch
new file mode 100644
index 0000000..2da9a23
--- /dev/null
+++ b/debian/patches/move-rcfile-to-etc.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: The configuration directory is /etc, independent of
+ the prefix. This was set wrong in er_prefix.h and is corrected
+ here.
+--- a/src/er_prefix.h.in
++++ b/src/er_prefix.h.in
+@@ -3,5 +3,5 @@
+ MYDATA = @datadir@
+ ESOREX_PREFIX=@prefix@
+ */
+-#define ESOREX_PREFIX "@prefix@/etc/"
++#define ESOREX_PREFIX "/etc/"
+
diff --git a/debian/patches/remove-empty-configdir.patch b/debian/patches/remove-empty-configdir.patch
new file mode 100644
index 0000000..9e70176
--- /dev/null
+++ b/debian/patches/remove-empty-configdir.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Avoid creation of an empty directory "/usr/share/esorex/config"
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -49,8 +49,6 @@
+
+ bin_PROGRAMS = esorex
+
+-config_DATA =
+-
+ esorex_LDFLAGS = $(CPL_LDFLAGS) $(CFITSIO_LDFLAGS) $(LIBLTDL)
+ esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBLTDL)
+ esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL)
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/remove-private-ltdl.patch
new file mode 100644
index 0000000..4ce7df1
--- /dev/null
+++ b/debian/patches/remove-private-ltdl.patch
@@ -0,0 +1,48 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Subject: Remove private library libltdl and use the installed one.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,9 +24,6 @@
+
+ DISTCLEANFILES = *~
+
+-
+-COMPILE_FIRST = libltdl
+-
+ TOPSUBDIRS = src etc
+
+ COMPILE_LAST = tests
+@@ -42,9 +39,7 @@
+ if MAINTAINER_MODE
+
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log \
+- config.status configure stamp-h.in libltdl/config-h.in \
+- libltdl/aclocal.m4 libltdl/Makefile.in libltdl/configure \
+- libltdl/config.status libltdl/stamp-h.in libltdl/config.log
++ config.status configure stamp-h.in
+
+ clean-local: clean-html
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,9 @@
+
+ ESO_CHECK_DOCTOOLS
+
+-AC_LIBLTDL_CONVENIENCE
++LT_INIT
++LT_CONFIG_LTDL_DIR([libltdl])
++AC_LIB_LTDL
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+
+@@ -79,9 +81,6 @@
+ # Determine the shared library suffix on this platform
+ AC_LTDL_SHLIBEXT
+
+-
+-AC_CONFIG_SUBDIRS(libltdl)
+-
+ AC_CONFIG_FILES(Makefile
+ Makefile.purify
+ src/er_prefix.h
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c3a0beb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+remove-private-ltdl.patch
+fix-autotools.patch
+generate-manpage.patch
+fix-spelling.patch
+check-for-cpl-so.patch
+move-rcfile-to-etc.patch
+remove-empty-configdir.patch
+add-cplcore-link.patch
+set-default-plugin-path.patch
diff --git a/debian/patches/set-default-plugin-path.patch b/debian/patches/set-default-plugin-path.patch
new file mode 100644
index 0000000..f56f21e
--- /dev/null
+++ b/debian/patches/set-default-plugin-path.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Set the default plugin path to the one where recipes are
+ installed in Debian.
+--- a/etc/esorex.rc.in
++++ b/etc/esorex.rc.in
+@@ -130,7 +130,7 @@
+ # as well. Multiple directory heads may be specified, by separating the
+ # starting paths with colons (:). This option may also be set using the
+ # environment variable ESOREX_PLUGIN_DIR.
+-esorex.caller.recipe-dir=@prefix@/lib/esopipes-plugins
++esorex.caller.recipe-dir=/usr/local/lib/cpl/plugins:/usr/lib/cpl/plugins
+
+ # --suppress-link
+ # When TRUE, no symbolic link is created to the output product. However, if
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..5ee7d6f
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with autoreconf
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..360e08e
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+# format version number, currently 3; this line is compulsory!
+version=3
+
+ftp://ftp.eso.org/pub/cpl/esorex-(.*)\.tar\.gz debian uupdate
+
--
Execution Tool for European Southern Observatory pipelines
More information about the debian-science-commits
mailing list