[SCM] ESO library for automated astronomical data-reduction branch, debian, updated. upstream/5.3.1-65-g9352b7e
Ole Streicher
debian at liska.ath.cx
Wed Apr 3 10:30:57 UTC 2013
The following commit has been merged in the debian branch:
commit 9352b7e027a40030ec23d21e7daaab675c2fe0c9
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Mar 18 15:21:56 2013 +0100
Updates for version 6.3
diff --git a/debian/changelog b/debian/changelog
index 7dcd3cb..7320500 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl (6.3-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 19 Mar 2013 14:55:21 +0100
+
cpl (6.2-1~exp2) experimental; urgency=low
* Correct required version of cfitsio. Closes: #696488
diff --git a/debian/control b/debian/control
index 01c2a6a..6c14239 100644
--- a/debian/control
+++ b/debian/control
@@ -7,15 +7,15 @@ Build-Depends: debhelper (>= 9),
default-jdk,
dh-autoreconf,
doxygen,
- libcfitsio3-dev (>= 3.270),
+ libcfitsio3-dev (>= 3.310),
libfftw3-dev (>= 3.1.2),
libltdl-dev,
texlive-fonts-recommended,
wcslib-dev (>= 4.4.4)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.eso.org/sci/software/cpl/
-Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl.git
Package: libcpl-dev
Section: libdevel
diff --git a/debian/patches/build-cpljava.patch b/debian/patches/build-cpljava.patch
index e56601d..c00efbe 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
-@@ -622,7 +622,6 @@
+@@ -615,7 +615,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],
-@@ -636,7 +635,7 @@
+@@ -629,7 +628,7 @@
cpl_gasgano_support="no"
AC_MSG_RESULT([no])
else
@@ -23,9 +23,9 @@ Description: Allow building that JNI interface without having Gasgano
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)
+@@ -32,26 +32,10 @@
+ AM_CPPFLAGS = $(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 \
@@ -66,5 +66,5 @@ Description: Allow building that JNI interface without having Gasgano
#endif
+#endif
-
- /*
+ #ifdef _OPENMP
+ #include <omp.h>
diff --git a/debian/patches/disable_some_tests.patch b/debian/patches/disable_some_tests.patch
index 3d225bb..40ec9da 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
-@@ -123,7 +123,6 @@
+@@ -122,7 +122,6 @@
cpl_imagelist_io-test \
cpl_imagelist_basic-test \
cpl_io_fits-test \
diff --git a/debian/patches/fix_required_versions.patch b/debian/patches/fix_required_versions.patch
new file mode 100644
index 0000000..9975cde
--- /dev/null
+++ b/debian/patches/fix_required_versions.patch
@@ -0,0 +1,17 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Lower the required versions for WCS and FFTW.
+ Although not supported by ESO, the lower version should work (however,
+ this is not well-tested).
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,8 +78,8 @@
+
+ CPL_CONFIG_CEXT
+ CPL_CONFIG_CFITSIO([3.310])
+-CPL_CHECK_WCS([4.16])
+-CPL_CHECK_FFTW([3.3.3])
++CPL_CHECK_WCS([4.4.4])
++CPL_CHECK_FFTW([3.1.2])
+
+ # Checks for header files.
+ AC_HEADER_STDC
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/remove-private-ltdl.patch
index 3e5a04b..bc9d0fa 100644
--- a/debian/patches/remove-private-ltdl.patch
+++ b/debian/patches/remove-private-ltdl.patch
@@ -13,11 +13,11 @@ Subject: Remove private library libltdl and use the installed one.
-SUBDIRS = $(libltdl) $(libcext) cplcore cplui cpldrs cpldfs $(cpljava)
+SUBDIRS = $(libcext) cplcore cplui cpldrs cpldfs $(cpljava)
- HTML_SUBDIRS =
+ DOXYGEN_SUBDIRS =
--- a/configure.ac
+++ b/configure.ac
-@@ -59,7 +59,9 @@
+@@ -58,7 +58,9 @@
AC_ENABLE_STATIC(yes)
AC_ENABLE_SHARED(yes)
diff --git a/debian/patches/series b/debian/patches/series
index b4da3f9..8e63901 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ build-cpljava.patch
loose_cplfit_test.patch
disable_some_tests.patch
no_compiletime_cpucheck.patch
+fix_required_versions.patch
diff --git a/debian/patches/use-std-paths-for-libs.patch b/debian/patches/use-std-paths-for-libs.patch
index 44bba32..4712db2 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 @@
+@@ -9,7 +9,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 @@
+@@ -110,6 +110,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 @@
+@@ -492,6 +493,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 @@
+@@ -604,7 +606,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 @@
+@@ -678,6 +680,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 @@
+@@ -836,8 +839,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 @@
+@@ -912,6 +915,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 @@
+@@ -1250,7 +1254,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 @@
+@@ -1327,6 +1331,7 @@
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
@@ -116,4 +116,4 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
+#include <wcslib/wcslib.h>
#endif
- #define NSK 2
+ #define TESTFILE "nonaxis.fits"
diff --git a/debian/rules b/debian/rules
index 9b2d1a0..acfbe51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@
override_dh_auto_configure:
dh_auto_configure -- --enable-maintainer-mode --with-java=/usr/lib/jvm/default-java --with-java-includes-md=/usr/lib/jvm/default-java/include/linux
+#override_dh_auto_test:
+
override_dh_auto_build:
dh_auto_build -- all html
diff --git a/debian/watch b/debian/watch
index 1c69a18..57ffead 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-# format version number, currently 3; this line is compulsory!
version=3
-http://www.eso.org/sci/software/cpl/download.html .*/cpl-(.*)\.tar\.gz debian uupdate
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
+http://www.eso.org/sci/software/cpl/download.html .*/cpl-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian uupdate
--
ESO library for automated astronomical data-reduction
More information about the debian-science-commits
mailing list