[SCM] Execution Tool for European Southern Observatory pipelines branch, debian, updated. upstream/3.9.0-37-g1416e51
Ole Streicher
debian at liska.ath.cx
Wed Apr 3 10:38:36 UTC 2013
The following commit has been merged in the debian branch:
commit 1416e51c241e2f1ba94af9ce908db880516d70df
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Mar 18 15:49:01 2013 +0100
Updates for version 3.10
diff --git a/debian/changelog b/debian/changelog
index e9d9428..3286bac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+esorex (3.10-1~exp1) UNRELEASED; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 18 Mar 2013 15:47:29 +0100
+
esorex (3.9.6-1) unstable; urgency=low
* New upstream version
diff --git a/debian/clean b/debian/clean
index c037c51..72f8624 100644
--- a/debian/clean
+++ b/debian/clean
@@ -72,5 +72,6 @@ m4macros/lt~obsolete.m4
src/Makefile.in
src/esorex.man
src/tests/Makefile.in
+src/tests/esorex_json-test.log
tests/Makefile.in
src/esorex.log
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 028c4f9..5328451 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,17 @@ Section: science
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: debhelper (>= 9),
dh-autoreconf,
help2man,
libcfitsio3-dev,
libcpl-dev (>= 6),
libltdl-dev,
wcslib-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.eso.org/sci/software/cpl/esorex.html
-Vcs-Git: git://git.debian.org/git/debian-science/packages/esorex.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/esorex.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/esorex.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/esorex.git
Package: esorex
Architecture: any
diff --git a/debian/esorex.lintian-overrides b/debian/esorex.lintian-overrides
deleted file mode 100644
index 1b643d0..0000000
--- a/debian/esorex.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Don't complain about empty directories needed to avoid runtime warnings
-package-contains-empty-directory usr/lib/cpl/plugins
diff --git a/debian/patches/cpl60_compat.patch b/debian/patches/cpl60_compat.patch
new file mode 100644
index 0000000..1203f78
--- /dev/null
+++ b/debian/patches/cpl60_compat.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Subject: Remove function that is only in cpl >= 6.3 to establish compability
+ with older (stable) versions and allow backporting.
+--- a/src/er_main.c
++++ b/src/er_main.c
+@@ -641,7 +641,6 @@
+
+ cpl_msg_set_domain (PACKAGE);
+ cpl_msg_set_time_off ();
+-cpl_msg_set_threadid_off ();
+ cpl_msg_set_domain_on ();
+ cpl_msg_set_component_off ();
+
diff --git a/debian/patches/fix-autotools.patch b/debian/patches/fix-autotools.patch
index cf7478e..44919f5 100644
--- a/debian/patches/fix-autotools.patch
+++ b/debian/patches/fix-autotools.patch
@@ -1,13 +1,5 @@
Author: Ole Streicher <debian at liska.ath.cx>
Subject: Fix autotools files to allow the current version.
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -59,4 +59,4 @@
-
- uninstall-local: uninstall-html
-
--include $(top_srcdir)/admin/html.am
-+#include $(top_srcdir)/admin/html.am
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@
@@ -15,6 +7,6 @@ Subject: Fix autotools files to allow the current version.
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR([admin])
+AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
diff --git a/debian/patches/fix-spelling.patch b/debian/patches/fix-spelling.patch
deleted file mode 100644
index cddafd3..0000000
--- a/debian/patches/fix-spelling.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix small spelling error found by lintian
---- a/src/er_paf.c
-+++ b/src/er_paf.c
-@@ -335,7 +335,7 @@
- REG_EXTENDED|REG_NOSUB);
- if(regstatus)
- {
-- cpl_msg_error(er_func, "Bad formatted PRO CATG regular expresion");
-+ cpl_msg_error(er_func, "Bad formatted PRO CATG regular expression");
- cpl_error_set(er_func, CPL_ERROR_ILLEGAL_INPUT);
- cpl_msg_indent_less();
- regfree(&pattern);
diff --git a/debian/patches/fix_format_strings.patch b/debian/patches/fix_format_strings.patch
new file mode 100644
index 0000000..fe4d37b
--- /dev/null
+++ b/debian/patches/fix_format_strings.patch
@@ -0,0 +1,24 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix -Werror=format-security errors
+--- a/src/er_paramutils.c
++++ b/src/er_paramutils.c
+@@ -731,7 +731,7 @@
+ (void) strcat (tmp, " to ");
+ (void) strcat (tmp, er_strutils_dblstr (cpl_parameter_get_range_max_double (p)));
+ (void) strcat (tmp, ".\n");
+- cpl_msg_error (er_func, tmp);
++ cpl_msg_error (er_func, "%s", tmp);
+
+ cpl_free(tmp);
+ return -1;
+--- a/src/er_plugin.c
++++ b/src/er_plugin.c
+@@ -367,7 +367,7 @@
+ if (wer != 0)
+ {
+ (void) snprintf(estr,(size_t)238,"Expansion of %s failed...",xpath);
+- cpl_msg_error (er_func, estr);
++ cpl_msg_error (er_func, "%s", estr);
+ goto dealloc;
+ }
+ }
diff --git a/debian/patches/generate-manpage.patch b/debian/patches/generate-manpage.patch
index 884bd57..017eb2c 100644
--- a/debian/patches/generate-manpage.patch
+++ b/debian/patches/generate-manpage.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
Subject: Generate a manpage for esorex.
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -59,3 +59,7 @@
+@@ -62,3 +62,7 @@
include $(top_builddir)/Makefile.purify
endif
diff --git a/debian/patches/move-rcfile-to-etc.patch b/debian/patches/move-rcfile-to-etc.patch
deleted file mode 100644
index e69af62..0000000
--- a/debian/patches/move-rcfile-to-etc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: The configuration directory is /etc, independent of
- the prefix. This was set wrong in er_prefix.h and is corrected
- here.
---- a/src/er_prefix.h.in
-+++ b/src/er_prefix.h.in
-@@ -3,5 +3,5 @@
- MYDATA = @datadir@
- ESOREX_PREFIX=@prefix@
- */
--#define ESOREX_PREFIX "@prefix@/etc/"
-+#define ESOREX_PREFIX "@sysconfdir@"
-
diff --git a/debian/patches/remove-empty-configdir.patch b/debian/patches/remove-empty-configdir.patch
index fb5662a..d492173 100644
--- a/debian/patches/remove-empty-configdir.patch
+++ b/debian/patches/remove-empty-configdir.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Avoid creation of an empty directory "/usr/share/esorex/config"
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -49,8 +49,6 @@
+@@ -51,8 +51,6 @@
bin_PROGRAMS = esorex
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/remove-private-ltdl.patch
index 40b54ce..e675cdb 100644
--- a/debian/patches/remove-private-ltdl.patch
+++ b/debian/patches/remove-private-ltdl.patch
@@ -2,30 +2,21 @@ Author: Ole Streicher <debian at liska.ath.cx>
Subject: Remove private library libltdl and use the installed one.
--- a/Makefile.am
+++ b/Makefile.am
-@@ -24,9 +24,6 @@
-
- DISTCLEANFILES = *~
-
--
--COMPILE_FIRST = libltdl
--
- TOPSUBDIRS = src etc
-
- COMPILE_LAST = tests
-@@ -42,9 +39,7 @@
+@@ -37,10 +37,7 @@
if MAINTAINER_MODE
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log \
-- config.status configure stamp-h.in libltdl/config-h.in \
-- libltdl/aclocal.m4 libltdl/Makefile.in libltdl/configure \
-- libltdl/config.status libltdl/stamp-h.in libltdl/config.log
-+ config.status configure stamp-h.in
+ MAINTAINERCLEANFILES = $(top_srcdir)/Makefile.in $(top_srcdir)/aclocal.m4 \
+- $(top_srcdir)/config.h.in $(top_srcdir)/configure config.status config.log \
+- $(top_srcdir)/libltdl/Makefile.in $(top_srcdir)/libltdl/aclocal.m4 \
+- $(top_srcdir)/libltdl/config-h.in $(top_srcdir)/libltdl/configure \
+- libltdl/config.status libltdl/config.log
++ $(top_srcdir)/config.h.in $(top_srcdir)/configure config.status config.log
- clean-local: clean-html
+ clean-local: clean-doxygen
--- a/configure.ac
+++ b/configure.ac
-@@ -32,7 +32,9 @@ ESO_PROG_CC_FLAG([fno-builtin], [CFLAGS="$CFLAGS -fno-builtin"])
+@@ -30,7 +30,9 @@
ESO_CHECK_DOCTOOLS
@@ -36,7 +27,7 @@ Subject: Remove private library libltdl and use the installed one.
AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
-@@ -77,9 +79,6 @@ ESOREX_SET_PATHS
+@@ -76,9 +78,6 @@
# Determine the shared library suffix on this platform
AC_LTDL_SHLIBEXT
@@ -45,4 +36,4 @@ Subject: Remove private library libltdl and use the installed one.
-
AC_CONFIG_FILES(Makefile
Makefile.purify
- src/er_prefix.h
+ doxygen/Doxyfile
diff --git a/debian/patches/series b/debian/patches/series
index cec382a..c205af4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,7 @@
remove-private-ltdl.patch
fix-autotools.patch
generate-manpage.patch
-fix-spelling.patch
-move-rcfile-to-etc.patch
remove-empty-configdir.patch
set-default-plugin-path.patch
use-std-paths-for-libs.patch
+cpl60_compat.patch
diff --git a/debian/patches/set-default-plugin-path.patch b/debian/patches/set-default-plugin-path.patch
index 2dc6c86..481946a 100644
--- a/debian/patches/set-default-plugin-path.patch
+++ b/debian/patches/set-default-plugin-path.patch
@@ -7,7 +7,7 @@ Description: Set the default plugin path to the one where recipes are
# as well. Multiple directory heads may be specified, by separating the
# starting paths with colons (:). This option may also be set using the
# environment variable ESOREX_PLUGIN_DIR.
--esorex.caller.recipe-dir=@prefix@/lib/esopipes-plugins
+-esorex.caller.recipe-dir=@recipedir@/esopipes-plugins
+esorex.caller.recipe-dir=@exec_prefix@/lib/@build_alias@/cpl/plugins:@exec_prefix@/lib/cpl/plugins
# --suppress-link
diff --git a/debian/patches/use-std-paths-for-libs.patch b/debian/patches/use-std-paths-for-libs.patch
index ac236ca..c54b840 100644
--- a/debian/patches/use-std-paths-for-libs.patch
+++ b/debian/patches/use-std-paths-for-libs.patch
@@ -3,7 +3,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
they are not mentioned as configure packages.
--- a/m4/cpl.m4
+++ b/m4/cpl.m4
-@@ -8,7 +8,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
+@@ -9,7 +9,7 @@
cpl_cfitsio_check_version="$1"
cpl_cfitsio_check_header="fitsio.h"
@@ -12,7 +12,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],
+@@ -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"
@@ -20,7 +20,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],
+@@ -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"
@@ -28,7 +28,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],
+@@ -604,7 +606,7 @@
cpl_wcs_check_version="$1"
cpl_wcs_check_header="wcslib/wcslib.h"
@@ -37,7 +37,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],
+@@ -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"
@@ -45,7 +45,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],
+@@ -836,8 +839,8 @@
cpl_fftw_check_version="$1"
cpl_fftw_check_header="fftw3.h"
@@ -56,7 +56,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],
+@@ -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"
@@ -64,7 +64,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],
+@@ -1250,7 +1254,7 @@
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -73,7 +73,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],
+@@ -1327,6 +1331,7 @@
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
diff --git a/debian/watch b/debian/watch
index 8de3bdc..fdcfd69 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 .*/esorex-(.*)\.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 .*/esorex-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian uupdate
--
Execution Tool for European Southern Observatory pipelines
More information about the debian-science-commits
mailing list