[plplot] 01/04: Rediff patches

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository plplot.

commit 1f914cf6938ba53f533830f2c651be4731947822
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Sep 21 17:27:35 2017 +0200

    Rediff patches
    
    Added Disable-failing-ocaml-tests.patch: <REASON>
    Dropped Disable-failing-ocaml-test.patch: <REASON>
---
 ...ing-ocaml-test.patch => Disable-failing-ocaml-tests.patch} | 11 +++++++----
 debian/patches/series                                         |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/patches/Disable-failing-ocaml-test.patch b/debian/patches/Disable-failing-ocaml-tests.patch
similarity index 84%
rename from debian/patches/Disable-failing-ocaml-test.patch
rename to debian/patches/Disable-failing-ocaml-tests.patch
index 9527692..eef1a6d 100644
--- a/debian/patches/Disable-failing-ocaml-test.patch
+++ b/debian/patches/Disable-failing-ocaml-tests.patch
@@ -1,9 +1,12 @@
 From: Ole Streicher <olebole at debian.org>
 Date: Wed, 20 Sep 2017 09:25:33 +0200
-Subject: Disable failing ocaml test
+Subject: Disable failing ocaml tests
 
 x09ocaml gives a segfault on many platforms, including armhf, mips,
-ppc64el, s390x. Disabling the test
+ppc64el, s390x.
+
+x16ocaml segfaults on mips
+x22ocaml segfaults in armhf
 ---
  examples/ocaml/CMakeLists.txt       | 1 -
  examples/ocaml/Makefile.examples.in | 1 -
@@ -35,7 +38,7 @@ index 98d0f1a..217b6d2 100644
  		 x11ocaml$(EXEEXT) \
  		 x12ocaml$(EXEEXT) \
 diff --git a/plplot_test/test_ocaml.sh.in b/plplot_test/test_ocaml.sh.in
-index 84ba4b8..a4cecfd 100755
+index 84ba4b8..b4abf57 100755
 --- a/plplot_test/test_ocaml.sh.in
 +++ b/plplot_test/test_ocaml.sh.in
 @@ -24,7 +24,7 @@
@@ -43,7 +46,7 @@ index 84ba4b8..a4cecfd 100755
  # Do the standard non-interactive examples.
  lang="ocaml"
 -for index in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 24 25 26 27 28 30 31 33 ${critical_examples} ; do
-+for index in 00 01 02 03 04 05 06 07 08 10 11 12 13 15 16 18 19 20 21 22 23 24 25 26 27 28 30 31 33 ${critical_examples} ; do
++for index in 00 01 02 03 04 05 06 07 08 10 11 12 13 15 18 19 20 21 23 24 25 26 27 28 30 31 33 ${critical_examples} ; do
      if [ "$verbose_test" ] ; then
  	echo "x${index}ocaml"
      fi
diff --git a/debian/patches/series b/debian/patches/series
index 081ac41..539daea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ Proper-use-of-the-rmpath-function.patch
 Remove-nondfsg-dirs.patch
 Build-bindings-for-all-Python-versions.patch
 Disable-octave-UTF-8-tests.patch
-Disable-failing-ocaml-test.patch
+Disable-failing-ocaml-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git