[cpl] 03/03: Adjust patches and symbols file for new version
Ole Streicher
olebole at moszumanska.debian.org
Tue Feb 24 09:34:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository cpl.
commit 59707af62ae2c9863d149d0370242c0e8baa6a6f
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Feb 24 10:19:02 2015 +0100
Adjust patches and symbols file for new version
---
debian/changelog | 5 +--
debian/libcext0.symbols | 5 +++
debian/libcplcore20.symbols | 1 +
debian/patches/disable_some_tests.patch | 10 +++---
debian/patches/fix-ftbs-mips64el.patch | 55 ---------------------------------
debian/patches/hide_mpfit_symbol.patch | 13 --------
debian/patches/series | 2 --
7 files changed, 14 insertions(+), 77 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 79b009a..105ab0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-cpl (6.5.1-1~exp2) UNRELEASED; urgency=medium
+cpl (6.6~b-1) experimental; urgency=low
+ * New upstream beta version
* Remove timestamp macros from source for reproducibility
- -- Ole Streicher <olebole at debian.org> Wed, 18 Feb 2015 13:27:51 +0100
+ -- Ole Streicher <olebole at debian.org> Tue, 24 Feb 2015 09:28:53 +0100
cpl (6.5.1-1~exp1) experimental; urgency=low
diff --git a/debian/libcext0.symbols b/debian/libcext0.symbols
index e0202d0..ac5ad99 100644
--- a/debian/libcext0.symbols
+++ b/debian/libcext0.symbols
@@ -184,6 +184,8 @@ libcext.so.0 libcext0 #MINVER#
cx_string_empty at Base 5.3.1
cx_string_equal at Base 5.3.1
cx_string_erase at Base 5.3.1
+ cx_string_find_first_not_of at Base 6.6~
+ cx_string_find_last_not_of at Base 6.6~
cx_string_get at Base 5.3.1
cx_string_insert at Base 5.3.1
cx_string_lower at Base 5.3.1
@@ -191,11 +193,14 @@ libcext.so.0 libcext0 #MINVER#
cx_string_new at Base 5.3.1
cx_string_prepend at Base 5.3.1
cx_string_print at Base 5.3.1
+ cx_string_replace at Base 6.6~
+ cx_string_resize at Base 6.6~
cx_string_rtrim at Base 5.3.1
cx_string_set at Base 5.3.1
cx_string_size at Base 5.3.1
cx_string_sprintf at Base 5.3.1
cx_string_strip at Base 5.3.1
+ cx_string_substr at Base 6.6~
cx_string_trim at Base 5.3.1
cx_string_truncate at Base 5.3.1
cx_string_upper at Base 5.3.1
diff --git a/debian/libcplcore20.symbols b/debian/libcplcore20.symbols
index 7013cb8..8718f43 100644
--- a/debian/libcplcore20.symbols
+++ b/debian/libcplcore20.symbols
@@ -704,6 +704,7 @@ libcplcore.so.20 libcplcore20 #MINVER#
cpl_memory_dump at Base 6.0
cpl_memory_init at Base 6.0
cpl_memory_is_empty at Base 6.0
+ cpl_mpfit at Base 6.6~
cpl_msg_debug at Base 6.0
cpl_msg_error at Base 6.0
cpl_msg_get_domain at Base 6.0
diff --git a/debian/patches/disable_some_tests.patch b/debian/patches/disable_some_tests.patch
index 8eac600..b91af50 100644
--- a/debian/patches/disable_some_tests.patch
+++ b/debian/patches/disable_some_tests.patch
@@ -10,7 +10,7 @@ Description: Disable some tests to workaround FTBS on armel and s390x.
cause can be found here.
--- a/cplcore/tests/Makefile.am
+++ b/cplcore/tests/Makefile.am
-@@ -109,7 +109,6 @@
+@@ -111,7 +111,6 @@
TESTS = cpl_image_io-test \
@@ -18,7 +18,7 @@ Description: Disable some tests to workaround FTBS on armel and s390x.
cpl_image_iqe-test \
cpl_image_bpm-test \
cpl_image_resample-test \
-@@ -122,7 +121,6 @@
+@@ -124,7 +123,6 @@
cpl_imagelist_io-test \
cpl_imagelist_basic-test \
cpl_io_fits-test \
@@ -26,9 +26,9 @@ Description: Disable some tests to workaround FTBS on armel and s390x.
cpl_plot-test \
cpl_polynomial-test \
cpl_error-test \
-@@ -140,6 +138,10 @@
- cpl_property-test \
- cpl_propertylist-test
+@@ -143,6 +141,10 @@
+ cpl_propertylist-test \
+ cpl_median-test
+SKIP_TESTS = \
+ cpl_image_basic-test \
diff --git a/debian/patches/fix-ftbs-mips64el.patch b/debian/patches/fix-ftbs-mips64el.patch
deleted file mode 100644
index 1fd33f0..0000000
--- a/debian/patches/fix-ftbs-mips64el.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: Lars Kristian Lundin <llundin at eso.org>
-Description: Fix testing on mips64el
-Bug: #753089
-Url: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=753089#10
---- a/cplcore/tests/cpl_matrix-test.c
-+++ b/cplcore/tests/cpl_matrix-test.c
-@@ -200,6 +200,7 @@
- FILE * stream;
- const double * data;
- cpl_boolean do_bench;
-+ cpl_boolean did_fail;
- cpl_error_code code;
- const cpl_matrix * null; /* This one is expected to be NULL */
-
-@@ -1579,6 +1580,8 @@
- cpl_msg_info("", "Try to solve increasingly large systems A^TAx=A^Tb, "
- "with A(i,j) = 1/(2*n-(1+i+j)) and x(j) = 1");
-
-+ k = 0;
-+ did_fail = CPL_FALSE;
- for (size = 1; size < nreps * nelem; size++) {
- cpl_matrix * p2;
- double error, residual;
-@@ -1595,6 +1598,13 @@
- cpl_test_nonnull(product);
-
- xsolv = cpl_matrix_solve_normal(matrix, product);
-+ if (cpl_error_get_code()) {
-+ cpl_test_error(CPL_ERROR_SINGULAR_MATRIX);
-+ cpl_test_null(xsolv);
-+ did_fail = CPL_TRUE;
-+ cpl_matrix_delete(product);
-+ break;
-+ }
- cpl_test_nonnull(xsolv);
-
- x_min = cpl_matrix_get_min(xsolv);
-@@ -1631,7 +1641,17 @@
- "x_min=%g, x_max=%g", size, x_min, x_max);
- break;
- }
-+ k++;
-+ }
-
-+ if (did_fail) {
-+ /* Solving stopped prematurely. Normally, we should stop when the system
-+ is near-singular and so ill-conditioned that the solution has an
-+ element where not even the most significant bit is correct. For this
-+ final iteration we will allow the solver to alternatively fail (due a
-+ singular matrix).
-+ This should add support for Debian sbuild on mips64el */
-+ cpl_test_leq(6, k);
- }
-
- cpl_msg_info("", "Compute the determinant of increasingly large "
diff --git a/debian/patches/hide_mpfit_symbol.patch b/debian/patches/hide_mpfit_symbol.patch
deleted file mode 100644
index f839736..0000000
--- a/debian/patches/hide_mpfit_symbol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Prevent the mpfit symbol from being exported.
---- a/cplcore/cpl_mpfit.h
-+++ b/cplcore/cpl_mpfit.h
-@@ -170,7 +170,7 @@
- extern int mpfit(mp_func funct, int m, int npar,
- double *xall, mp_par *pars, mp_config *config,
- void *private_data,
-- mp_result *result);
-+ mp_result *result) CPL_INTERNAL;
-
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 1ad7748..d365b07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,4 @@ disable_some_tests.patch
no_compiletime_cpucheck.patch
fix_required_versions.patch
serial-tests
-fix-ftbs-mips64el.patch
-hide_mpfit_symbol.patch
reproducible_build.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl.git
More information about the debian-science-commits
mailing list