[SCM] Execution Tool for European Southern Observatory pipelines branch, master, updated. upstream/3.9.0-11-g84c9d11
Ole Streicher
debian at liska.ath.cx
Tue Apr 3 13:07:30 UTC 2012
The following commit has been merged in the master branch:
commit 7e969134031e4592e629ed62d698918e8779ad8d
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Apr 3 14:55:08 2012 +0200
New upstream version 3.9.5
diff --git a/ChangeLog b/ChangeLog
index 1713567..c79abcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,7 @@ The following summarises the major changes and bugfixes to the EsoRex
package since the release of EsoRex 3.8.3.
-v3.9.4 -- 19-March-2012
+v3.9.5 -- 20-March-2012
Version of Esorex ready for CPL 6.0.0.
diff --git a/README b/README
index 0b1c582..38b7223 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@
About EsoRex
-------------
-This is version 3.9.4 of the EsoRex application. This package includes
+This is version 3.9.5 of the EsoRex application. This package includes
source files to build the "esorex" executable, which allows the running
of Common Pipeline Library (CPL) plugins. Also included is the
documentation and the installation procedures.
diff --git a/configure b/configure
index 19c3cc0..fe95fa7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ESO Recipe Execution Tool 3.9.4.
+# Generated by GNU Autoconf 2.68 for ESO Recipe Execution Tool 3.9.5.
#
# Report bugs to <cpl-help at eso.org>.
#
@@ -572,8 +572,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ESO Recipe Execution Tool'
PACKAGE_TARNAME='esorex'
-PACKAGE_VERSION='3.9.4'
-PACKAGE_STRING='ESO Recipe Execution Tool 3.9.4'
+PACKAGE_VERSION='3.9.5'
+PACKAGE_STRING='ESO Recipe Execution Tool 3.9.5'
PACKAGE_BUGREPORT='cpl-help at eso.org'
PACKAGE_URL=''
@@ -1338,7 +1338,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ESO Recipe Execution Tool 3.9.4 to adapt to many kinds of systems.
+\`configure' configures ESO Recipe Execution Tool 3.9.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1409,7 +1409,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ESO Recipe Execution Tool 3.9.4:";;
+ short | recursive ) echo "Configuration of ESO Recipe Execution Tool 3.9.5:";;
esac
cat <<\_ACEOF
@@ -1529,7 +1529,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ESO Recipe Execution Tool configure 3.9.4
+ESO Recipe Execution Tool configure 3.9.5
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2001,7 +2001,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ESO Recipe Execution Tool $as_me 3.9.4, which was
+It was created by ESO Recipe Execution Tool $as_me 3.9.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2931,7 +2931,7 @@ fi
# Define the identity of the package.
PACKAGE='esorex'
- VERSION='3.9.4'
+ VERSION='3.9.5'
cat >>confdefs.h <<_ACEOF
@@ -14455,7 +14455,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ESO Recipe Execution Tool $as_me 3.9.4, which was
+This file was extended by ESO Recipe Execution Tool $as_me 3.9.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14521,7 +14521,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ESO Recipe Execution Tool config.status 3.9.4
+ESO Recipe Execution Tool config.status 3.9.5
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 5bed075..366a32e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT([ESO Recipe Execution Tool], [3.9.4], [cpl-help at eso.org], [esorex])
+AC_INIT([ESO Recipe Execution Tool], [3.9.5], [cpl-help at eso.org], [esorex])
AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/src/er_fileutils.c b/src/er_fileutils.c
index a10c949..f8b1d67 100644
--- a/src/er_fileutils.c
+++ b/src/er_fileutils.c
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2012/03/14 09:26:56 $
* $Revision: 1.36 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/er_fileutils.h b/src/er_fileutils.h
index 2273a25..23447d9 100644
--- a/src/er_fileutils.h
+++ b/src/er_fileutils.h
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2012/02/23 13:20:03 $
* $Revision: 1.11 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
diff --git a/src/er_help.c b/src/er_help.c
index 4d0de86..b10254e 100644
--- a/src/er_help.c
+++ b/src/er_help.c
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2010/05/19 08:21:45 $
* $Revision: 1.38 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/er_help.h b/src/er_help.h
index 6b0c640..3f21ac2 100644
--- a/src/er_help.h
+++ b/src/er_help.h
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2010/05/19 08:20:52 $
* $Revision: 1.7 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
diff --git a/src/er_main.c b/src/er_main.c
index 79f68db..dfaff84 100644
--- a/src/er_main.c
+++ b/src/er_main.c
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2012/03/09 17:29:54 $
* $Revision: 1.87 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/er_main.h b/src/er_main.h
index 9d6b9bb..7627c1e 100644
--- a/src/er_main.h
+++ b/src/er_main.h
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2012/03/09 17:29:54 $
* $Revision: 1.14 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifndef ER_MAIN_H
diff --git a/src/er_paf.c b/src/er_paf.c
index 1322bf2..64e2544 100644
--- a/src/er_paf.c
+++ b/src/er_paf.c
@@ -22,7 +22,7 @@
* $Author: cgarcia $
* $Date: 2010/08/11 08:34:54 $
* $Revision: 1.17 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/er_paf.h b/src/er_paf.h
index ca0f154..13c275e 100644
--- a/src/er_paf.h
+++ b/src/er_paf.h
@@ -22,7 +22,7 @@
* $Author: cgarcia $
* $Date: 2010/04/27 16:54:46 $
* $Revision: 1.3 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifndef er_paf_h_
diff --git a/src/er_params.c b/src/er_params.c
index 4123e01..b0ec132 100644
--- a/src/er_params.c
+++ b/src/er_params.c
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2012/02/23 13:36:02 $
* $Revision: 1.62 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/er_params.h b/src/er_params.h
index 34ca6a3..104741d 100644
--- a/src/er_params.h
+++ b/src/er_params.h
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2007/06/04 15:45:48 $
* $Revision: 1.7 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
diff --git a/src/er_paramutils.c b/src/er_paramutils.c
index 1aa6649..1b0c772 100644
--- a/src/er_paramutils.c
+++ b/src/er_paramutils.c
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2011/04/06 09:35:34 $
* $Revision: 1.41 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/er_paramutils.h b/src/er_paramutils.h
index 1ddfa4d..b170ae5 100644
--- a/src/er_paramutils.h
+++ b/src/er_paramutils.h
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2007/04/30 14:55:15 $
* $Revision: 1.8 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
diff --git a/src/er_plugin.c b/src/er_plugin.c
index f28b6d4..48bcf96 100644
--- a/src/er_plugin.c
+++ b/src/er_plugin.c
@@ -1,4 +1,4 @@
-/* $Id: er_plugin.c,v 1.107 2012/03/09 17:29:54 kbanse Exp $
+/* $Id: er_plugin.c,v 1.108 2012/03/20 08:58:10 kbanse Exp $
*
* This file is part of the ESO Common Pipeline Library
* Copyright (C) 2001-2012 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: kbanse $
- * $Date: 2012/03/09 17:29:54 $
- * $Revision: 1.107 $
- * $Name: esorex-3_9_4 $
+ * $Date: 2012/03/20 08:58:10 $
+ * $Revision: 1.108 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
@@ -1521,7 +1521,7 @@ if ((flag_time_plugin != 0) && (flag_plugin_found != 0))
plugin_time_end = cpl_test_get_walltime();
if (plugin_time_end > plugin_time_start)
{
- plugin_time_end -= plugin_time_start; /* reuse for time difference */
+ plugin_time_end -= plugin_time_start; /* reuse for time difference */
}
else
{
@@ -1538,7 +1538,7 @@ if ((flag_time_plugin != 0) && (flag_plugin_found != 0))
input_name = cpl_frame_get_filename (frame);
if (add_size (input_name,&fsz) != 0) /* accumulate size (in bytes) of raw input frames */
{
- cpl_msg_warning("could not get size of %s\n",input_name);
+ cpl_msg_warning(er_func,"could not get size of %s\n",input_name);
}
else
{
diff --git a/src/er_plugin.h b/src/er_plugin.h
index c80c690..0051814 100644
--- a/src/er_plugin.h
+++ b/src/er_plugin.h
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2012/02/23 13:48:05 $
* $Revision: 1.17 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
diff --git a/src/er_pluginlist.c b/src/er_pluginlist.c
index b7da927..51be2e9 100644
--- a/src/er_pluginlist.c
+++ b/src/er_pluginlist.c
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2012/02/23 13:46:14 $
* $Revision: 1.39 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/er_pluginlist.h b/src/er_pluginlist.h
index ff2656a..604b385 100644
--- a/src/er_pluginlist.h
+++ b/src/er_pluginlist.h
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2007/06/04 15:45:49 $
* $Revision: 1.9 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
diff --git a/src/er_stringarray.c b/src/er_stringarray.c
index fc229d1..c03ac57 100644
--- a/src/er_stringarray.c
+++ b/src/er_stringarray.c
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2007/04/30 13:51:24 $
* $Revision: 1.7 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/er_stringarray.h b/src/er_stringarray.h
index e61fd06..38870e7 100644
--- a/src/er_stringarray.h
+++ b/src/er_stringarray.h
@@ -22,7 +22,7 @@
* $Author: cgarcia $
* $Date: 2009/05/06 14:08:06 $
* $Revision: 1.6 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
diff --git a/src/er_stringutils.c b/src/er_stringutils.c
index 22c3d88..992ed01 100644
--- a/src/er_stringutils.c
+++ b/src/er_stringutils.c
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2007/11/16 15:45:52 $
* $Revision: 1.17 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/er_stringutils.h b/src/er_stringutils.h
index 2d340bc..ccf144a 100644
--- a/src/er_stringutils.h
+++ b/src/er_stringutils.h
@@ -22,7 +22,7 @@
* $Author: kbanse $
* $Date: 2006/07/11 12:54:28 $
* $Revision: 1.8 $
- * $Name: esorex-3_9_4 $
+ * $Name: esorex-3_9_5 $
*/
--
Execution Tool for European Southern Observatory pipelines
More information about the debian-science-commits
mailing list