[SCM] ESO library for automated astronomical data-reduction branch, debian, updated. upstream/5.3.1-58-g2f279c9

Mon Nov 26 10:13:00 UTC 2012

The following commit has been merged in the debian branch:
commit 2f279c9af37cc33a31d7bd8073868020ba3a836b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Nov 26 11:11:55 2012 +0100

    Update to new upstream version

diff --git a/debian/changelog b/debian/changelog
index a510b6f..f8a2d7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl (6.2-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 26 Nov 2012 11:00:59 +0100
+
 cpl (6.1.1-2) unstable; urgency=low
 
   * Remove compile-time estimation of L2 cache size
diff --git a/debian/patches/build-cpljava.patch b/debian/patches/build-cpljava.patch
index 6421480..e56601d 100644
--- a/debian/patches/build-cpljava.patch
+++ b/debian/patches/build-cpljava.patch
@@ -4,7 +4,7 @@ Description: Allow building that JNI interface without having Gasgano
  is non-free. 
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -620,7 +620,6 @@ AC_DEFUN([CPL_ENABLE_GASGANO],
+@@ -622,7 +622,6 @@
  [
  
      AC_REQUIRE([CPL_PATH_JAVA])
@@ -12,7 +12,7 @@ Description: Allow building that JNI interface without having Gasgano
  
      AC_ARG_ENABLE(gasgano,
                    AC_HELP_STRING([--enable-gasgano],
-@@ -634,7 +633,7 @@ AC_DEFUN([CPL_ENABLE_GASGANO],
+@@ -636,7 +635,7 @@
          cpl_gasgano_support="no"
          AC_MSG_RESULT([no])
      else
@@ -23,7 +23,7 @@ Description: Allow building that JNI interface without having Gasgano
          else
 --- a/cpljava/Makefile.am
 +++ b/cpljava/Makefile.am
-@@ -31,26 +31,10 @@ endif
+@@ -31,26 +31,10 @@
  
  INCLUDES = $(CPLCORE_INCLUDES) $(CPLUI_INCLUDES) $(CPLDFS_INCLUDES) $(CX_INCLUDES) $(JAVA_INCLUDES) $(INCLTDL)
  
@@ -52,15 +52,15 @@ Description: Allow building that JNI interface without having Gasgano
 -	$(JAVAH) -classpath $(GASGANO_CLASSPATH) $$class;
 --- a/cpljava/cpl_gasgano.c
 +++ b/cpljava/cpl_gasgano.c
-@@ -57,6 +57,7 @@
- #include "cpl_errorstate.h"
+@@ -58,6 +58,7 @@
  #include "cpl_version.h"
+ #include "cpl_memory.h"
  
 +#if 0	/* headers not shipped with CPL, not needed for building */
  #include "org_eso_cpl_jni_CPLControl.h"
  #include "org_eso_cpl_jni_JNIParameterImp.h"
  #include "org_eso_cpl_jni_JNIRecipe.h"
-@@ -67,6 +68,7 @@
+@@ -68,6 +69,7 @@
      defined (ENABLE_NATIVE_TESTS)
  #  include "org_eso_cpl_test_NativeTest.h"
  #endif
diff --git a/debian/patches/disable_some_tests.patch b/debian/patches/disable_some_tests.patch
index d451113..3d225bb 100644
--- a/debian/patches/disable_some_tests.patch
+++ b/debian/patches/disable_some_tests.patch
@@ -7,7 +7,7 @@ Description: On armel the mask test gives unreasonable results. This
  cause can be found here.
 --- a/cplcore/tests/Makefile.am
 +++ b/cplcore/tests/Makefile.am
-@@ -121,7 +121,6 @@
+@@ -123,7 +123,6 @@
          cpl_imagelist_io-test \
          cpl_imagelist_basic-test \
          cpl_io_fits-test \
diff --git a/debian/patches/loose_cplfit_test.patch b/debian/patches/loose_cplfit_test.patch
index f81034b..8a4cef9 100644
--- a/debian/patches/loose_cplfit_test.patch
+++ b/debian/patches/loose_cplfit_test.patch
@@ -5,7 +5,7 @@ Description: On several machines -- even 64 bit -- the fit test may fail
  anyway, we will use the loose requirement here for all architectures.
 --- a/cpldrs/tests/cpl_fit-test.c
 +++ b/cpldrs/tests/cpl_fit-test.c
-@@ -1550,7 +1550,7 @@ cpl_fit_imagelist_polynomial_window_test(const cpl_vector    * x_pos,
+@@ -1558,7 +1558,7 @@
          cpl_image * baderror = fiterror ? cpl_image_duplicate(fiterror) : NULL;
          const double tol = pixeltype == CPL_TYPE_INT ? 0.0
              : (pixeltype == CPL_TYPE_FLOAT
diff --git a/debian/patches/no_compiletime_cpucheck.patch b/debian/patches/no_compiletime_cpucheck.patch
index eb12a84..77140ef 100644
--- a/debian/patches/no_compiletime_cpucheck.patch
+++ b/debian/patches/no_compiletime_cpucheck.patch
@@ -6,7 +6,7 @@ Description: On Linux machines, CPL_CHECK_CPU checks the CPU 2nd level
  platforms. The performance loss is probably negleglible.
 --- a/configure.ac
 +++ b/configure.ac
-@@ -125,7 +125,6 @@
+@@ -124,7 +124,6 @@
  CPL_EXPORT_DIRS(htmldir)
  
  CPL_CHECK_MEMORYMODE
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/remove-private-ltdl.patch
index 24e080e..3e5a04b 100644
--- a/debian/patches/remove-private-ltdl.patch
+++ b/debian/patches/remove-private-ltdl.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Subject: Remove private library libltdl and use the installed one.
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -25,11 +25,10 @@ ACLOCAL_AMFLAGS = -I m4
+@@ -25,11 +25,10 @@
  DISTCLEANFILES = *~
  
  if GASGANO_SUPPORT
@@ -17,7 +17,7 @@ Subject: Remove private library libltdl and use the installed one.
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -60,7 +60,9 @@ ESO_CHECK_DOCTOOLS
+@@ -59,7 +59,9 @@
  AC_ENABLE_STATIC(yes)
  AC_ENABLE_SHARED(yes)
  
@@ -28,7 +28,7 @@ Subject: Remove private library libltdl and use the installed one.
  AC_PROG_LIBTOOL
  AC_SUBST(INCLTDL)
  AC_SUBST(LIBLTDL)
-@@ -131,7 +133,6 @@ CPL_ENABLE_GASGANO
+@@ -130,7 +132,6 @@
  CPL_CONFIG_FUNC
  
  # Configure subpackages
diff --git a/debian/patches/remove-wcs-versioninfo.patch b/debian/patches/remove-wcs-versioninfo.patch
index ec791cb..7210513 100644
--- a/debian/patches/remove-wcs-versioninfo.patch
+++ b/debian/patches/remove-wcs-versioninfo.patch
@@ -18,7 +18,7 @@ Forwarded: <mailto:cpl-help at eso.org>
  #if defined CPL_FFTWF_INSTALLED || defined CPL_FFTW_INSTALLED
  #include <fftw3.h>
  #endif
-@@ -273,11 +268,7 @@ const char * cpl_get_description(unsigned self)
+@@ -273,11 +268,7 @@
         only, or both */
  
  #ifdef CPL_WCS_INSTALLED
diff --git a/debian/patches/use-std-paths-for-libs.patch b/debian/patches/use-std-paths-for-libs.patch
index dc5d10b..44bba32 100644
--- a/debian/patches/use-std-paths-for-libs.patch
+++ b/debian/patches/use-std-paths-for-libs.patch
@@ -6,7 +6,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
  installed in the standard directory.
 --- a/m4/cpl.m4
 +++ b/m4/cpl.m4
-@@ -8,7 +8,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
+@@ -8,7 +8,7 @@
          
      cpl_cfitsio_check_version="$1"
      cpl_cfitsio_check_header="fitsio.h"
@@ -15,7 +15,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
  
      cpl_cfitsio_incdirs=""
      cpl_cfitsio_libdirs=""
-@@ -109,6 +109,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
+@@ -109,6 +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"
@@ -23,7 +23,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
  
                  test -n "$CFITSIODIR" && \
                      cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
-@@ -556,6 +557,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
+@@ -556,6 +557,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"
@@ -31,7 +31,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
  
                  	test -n "$CPLDIR" && \
                      	cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -668,7 +670,7 @@ AC_DEFUN([CPL_CHECK_WCS],
+@@ -668,7 +670,7 @@
  
      cpl_wcs_check_version="$1"
      cpl_wcs_check_header="wcslib/wcslib.h"
@@ -40,7 +40,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
  
      cpl_wcs_includes=""
      cpl_wcs_libraries=""
-@@ -742,6 +744,7 @@ AC_DEFUN([CPL_CHECK_WCS],
+@@ -742,6 +744,7 @@
      		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
      		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
      		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
@@ -48,7 +48,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
      		
  	        test -n "$WCSDIR" && \
      	    	cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -900,8 +903,8 @@ AC_DEFUN([CPL_CHECK_FFTW],
+@@ -900,8 +903,8 @@
  
  	cpl_fftw_check_version="$1"
      cpl_fftw_check_header="fftw3.h"
@@ -59,7 +59,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
  
      cpl_fftw_includes=""
      cpl_fftw_libraries=""
-@@ -976,6 +979,7 @@ AC_DEFUN([CPL_CHECK_FFTW],
+@@ -976,6 +979,7 @@
      		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
      		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
      		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
@@ -67,7 +67,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
      		
  	        test -n "$FFTWDIR" && \
      	    	cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1314,7 +1318,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
+@@ -1314,7 +1318,7 @@
      AC_MSG_CHECKING([for CPL])
  
      cpl_check_cpl_header="cpl.h"
@@ -76,7 +76,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
  
      cpl_incdirs=""
      cpl_libdirs=""
-@@ -1391,6 +1395,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
+@@ -1391,6 +1395,7 @@
                  cpl_libdirs="$cpl_libdirs /usr/lib64"
                  cpl_libdirs="$cpl_libdirs /usr/lib"
                  cpl_libdirs="$cpl_libdirs /usr/lib32"

-- 
ESO library for automated astronomical data-reduction

