[SCM] ESO library for automated astronomical data-reduction branch, debian, updated. upstream/5.3.1-8-g10abfd3
Ole Streicher
debian at liska.ath.cx
Tue Nov 29 08:04:54 UTC 2011
The following commit has been merged in the debian branch:
commit 25276b0799fd33b3a06a5c533ee71c1a7ed6da8c
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Nov 11 19:04:34 2011 +0100
Initial debian packaging files
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..ac79afa
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,7 @@
+cpl (5.3.1-1) sid; urgency=low
+
+ * New package. Closes: #641628
+
+ -- Ole Streicher <debian at liska.ath.cx> Fri, 11 Nov 2011 17:38:00 +0200
+
+
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..21a629c
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,4 @@
+config.log
+cpldfs/tests/cpl_dfs-test.log
+cplui/tests/cplframesetdump.txt
+cplui/tests/cplframedump.txt
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..2c43bfe
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,163 @@
+Source: cpl
+Priority: optional
+Section: libs
+Maintainer: Ole Streicher <debian at liska.ath.cx>
+Build-Depends: debhelper (>= 7.0.50), dh-autoreconf, libcfitsio3-dev,
+ wcslib-dev, libfftw3-dev, doxygen, libltdl-dev, texlive-fonts-recommended,
+ default-jdk
+Standards-Version: 3.9.2
+Homepage: http://www.eso.org/sci/software/cpl/
+
+Package: libcpl-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, wcslib-dev, libcext-dev, libcfitsio3-dev,
+ libcplcore12 (= ${binary:Version}), libcpldrs12 (= ${binary:Version}),
+ libcpldfs12 (= ${binary:Version}), libcplui12 (= ${binary:Version})
+Description: ESO library for automated astronomical data-reduction
+ 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 (known
+ as "pipelines").
+ .
+ The CPL was developed to standardise the way instrument pipelines
+ are built, to shorten their development cycle and to ease their
+ maintenance. However, it may be more generally applied to any similar
+ application, and the details of the CPL code have been engineered in
+ a way to make the library portable and flexible, as well as
+ minimising external dependencies.
+ .
+ The CPL provides a host of functionality, presented in a clear,
+ generic and uniform manner. Among its many features, the CPL offers:
+ .
+ * many useful low-level data types (images, tables, matrices, strings,
+ property lists, ...),
+ * many fundamental statistic, arithmetic and conversion operations for
+ these data types.
+ * medium-level data access methods (e.g. a data abstraction layer for
+ FITS files),
+ * data table organisation and manipulation,
+ * keyword/value handling and management,
+ * a standardised application interface for pipeline recipes, and,
+ * support for dynamic loading of recipe modules.
+ .
+ Despite the current bias towards instrument pipeline development, the
+ library also provides a variety of general-purpose image- and
+ signal-processing functions, making it an excellent framework for the
+ creation of more generic data-handling packages.
+ .
+ This package contains the static library and the C header files.
+
+Package: libcpl-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libcpl-dev
+Description: API documentation for the Common Pipeline Library
+ 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 (known
+ as "pipelines").
+ .
+ This package contains the API documentation for libcpl.
+
+Package: libcplcore12
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Fundamental CPL data types and functions
+ The CPLCORE library provides the fundamental CPL data types (such as cpl
+ image, cpl table, cpl vector, cpl matrix etc.), the operations defined on
+ these data types, and elementary utility functions. There should not be any
+ physical units associated with any of the data types or functions of that
+ library.
+ .
+ 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 (known
+ as "pipelines").
+
+Package: libcpldfs12
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: CPL functions for Data Flow System compatibility
+ The functions of this library ensure the compliance of pipeline
+ products with the Data Flow System (DFS) of the European Southern
+ Observatory (ESO).
+ .
+ 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 (known
+ as "pipelines").
+
+Package: libcpldrs12
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: CPL higher level data processing algorithms
+ The CPLDRS (DRS for Data Reduction System) implements higher level data
+ processing algorithms (such as wavelength calibration, image recombination,
+ dark-frame correction and so on).
+ .
+ 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 (known
+ as "pipelines").
+
+Package: libcplui12
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: CPL framework interface library
+ The CPLUI (UI for User Interface) provides services defining the standard
+ interface for recipes and provides more complex data reduction related
+ utilities and services. In particular, it contains the necessary types to
+ handle the plugin interface, the parameters used to handle command-line
+ options and the (set of) frames used to store the input list of files.
+ .
+ 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 (known
+ as "pipelines").
+
+Package: libcext0
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Commonly used utility functions for C programs
+ This is a C utility library, which is used to implement ESO's Common Pipeline
+ Library (CPL). The library contains a basic collections framework (maps,
+ linked lists, queues), memory management, strings, logging and others.
+
+Package: libcext-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libcext0 (= ${binary:Version})
+Description: Commonly used utility functions for C programs (development files)
+ This is a C utility library, which is used to implement ESO's Common Pipeline
+ Library (CPL). The library contains a basic collections framework (maps,
+ linked lists, queues), memory management, strings, logging and others.
+ .
+ The package contains the static library and the C header files.
+
+Package: libcext-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libcext-dev
+Description: API documentation for ESO's C utility library libcext
+ The libcext is a C utility library, which is used to implement ESO's Common
+ Pipeline Library (CPL). The library contains a basic collections framework
+ (maps, linked lists, queues), memory management, strings, logging and others.
+ .
+ The package contains the API documentation for libcpl.
+
+Package: libgasgano12
+Architecture: any
+Section: contrib/java
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: gasgano
+Description: CPL Java Native Interface library
+ This package provides a Java native interface of ESO's Common Pipeline
+ Library (CPL) for use with their Gasgano package.
+ .
+ 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 (known
+ as "pipelines").
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..1d431c8
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,47 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Upstream-Name: cpl
+Upstream-Author: Carlo Izzo <cizzo at eso.org>,
+ Ralf Palsa <rpalsa at eso.org>,
+ Yves Jung <yjung at eso.org>,
+ Lars Lundin <llundin 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 libltdl/* admin/* libcext/m4/lt*.m4
+ COPYING aclocal.m4 configure
+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: libcext/cext/snprintf.c
+Copyright: Patrick Powell 1995
+License: Free
+ This code is based on code written by Patrick Powell (papowell at astart.com)
+ It may be used for any purpose as long as this notice remains intact
+ on all source code distributions
+
+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/docs b/debian/docs
new file mode 100644
index 0000000..50bd824
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+README
diff --git a/debian/libcext-dev.install b/debian/libcext-dev.install
new file mode 100644
index 0000000..529c390
--- /dev/null
+++ b/debian/libcext-dev.install
@@ -0,0 +1,3 @@
+usr/include/cx*
+usr/lib/libcext*.a
+usr/lib/libcext*.so
diff --git a/debian/libcext-doc.doc-base b/debian/libcext-doc.doc-base
new file mode 100644
index 0000000..316dc9f
--- /dev/null
+++ b/debian/libcext-doc.doc-base
@@ -0,0 +1,11 @@
+Document: libcext
+Title: C Standard Library Extensions
+Section: Programming
+Abstract: The libcext is a C utility library, which is used to implement ESO's
+ Common Pipeline Library (CPL). The library contains a basic collections
+ framework (maps, linked lists, queues), memory management, strings, logging
+ and others.
+
+Format: HTML
+Index: /usr/share/doc/libcext-doc/html/index.html
+Files: /usr/share/doc/libcext-doc/html/*
diff --git a/debian/libcext-doc.docs b/debian/libcext-doc.docs
new file mode 100644
index 0000000..0e098aa
--- /dev/null
+++ b/debian/libcext-doc.docs
@@ -0,0 +1,3 @@
+libcext/html
+README
+AUTHORS
diff --git a/debian/libcext0.install b/debian/libcext0.install
new file mode 100644
index 0000000..bd75cb1
--- /dev/null
+++ b/debian/libcext0.install
@@ -0,0 +1 @@
+usr/lib/libcext*.so.*
diff --git a/debian/libcpl-dev.install b/debian/libcpl-dev.install
new file mode 100644
index 0000000..823f72f
--- /dev/null
+++ b/debian/libcpl-dev.install
@@ -0,0 +1,9 @@
+usr/include/cpl*
+usr/lib/libcpldrs.a
+usr/lib/libcpldfs.a
+usr/lib/libcplcore.a
+usr/lib/libcplui.a
+usr/lib/libcpldrs.so
+usr/lib/libcpldfs.so
+usr/lib/libcplcore.so
+usr/lib/libcplui.so
diff --git a/debian/libcpl-doc.doc-base b/debian/libcpl-doc.doc-base
new file mode 100644
index 0000000..c0ed70f
--- /dev/null
+++ b/debian/libcpl-doc.doc-base
@@ -0,0 +1,11 @@
+Document: libcpl
+Title: Common Pipeline Library Reference Manual
+Section: Programming
+Abstract: 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 (known as "pipelines").
+
+Format: HTML
+Index: /usr/share/doc/libcpl-doc/html/index.html
+Files: /usr/share/doc/libcpl-doc/html/*
diff --git a/debian/libcpl-doc.docs b/debian/libcpl-doc.docs
new file mode 100644
index 0000000..1936cc1
--- /dev/null
+++ b/debian/libcpl-doc.docs
@@ -0,0 +1 @@
+html
diff --git a/debian/libcplcore12.install b/debian/libcplcore12.install
new file mode 100644
index 0000000..3832406
--- /dev/null
+++ b/debian/libcplcore12.install
@@ -0,0 +1 @@
+usr/lib/libcplcore*.so.*
diff --git a/debian/libcpldfs12.install b/debian/libcpldfs12.install
new file mode 100644
index 0000000..06fd681
--- /dev/null
+++ b/debian/libcpldfs12.install
@@ -0,0 +1 @@
+usr/lib/libcpldfs*.so.*
diff --git a/debian/libcpldrs12.install b/debian/libcpldrs12.install
new file mode 100644
index 0000000..8445488
--- /dev/null
+++ b/debian/libcpldrs12.install
@@ -0,0 +1 @@
+usr/lib/libcpldrs*.so.*
diff --git a/debian/libcplgasgano12.install b/debian/libcplgasgano12.install
new file mode 100644
index 0000000..e46a6e2
--- /dev/null
+++ b/debian/libcplgasgano12.install
@@ -0,0 +1 @@
+usr/lib/libcplgasgano*.so*
diff --git a/debian/libcplui12.install b/debian/libcplui12.install
new file mode 100644
index 0000000..15e83e4
--- /dev/null
+++ b/debian/libcplui12.install
@@ -0,0 +1 @@
+usr/lib/libcplui*.so.*
diff --git a/debian/patches/build-cpljava.patch b/debian/patches/build-cpljava.patch
new file mode 100644
index 0000000..54fcc62
--- /dev/null
+++ b/debian/patches/build-cpljava.patch
@@ -0,0 +1,70 @@
+Author: Sergio Gelato
+Description: Allow building that JNI interface without having Gasgano
+ installed. This helps to keep the main packages in main, since Gasgano
+ is non-free.
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -625,7 +625,6 @@
+ [
+
+ AC_REQUIRE([CPL_PATH_JAVA])
+- AC_REQUIRE([CPL_CLASSPATH_GASGANO])
+
+ AC_ARG_ENABLE(gasgano,
+ AC_HELP_STRING([--enable-gasgano],
+@@ -639,7 +638,7 @@
+ cpl_gasgano_support="no"
+ AC_MSG_RESULT([no])
+ else
+- if test -n "$JAVA_INCLUDES" && test -n "$GASGANO_CLASSPATH"; then
++ if test -n "$JAVA_INCLUDES"; then
+ cpl_gasgano_support="yes"
+ AC_MSG_RESULT([yes])
+ else
+--- a/cpljava/Makefile.am
++++ b/cpljava/Makefile.am
+@@ -31,26 +31,10 @@
+
+ INCLUDES = $(CPLCORE_INCLUDES) $(CPLUI_INCLUDES) $(CPLDFS_INCLUDES) $(CX_INCLUDES) $(JAVA_INCLUDES) $(INCLTDL)
+
+-GASGANO_NATIVE_INCLUDES = org_eso_cpl_jni_CPLControl.h \
+- org_eso_cpl_jni_JNIParameterImp.h \
+- org_eso_cpl_jni_JNIRecipe.h \
+- org_eso_cpl_jni_LibraryLoader.h \
+- org_eso_cpl_jni_PluginLibrary.h
+-
+-BUILT_SOURCES = $(GASGANO_NATIVE_INCLUDES)
+-
+ lib_LTLIBRARIES = libcplgasgano.la
+
+-nodist_noinst_HEADERS = $(GASGANO_NATIVE_INCLUDES)
+-
+ libcplgasgano_la_SOURCES = cpl_gasgano.c
+
+ libcplgasgano_la_LDFLAGS = $(GASGANO_SHREXT) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libcplgasgano_la_LIBADD = $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
+ libcplgasgano_la_DEPENDENCIES = $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
+-
+-
+-$(GASGANO_NATIVE_INCLUDES):
+- @class="`echo $@ | sed -e 's/\.h$$//' | sed -e 's/_/\./g'`"; \
+- echo "$(JAVAH) -classpath $(GASGANO_CLASSPATH) $$class"; \
+- $(JAVAH) -classpath $(GASGANO_CLASSPATH) $$class;
+--- a/cpljava/cpl_gasgano.c
++++ b/cpljava/cpl_gasgano.c
+@@ -57,6 +57,7 @@
+ #include "cpl_errorstate.h"
+ #include "cpl_version.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 @@
+ defined (ENABLE_NATIVE_TESTS)
+ # include "org_eso_cpl_test_NativeTest.h"
+ #endif
++#endif
+
+
+ /*
diff --git a/debian/patches/disable-stat-tests.patch b/debian/patches/disable-stat-tests.patch
new file mode 100644
index 0000000..4d783d3
--- /dev/null
+++ b/debian/patches/disable-stat-tests.patch
@@ -0,0 +1,25 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Disable mystic test failures on i386 (agreed with upstream).
+Forwarded: <mailto:cpl-help at eso.org>
+--- libcpl-5.3.1.orig/cplcore/tests/cpl_stats-test.c
++++ libcpl-5.3.1/cplcore/tests/cpl_stats-test.c
+@@ -245,9 +245,9 @@ int main(void)
+
+ }
+
++#if 0 // disabled: mystic failures on i386
+ /* Test 7a:
+ Compare result from one-stats object with all-stats object */
+-
+ CPL_STAT_CMP(MIN, min);
+ CPL_STAT_CMP(MAX, max);
+ CPL_STAT_CMP(MEAN, mean);
+@@ -275,7 +275,7 @@ int main(void)
+ CPL_STAT_CMP_IMAGE(sqflux);
+ CPL_STAT_CMP_IMAGE(centroid_x);
+ CPL_STAT_CMP_IMAGE(centroid_y);
+-
++#endif
+ cpl_test_abs( cpl_stats_get_median(statall),
+ cpl_image_get_median_dev_window(img, 1, 1, IMAGE_SIZE_X,
+ IMAGE_SIZE_Y, &sig1),
diff --git a/debian/patches/remove-cfitsio-version-check.patch b/debian/patches/remove-cfitsio-version-check.patch
new file mode 100644
index 0000000..f6b6e89
--- /dev/null
+++ b/debian/patches/remove-cfitsio-version-check.patch
@@ -0,0 +1,145 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: ESO is paranoid against the binary incompability of cfitsio
+ and checks that the version at runtime equals the compile time version.
+ Since the libcfitsio3 is binary compatible up to now, this check is
+ obsolete. For Debian, runtime dependency checks should be put into the
+ install dependency anyway instead of checking it at runtime.
+Forwarded: <mailto:cpl-help at eso.org>
+--- a/cplcore/cpl_init.c
++++ b/cplcore/cpl_init.c
+@@ -95,47 +95,15 @@
+ * of invalid pointers.
+ * Any other value (including NULL) will leave the default memory mode
+ * unchanged.
+- *
+- * Possible #_cpl_error_code_ set in this function:
+- * - CPL_ERROR_INCOMPATIBLE_INPUT if there is an inconsistency between the run-
+- * time and compile-time versions of a library that CPL depends on internally,
+- * e.g. CFITSIO. This error may occur with dynamic linking. If it does occur,
+- * the use of CPL may lead to unexpected behaviour.
+ */
+
+ void
+ 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) {
+ memory_mode = 0;
+@@ -154,87 +123,6 @@
+ cpl_msg_warning(cpl_func, "Illegal input ignored");
+ }
+
+- /* Oh, grief:
+- The choice of float for the CFITSIO version means that
+- for version 2.510, fits_get_version() differs from 2.51.
+- On a Intel Xeon running Scientific Linux SL 4.0 and gcc version 4.2.1
+- this difference amounts to 8 multiples of FLT_EPSILON.
+- Let us hope future versions of CFITSIO chooses version numbers that
+- are representable by floats with an accuracy better than 100 multiples
+- of FLT_EPSILON. :-(((((((((((((((((((((((((((((((((((((((((((((((((((( */
+- if (cfitsio_version_diff < -100.0 * FLT_EPSILON) {
+- (void)cpl_error_set_message(cpl_func,
+- CPL_ERROR_INCOMPATIBLE_INPUT,
+- "Run-time version %.3f of CFITSIO "
+- "is lower than compile-time version "
+- "%.3f", cfitsio_version,
+- CPL_CFITSIO_VERSION);
+- } else if (cfitsio_version_diff > 100.0 * FLT_EPSILON) {
+- (void)cpl_error_set_message(cpl_func,
+- CPL_ERROR_INCOMPATIBLE_INPUT,
+- "Run-time version %.3f of CFITSIO is "
+- "higher than compile-time version "
+- "%.3f", cfitsio_version,
+- CPL_CFITSIO_VERSION);
+- }
+-
+- if (cfitsio_version < cfitsio_version_supported_min - 100.0 * FLT_EPSILON) {
+- err_msg = cpl_sprintf("The run-time version %.3f of CFITSIO is lower "
+- "than the supported version %.3f",
+- cfitsio_version, cfitsio_version_supported_min);
+- } else if (cfitsio_version
+- > cfitsio_version_supported_max + 100.0 * FLT_EPSILON) {
+- err_msg = cpl_sprintf("The run-time version %.3f of CFITSIO is higher "
+- "than the supported version %.3f",
+- cfitsio_version, cfitsio_version_supported_max);
+- }
+-
+- if (err_msg != NULL) {
+- if (cpl_error_get_code()) {
+- /* There is already an existing CPL error code, so this additional
+- problem is communicated via the CPL error state */
+- (void)cpl_error_set_message(cpl_func,
+- CPL_ERROR_INCOMPATIBLE_INPUT, "%s",
+- err_msg);
+- } else {
+- /* This condition is not in itself an error, so issue a warning */
+- cpl_msg_warning(cpl_func, "%s. Continue at your own risk.",
+- err_msg);
+- }
+- cpl_free((char*)err_msg);
+- err_msg = NULL;
+- }
+-
+-#ifdef _OPENMP
+-#define CPL_OMP_NUM_THREADS "OMP_NUM_THREADS"
+- /* FIXME: A CFITSIO build of at least v. 3.18 may still be thread-unsafe
+- dependeing on how it was built. Detection ? */
+- if (cfitsio_version < CPL_CFITSIO_THREAD_UNSAFE) {
+- const char * omp_num_threads_string = getenv(CPL_OMP_NUM_THREADS);
+- const int npe = atoi(omp_num_threads_string);
+- char * npe_warn = npe > 1 ? cpl_sprintf(" " CPL_OMP_NUM_THREADS " is "
+- "%d!", npe) : cpl_strdup("");
+- if (cpl_error_get_code()) {
+- (void)cpl_error_set_message(cpl_func, CPL_ERROR_INCOMPATIBLE_INPUT,
+- "CPL was built with OpenMP (v. "
+- CPL_STRINGIFY(_OPENMP) "), but with a "
+- "non-thread-safe version of CFITSIO: "
+- "%g < "
+- CPL_STRINGIFY(CPL_CFITSIO_THREAD_UNSAFE)
+- ".%s Continue at your own risk.",
+- cfitsio_version, npe_warn);
+- } else {
+- cpl_msg_warning(cpl_func, "CPL was built with OpenMP (v. "
+- CPL_STRINGIFY(_OPENMP) "), but with a non-thread-"
+- "safe version of CFITSIO: %g < "
+- CPL_STRINGIFY(CPL_CFITSIO_THREAD_UNSAFE)
+- ".%s Continue at your own risk.",
+- cfitsio_version, npe_warn);
+- }
+- cpl_free(npe_warn);
+- }
+-#endif
+-
+ #ifdef HAVE_LIBPTHREAD
+ cpl_error_init_locks();
+ #endif
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/remove-private-ltdl.patch
new file mode 100644
index 0000000..e7a8573
--- /dev/null
+++ b/debian/patches/remove-private-ltdl.patch
@@ -0,0 +1,38 @@
+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 @@
+ DISTCLEANFILES = *~
+
+ if GASGANO_SUPPORT
+-libltdl = libltdl
+ cpljava = cpljava
+ endif
+
+-SUBDIRS = $(libltdl) libcext cplcore cplui cpldrs cpldfs $(cpljava)
++SUBDIRS = libcext cplcore cplui cpldrs cpldfs $(cpljava)
+
+ HTML_SUBDIRS = libcext
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,9 @@
+ AC_ENABLE_STATIC(yes)
+ AC_ENABLE_SHARED(yes)
+
+-AC_LIBLTDL_CONVENIENCE
++LT_INIT
++LT_CONFIG_LTDL_DIR([libltdl])
++AC_LIB_LTDL
+ AC_PROG_LIBTOOL
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+@@ -112,7 +114,6 @@
+
+ ESO_FUNC_SYSCONF
+
+-AC_CONFIG_SUBDIRS(libltdl)
+ AC_CONFIG_SUBDIRS(libcext)
+
+ AC_CONFIG_FILES([Makefile
diff --git a/debian/patches/remove-wcs-versioninfo.patch b/debian/patches/remove-wcs-versioninfo.patch
new file mode 100644
index 0000000..cf5abc2
--- /dev/null
+++ b/debian/patches/remove-wcs-versioninfo.patch
@@ -0,0 +1,32 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Since wcslib does not provide a version string at runtime, CPL
+ included the WCSLIB version number at compile time. This is misleading when
+ the wcslib is updated afterwards. To omit confusion, this patch removes the
+ WCSLIB version number from the CPL version string.
+Forwarded: <mailto:cpl-help at eso.org>
+--- a/cplcore/cpl_init.c
++++ b/cplcore/cpl_init.c
+@@ -39,11 +39,6 @@
+ /* strcmp() */
+ #include <string.h>
+
+-#ifdef CPL_WCS_INSTALLED /* If WCS is installed */
+-/* Get WCSLIB version number */
+-#include <wcslib.h>
+-#endif /* End If WCS is installed */
+-
+ #include "cpl_memory_impl.h"
+ #include "cpl_error_impl.h"
+ #include "cpl_msg.h"
+@@ -265,11 +260,7 @@
+ only, or both */
+
+ #ifdef CPL_WCS_INSTALLED
+-#ifdef WCSLIB_VERSION
+-#define CPL_WCS_APPEND ", WCSLIB = " CPL_STRINGIFY(WCSLIB_VERSION)
+-#else
+ #define CPL_WCS_APPEND ", WCSLIB"
+-#endif
+ #else
+ #define CPL_WCS_APPEND " (WCSLIB unavailable)"
+ #endif
diff --git a/debian/patches/replace-exit-by-abort.patch b/debian/patches/replace-exit-by-abort.patch
new file mode 100644
index 0000000..785b9d7
--- /dev/null
+++ b/debian/patches/replace-exit-by-abort.patch
@@ -0,0 +1,18 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Replace calling exit() in cpl_test_init() by abort.
+ This should make lintian happy, but is also better behaviour when called
+ from an external program (strack traces etc.). The patch is agreed
+ upstream and will be there in the next version of CPL.
+Forwarded: <mailto:cpl-help at eso.org>
+Applied-Upstream: Yes
+--- a/cplcore/cpl_test.c
++++ b/cplcore/cpl_test.c
+@@ -442,7 +442,7 @@
+ if (cpl_error_get_code() != CPL_ERROR_NONE) {
+ cpl_errorstate_dump_one(1, 1, 1); /* Dump the most recent error */
+ assert(cpl_error_get_code() == CPL_ERROR_NONE);
+- exit(EXIT_FAILURE); /* exit also on -DNDEBUG */
++ abort();
+ }
+
+ #ifdef OFF_T
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..05e99aa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+disable-stat-tests.patch
+replace-exit-by-abort.patch
+remove-wcs-versioninfo.patch
+remove-cfitsio-version-check.patch
+use-std-paths-for-libs.patch
+remove-private-ltdl.patch
+build-cpljava.patch
diff --git a/debian/patches/use-std-paths-for-libs.patch b/debian/patches/use-std-paths-for-libs.patch
new file mode 100644
index 0000000..e61a240
--- /dev/null
+++ b/debian/patches/use-std-paths-for-libs.patch
@@ -0,0 +1,306 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Check cfitsio, wcs, and fftw in the standard paths if
+ they are not mentioned as configure packages. For wcslib, also the
+ #include wcslib.h directives were changed so that the software can be
+ compiled without additional -I flags of the compiler if wcslib is
+ installed in the standard directory.
+--- a/m4/cpl.m4
++++ b/m4/cpl.m4
+@@ -3,11 +3,9 @@
+ # Checks for the cfitsio library and header files.
+ AC_DEFUN([CPL_CHECK_CFITSIO],
+ [
+- AC_MSG_CHECKING([for cfitsio])
+-
+ cpl_cfitsio_check_header="fitsio.h"
+ # FIXME: Check first for the dynamic library...
+- cpl_cfitsio_check_lib="libcfitsio.a"
++ cpl_cfitsio_check_lib="libcfitsio.so"
+
+ cpl_cfitsio_dir=""
+ cpl_cfitsio_incdirs=""
+@@ -29,56 +27,65 @@
+
+ # Check for the cfitsio includes, either in include/, include/cfitsio/
+ # or include/libcfitsio0/
+- cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include"
+- ESO_FIND_FILE($cpl_cfitsio_check_header, $cpl_cfitsio_incdirs, cpl_cfitsio_includes)
+- if test x"$cpl_cfitsio_includes" = xno; then
+- # include/cfitsio/ is seen on a 64-bit Fedora 10
+- cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include/cfitsio"
++ if test -n "$cpl_cfitsio_dir" ; then
++ AC_MSG_CHECKING([for cfitsio in $cpl_cfitsio_dir])
++ cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include"
+ ESO_FIND_FILE($cpl_cfitsio_check_header, $cpl_cfitsio_incdirs, cpl_cfitsio_includes)
+ if test x"$cpl_cfitsio_includes" = xno; then
+- # include/libcfitsio0/ is seen on a 64-bit Suse
+- cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include/libcfitsio0"
++ # include/cfitsio/ is seen on a 64-bit Fedora 10
++ cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include/cfitsio"
+ ESO_FIND_FILE($cpl_cfitsio_check_header, $cpl_cfitsio_incdirs, cpl_cfitsio_includes)
++ if test x"$cpl_cfitsio_includes" = xno; then
++ # include/libcfitsio0/ is seen on a 64-bit Suse
++ cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include/libcfitsio0"
++ ESO_FIND_FILE($cpl_cfitsio_check_header, $cpl_cfitsio_incdirs, cpl_cfitsio_includes)
++ fi
+ fi
+- fi
+
+- # Check for the cfitsio library, either in lib64/, lib32/ or lib/
+- cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib64"
+- ESO_FIND_FILE($cpl_cfitsio_check_lib, $cpl_cfitsio_libdirs, cpl_cfitsio_libraries)
+-
+- if test x"$cpl_cfitsio_libraries" = xno; then
+- cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib32"
++ # Check for the cfitsio library, either in lib64/, lib32/ or lib/
++ cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib64"
+ ESO_FIND_FILE($cpl_cfitsio_check_lib, $cpl_cfitsio_libdirs, cpl_cfitsio_libraries)
++
+ if test x"$cpl_cfitsio_libraries" = xno; then
+- cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib"
++ cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib32"
+ ESO_FIND_FILE($cpl_cfitsio_check_lib, $cpl_cfitsio_libdirs, cpl_cfitsio_libraries)
++ if test x"$cpl_cfitsio_libraries" = xno; then
++ cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib"
++ ESO_FIND_FILE($cpl_cfitsio_check_lib, $cpl_cfitsio_libdirs, cpl_cfitsio_libraries)
++ fi
+ fi
+- fi
+
+- if test x"$cpl_cfitsio_includes" = xno || test x"$cpl_cfitsio_libraries" = xno; then
+- AC_MSG_ERROR([cfitsio was not found on your system. Please check!])
+- else
+- AC_MSG_RESULT([libraries $cpl_cfitsio_libraries, headers $cpl_cfitsio_includes])
+- # Attempt to check the version via CFITSIO_VERSION in the include file
+- cpl_cfitsio_check_vers=`perl -nle 's/^#\s*define\s+CFITSIO_VERSION\s+\b// and s/\s.*//, print' $cpl_cfitsio_includes/fitsio.h`
+- if test -z "$cpl_cfitsio_check_vers" ; then
+- # Attempt to check the version by checking the include files
+- cpl_cfitsio_check_vers=`grep "Version Info: This file is distributed with version 2.510 of CFITSIO" $cpl_cfitsio_includes/fitsio.h`
++ if test x"$cpl_cfitsio_includes" = xno || test x"$cpl_cfitsio_libraries" = xno; then
++ AC_MSG_ERROR([cfitsio was not found on your system. Please check!])
++ else
++ AC_MSG_RESULT([libraries $cpl_cfitsio_libraries, headers $cpl_cfitsio_includes])
++ # Attempt to check the version via CFITSIO_VERSION in the include file
++ cpl_cfitsio_check_vers=`perl -nle 's/^#\s*define\s+CFITSIO_VERSION\s+\b// and s/\s.*//, print' $cpl_cfitsio_inclu
++des/fitsio.h`
+ if test -z "$cpl_cfitsio_check_vers" ; then
+- AC_MSG_WARN([cfitsio version seems to be different from 2.510 and less than 3.X.])
+- else
+- AC_MSG_WARN([cfitsio version seems to be 2.510])
++ # Attempt to check the version by checking the include files
++ cpl_cfitsio_check_vers=`grep "Version Info: This file is distributed with version 2.510 of CFITSIO" $cpl_cfitsio
++_includes/fitsio.h`
++ if test -z "$cpl_cfitsio_check_vers" ; then
++ AC_MSG_WARN([cfitsio version seems to be different from 2.510 and less than 3.X.])
++ else
++ AC_MSG_WARN([cfitsio version seems to be 2.510])
++ fi
++ else
++ CFLAGS="-D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 $CFLAGS"
+ fi
+- else
+- CFLAGS="-D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 $CFLAGS"
+- fi
++ fi
++
++ # Set up the symbols
++ CFITSIO_INCLUDES="-I$cpl_cfitsio_includes"
++ CFITSIO_LDFLAGS="-L$cpl_cfitsio_libraries"
++ else
++ AC_CHECK_HEADERS($cpl_cfitsio_check_header,,AC_MSG_ERROR([fitsio.h was not found on your system. Please check!]))
++ AC_SEARCH_LIBS([fits_get_cwd], [cfitsio],,AC_MSG_ERROR([libcfitsio was not found on your system. Please check!]),)
++ CFLAGS="-D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 $CFLAGS"
+ fi
+
+- # Set up the symbols
+- CFITSIO_INCLUDES="-I$cpl_cfitsio_includes"
+- CFITSIO_LDFLAGS="-L$cpl_cfitsio_libraries"
+ LIBCFITSIO="-lcfitsio"
+-
+ AC_SUBST(CFITSIO_INCLUDES)
+ AC_SUBST(CFITSIO_LDFLAGS)
+ AC_SUBST(LIBCFITSIO)
+@@ -105,48 +112,63 @@
+ cpl_with_wcs_libs=$withval/lib
+ ])
+
+- # Check for the wcs includes
+ if test -z "$cpl_with_wcs_includes"; then
+ test -n "$WCSDIR" && cpl_wcs_incdirs="$WCSDIR/include"
+ else
+ cpl_wcs_incdirs="$cpl_with_wcs_includes"
+ fi
+- ESO_FIND_FILE($cpl_wcs_check_header, $cpl_wcs_incdirs, cpl_wcs_includes)
+
+- # Check for the wcs library
+ if test -z "$cpl_with_wcs_libs"; then
+ test -n "$WCSDIR" && cpl_wcs_libdirs="$WCSDIR/lib"
+ else
+ cpl_wcs_libdirs="$cpl_with_wcs_libs"
+ fi
+- ESO_FIND_FILE($cpl_wcs_check_lib, $cpl_wcs_libdirs, cpl_wcs_libraries)
++
++ if test -n "$cpl_with_wcs_includes"; then
++ # Check for the wcs includes
++ ESO_FIND_FILE($cpl_wcs_check_header, $cpl_wcs_incdirs, cpl_wcs_includes)
++ else
++ AC_CHECK_HEADERS($cpl_wcs_check_header,,cpl_wcs_includes="no")
++ fi
++
++ # Check for the wcs library
++ if test -n "$cpl_with_wcs_libs"; then
++ ESO_FIND_FILE($cpl_wcs_check_lib, $cpl_wcs_libdirs, cpl_wcs_libraries)
++ else
++ AC_SEARCH_LIBS([wcsini], [wcs],,cpl_wcs_libraries="no",)
++ fi
+
+ if test x"$cpl_wcs_includes" = xno || test x"$cpl_wcs_libraries" = xno; then
+ AC_MSG_WARN([wcs was not found on your system.])
+ else
+ AC_MSG_RESULT([libraries $cpl_wcs_libraries, headers $cpl_wcs_includes])
+- # Attempt to check the version by checking the include files
+- cpl_wcs_check_vers43=`grep "WCSLIB 4.3 - an implementation of the FITS WCS standard" $cpl_wcs_includes/wcslib/wcslib.h`
+- if test -z "$cpl_wcs_check_vers43" ; then
+- cpl_wcs_check_vers44=`grep "WCSLIB 4.4 - an implementation of the FITS WCS standard" $cpl_wcs_includes/wcslib/wcslib.h`
+- if test -z "$cpl_wcs_check_vers44" ; then
+- AC_MSG_WARN([wcs version seems to be older than 4.3])
+- fi
++ if test -n "$cpl_wcs_includes" ; then
++ # Attempt to check the version by checking the include files
++ cpl_wcs_check_vers43=`grep "WCSLIB 4.3 - an implementation of the FITS WCS standard" $cpl_wcs_includes/wcslib/wcslib.h`
++ if test -z "$cpl_wcs_check_vers43" ; then
++ cpl_wcs_check_vers44=`grep "WCSLIB 4.4 - an implementation of the FITS WCS standard" $cpl_wcs_includes/wcslib/wcslib.h`
++ if test -z "$cpl_wcs_check_vers44" ; then
++ AC_MSG_WARN([wcs version seems to be older than 4.3])
++ fi
++ fi
+ fi
+ AC_DEFINE_UNQUOTED(CPL_WCS_INSTALLED, 1, [Defined if WCS is available])
+ # Set up the symbols
+- WCS_INCLUDES="-I$cpl_wcs_includes/wcslib"
+- WCS_LDFLAGS="-L$cpl_wcs_libraries"
++ if test -n "$cpl_wcs_includes" ; then
++ WCS_INCLUDES="-I$cpl_wcs_includes"
++ fi
++ if test -n "$cpl_wcs_libraries" ; then
++ WCS_LDFLAGS="-L$cpl_wcs_libraries"
++ fi
+ LIBWCS="-lwcs"
+
+ AC_SUBST(WCS_INCLUDES)
+ AC_SUBST(WCS_LDFLAGS)
+ AC_SUBST(LIBWCS)
+ fi
+-
+ ])
+
+-# CPL_CHECK_WCS
++# CPL_CHECK_FFTW
+ #--------------
+ # Checks for the wcs library and header files.
+ AC_DEFUN([CPL_CHECK_FFTW],
+@@ -171,23 +195,34 @@
+ cpl_with_fftw_libs=$withval/lib
+ ])
+
+- # Check for the fftw includes
+ if test -z "$cpl_with_fftw_includes"; then
+ test -n "$FFTWDIR" && cpl_fftw_incdirs="$FFTWDIR/include"
+ else
+ cpl_fftw_incdirs="$cpl_with_fftw_includes"
+ fi
+- ESO_FIND_FILE($cpl_fftw_check_header, $cpl_fftw_incdirs, cpl_fftw_includes)
+- ESO_FIND_FILE($cpl_fftwf_check_header, $cpl_fftw_incdirs, cpl_fftwf_includes)
+-
+- # Check for the fftw library
+ if test -z "$cpl_with_fftw_libs"; then
+ test -n "$FFTWDIR" && cpl_fftw_libdirs="$FFTWDIR/lib"
+ else
+ cpl_fftw_libdirs="$cpl_with_fftw_libs"
+ fi
+- ESO_FIND_FILE($cpl_fftw_check_lib, $cpl_fftw_libdirs, cpl_fftw_libraries)
+- ESO_FIND_FILE($cpl_fftwf_check_lib, $cpl_fftw_libdirs, cpl_fftwf_libraries)
++
++ # Check for the fftw includes
++ if test -n "$cpl_fftw_incdirs"; then
++ ESO_FIND_FILE($cpl_fftw_check_header, $cpl_fftw_incdirs, cpl_fftw_includes)
++ ESO_FIND_FILE($cpl_fftwf_check_header, $cpl_fftw_incdirs, cpl_fftwf_includes)
++ else
++ AC_CHECK_HEADERS($cpl_fftw_check_header,,cpl_fftw_includes="no")
++ AC_CHECK_HEADERS($cpl_fftwf_check_header,,cpl_fftwf_includes="no")
++ fi
++
++ # Check for the fftw library
++ if test -n "$cpl_fftw_libdirs"; then
++ ESO_FIND_FILE($cpl_fftw_check_lib, $cpl_fftw_libdirs, cpl_fftw_libraries)
++ ESO_FIND_FILE($cpl_fftwf_check_lib, $cpl_fftw_libdirs, cpl_fftwf_libraries)
++ else
++ AC_SEARCH_LIBS([fftw_version], [fftw3],,cpl_fftw_libraries="no",)
++ AC_SEARCH_LIBS([fftwf_version], [fftw3f],,cpl_fftwf_libraries="no",)
++ fi
+
+ if test x"$cpl_fftw_includes" = xno || test x"$cpl_fftw_libraries" = xno; then
+ AC_MSG_WARN([fftw (normal-precision) was not found on your system.])
+@@ -197,8 +232,12 @@
+
+ AC_DEFINE_UNQUOTED(CPL_FFTW_INSTALLED, 1, [Defined if FFTW (normal-precision) is available])
+ # Set up the symbols
+- FFTW_INCLUDES="-I$cpl_fftw_includes"
+- FFTW_LDFLAGS="-L$cpl_fftw_libraries"
++ if test -n "$cpl_fftw_includes"; then
++ FFTW_INCLUDES="-I$cpl_fftw_includes"
++ fi
++ if test -n "$cpl_fftw_libraries"; then
++ FFTW_LDFLAGS="-L$cpl_fftw_libraries"
++ fi
+ LIBFFTW="-lfftw3"
+
+ AC_SUBST(FFTW_INCLUDES)
+@@ -214,8 +253,12 @@
+
+ AC_DEFINE_UNQUOTED(CPL_FFTWF_INSTALLED, 1, [Defined if FFTW (single-precision) is available])
+ # Set up the symbols
+- FFTWF_INCLUDES="-I$cpl_fftwf_includes"
+- FFTWF_LDFLAGS="-L$cpl_fftwf_libraries"
++ if test -n "$cpl_fftwf_includes"; then
++ FFTWF_INCLUDES="-I$cpl_fftwf_includes"
++ fi
++ if test -n "$cpl_fftwf_libraries"; then
++ FFTWF_LDFLAGS="-L$cpl_fftwf_libraries"
++ fi
+ LIBFFTWF="-lfftw3f"
+
+ AC_SUBST(FFTWF_INCLUDES)
+--- a/cplcore/cpl_test.c
++++ b/cplcore/cpl_test.c
+@@ -66,7 +66,7 @@
+
+ #if defined CPL_WCS_INSTALLED && CPL_WCS_INSTALLED == 1
+ /* Used for WCSLIB_VERSION */
+-#include <wcslib.h>
++#include <wcslib/wcslib.h>
+ #endif
+
+ #include "cpl_init.h"
+--- a/cpldrs/cpl_wcs.c
++++ b/cpldrs/cpl_wcs.c
+@@ -48,7 +48,7 @@
+ #include "cpl_wcs.h"
+
+ #ifdef CPL_WCS_INSTALLED /* If WCS is installed */
+-#include <wcslib.h>
++#include <wcslib/wcslib.h>
+ #endif /* End If WCS is installed */
+
+ /* Remove this when cfitsio is upgraded */
+--- a/cpldrs/tests/cpl_wcs-test.c
++++ b/cpldrs/tests/cpl_wcs-test.c
+@@ -47,7 +47,7 @@
+
+ #ifdef CPL_WCS_INSTALLED
+ /* Needed for cpl_error_set_wcs() */
+-#include <wcslib.h>
++#include <wcslib/wcslib.h>
+ #endif
+
+ #define NSK 2
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..64c0d54
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# 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
+
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-maintainer-mode --with-java=/usr/lib/jvm/java-6-openjdk
+
+override_dh_auto_build:
+ dh_auto_build -- all html
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..f7b9831
--- /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/cpl-(.*)\.tar\.gz debian uupdate
+
--
ESO library for automated astronomical data-reduction
More information about the debian-science-commits
mailing list