[SCM] ESO library for automated astronomical data-reduction branch, prepare-for-upcoming-release, updated. upstream/5.3.1-11-g9142c2f

[Ole Streicher]

The following commit has been merged in the prepare-for-upcoming-release branch:
commit 9142c2f60d5b2b271f9f212f1c21cc61823f4e23
Author: Ole Streicher <github at liska.ath.cx>
Date:   Tue Nov 29 11:35:53 2011 +0100

    Re-add removal of version info helper files

diff --git a/debian/patches/remove-wcs-versioninfo.patch b/debian/patches/remove-wcs-versioninfo.patch
index cf5abc2..d637187 100644
--- a/debian/patches/remove-wcs-versioninfo.patch
+++ b/debian/patches/remove-wcs-versioninfo.patch
@@ -18,7 +18,42 @@ Forwarded: <mailto:cpl-help at eso.org>
  #include "cpl_memory_impl.h"
  #include "cpl_error_impl.h"
  #include "cpl_msg.h"
-@@ -265,11 +260,7 @@
+@@ -112,34 +107,8 @@
+ cpl_init(unsigned self)
+ {
+ 
+-#ifndef CPL_CFITSIO_MAX_VERSION
+-#define CPL_CFITSIO_MAX_VERSION 4.0
+-#endif
+-
+-#define CPL_CFITSIO_THREAD_UNSAFE 3.18
+-
+-#ifdef CFITSIO_VERSION
+-#define CPL_CFITSIO_VERSION CFITSIO_VERSION
+-#else
+-    /* This macro was introduced after version 2.510 */
+-    /* Since CPL currently depends on version 2.510, it is
+-       assumed at this point that the version actually is 2.510. */
+-#define CPL_CFITSIO_VERSION 2.51
+-#endif
+-
+-    float cfitsio_version;
+-    const float cfitsio_version_diff = fits_get_version(&cfitsio_version)
+-        - (CPL_CFITSIO_VERSION);
+-    /* FIXME: CPLs internal config.h should define a macro with the
+-       supported CFITSIO version range, to ensure consistency between
+-       configure and run-time check. */
+-    const float cfitsio_version_supported_min = 2.51;
+-    const float cfitsio_version_supported_max = CPL_CFITSIO_MAX_VERSION;
+-
+     int memory_mode = CPL_XMEMORY_MODE; /* Default from configure */
+     const char * memory_mode_string = getenv("CPL_MEMORY_MODE");
+-    char       * err_msg = NULL;
+-
+ 
+     if (memory_mode_string != NULL) {
+         if (strcmp("0", memory_mode_string) == 0) {
+@@ -265,11 +234,7 @@
         only, or both */
  
  #ifdef CPL_WCS_INSTALLED

-- 
ESO library for automated astronomical data-reduction