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

[Ole Streicher]

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

    Oops: Move patch to the right patch file

diff --git a/debian/changelog b/debian/changelog
index b05acb3..d72b2e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
-cpl (5.3.1-1) unstable; urgency=low
+cpl (5.92-1) unstable; urgency=low
 
-  * New package. Closes: #641628
+  * New Upstream release
 
  -- Ole Streicher <debian at liska.ath.cx>  Fri, 11 Nov 2011 17:38:00 +0200
-
-
diff --git a/debian/patches/remove-cfitsio-version-check.patch b/debian/patches/remove-cfitsio-version-check.patch
index af69ab0..29188c7 100644
--- a/debian/patches/remove-cfitsio-version-check.patch
+++ b/debian/patches/remove-cfitsio-version-check.patch
@@ -7,6 +7,41 @@ Description: ESO is paranoid against the binary incompability of cfitsio
 Forwarded: <mailto:cpl-help at eso.org>
 --- a/cplcore/cpl_init.c
 +++ b/cplcore/cpl_init.c
+@@ -107,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) {
 @@ -122,88 +122,6 @@
          cpl_msg_warning(cpl_func, "Illegal input ignored");
      }
diff --git a/debian/patches/remove-wcs-versioninfo.patch b/debian/patches/remove-wcs-versioninfo.patch
index d637187..e0abc4e 100644
--- a/debian/patches/remove-wcs-versioninfo.patch
+++ b/debian/patches/remove-wcs-versioninfo.patch
@@ -18,41 +18,6 @@ Forwarded: <mailto:cpl-help at eso.org>
  #include "cpl_memory_impl.h"
  #include "cpl_error_impl.h"
  #include "cpl_msg.h"
-@@ -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 */
  

-- 
ESO library for automated astronomical data-reduction