[sollya] 01/01: Imported Debian patch 5.0+ds-2

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository sollya.

commit 6dc2676cd4d986128e5e0c4eee8acf0fc9f24398
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sat Jul 30 00:51:49 2016 +0100

    Imported Debian patch 5.0+ds-2
---
 debian/changelog                        |  6 +++++
 debian/patches/debianization-test.patch | 44 +++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f5e7dcc..313b8b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sollya (5.0+ds-2) unstable; urgency=medium
+
+  * FTBFS fix release (Closes: #832951), neutralize time based test.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Fri, 29 Jul 2016 23:50:31 +0000
+
 sollya (5.0+ds-1) unstable; urgency=medium
 
   * Initial release (Closes: #827509).
diff --git a/debian/patches/debianization-test.patch b/debian/patches/debianization-test.patch
index 5cdaa0f..3b52463 100644
--- a/debian/patches/debianization-test.patch
+++ b/debian/patches/debianization-test.patch
@@ -29,3 +29,47 @@ Last-Update: 2016-06-25
  	@echo "Building "$@
  	@echo "#!/bin/sh" > $@
  	@echo "SOLLYA="$(top_builddir)"/sollya" >> $@
+--- a/tests-lib/Makefile.am
++++ b/tests-lib/Makefile.am
+@@ -143,7 +143,6 @@
+ tget_diam.c \
+ tget_dieonerrormode.c \
+ tget_display.c \
+-tget_element_in_list.c \
+ tget_free_variable_name.c \
+ tget_function_arity.c \
+ tget_head_function.c \
+@@ -335,13 +334,16 @@
+ tv_remez.c \
+ tvoid.c
+ 
+-EXTRA_DIST = check.proto $(TESTFILES) $(TESTFILES:.c=.reference)
++XFAILTESTFILES = tget_element_in_list.c
++
++EXTRA_DIST = check.proto $(TESTFILES) $(TESTFILES:.c=.reference) $(XFAILTESTFILES) $(XFAILTESTFILES:.c=.reference)
+ 
+ check_PROGRAMS = force_compilation $(TESTFILES:.c=)
+ check_LIBRARIES = libraryexample.a # libraryexample.a will be a shared library actually,
+                                    # but we do not know how to explain it to automake.
+ 
+-TESTS= $(TESTFILES:.c=.sh)
++TESTS = $(TESTFILES:.c=.sh)
++XFAIL_TESTS = $(XFAILTESTFILES:.c=.sh)
+ 
+ LDADD = $(top_builddir)/libsollya.la -lstdc++
+ 
+@@ -355,12 +357,12 @@
+ 
+ .PHONY: force_compilation$(EXEEXT)
+ 
+-force_compilation_SOURCES=
++force_compilation_SOURCES =
+ 
+ force_compilation$(EXEEXT):
+ 	@echo "Recompiling sollya";cd $(top_builddir); $(MAKE) libsollya.la
+ 
+-$(TESTS): check.proto
++$(TESTS) $(XFAIL_TESTS): check.proto
+ 	@echo "Building "$@
+ 	@echo "#!/bin/sh" > $@
+ 	@echo "TESTFILES=\""$(@:.sh=)"\"" >> $@

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