diff -Nru fflas-ffpack-2.2.2/debian/changelog fflas-ffpack-2.2.2/debian/changelog --- fflas-ffpack-2.2.2/debian/changelog 2017-01-08 18:22:58.000000000 +0000 +++ fflas-ffpack-2.2.2/debian/changelog 2017-07-11 11:12:49.000000000 +0000 @@ -1,3 +1,23 @@ +fflas-ffpack (2.2.2-5) unstable; urgency=medium + + * debian/control + - Bump Standards-Version to 4.0.0. + - Switch build dependency on texlive-math-extra to texlive-science + (Closes: #867086). + * debian/patches/add-include-functional-to-test-utils.h.patch + - New patch; fixes FTBFS with GCC 7 (Closes: #853399). + * debian/rules + - Remove -fno-strict-aliasing from CXXFLAGS; it ended up not helping + the armel build. + * debian/tests/upstream-tests + - Add new tests included in version 2.2.2. + - Simplify by using implicit make rules. + - Add allow-stderr to Restrictions. The tests output logs to stderr, + causing false positives. + - Don't redirect stdout to /dev/null; may provide useful information. + + -- Doug Torrance Tue, 11 Jul 2017 07:12:49 -0400 + fflas-ffpack (2.2.2-4) unstable; urgency=medium * debian/rules diff -Nru fflas-ffpack-2.2.2/debian/control fflas-ffpack-2.2.2/debian/control --- fflas-ffpack-2.2.2/debian/control 2016-11-11 17:33:19.000000000 +0000 +++ fflas-ffpack-2.2.2/debian/control 2017-07-11 11:12:49.000000000 +0000 @@ -12,8 +12,8 @@ libgmp-dev, liblapack-dev, pkg-config -Build-Depends-Indep: doxygen-latex, texlive-math-extra -Standards-Version: 3.9.8 +Build-Depends-Indep: doxygen-latex, texlive-science +Standards-Version: 4.0.0 Homepage: http://linbox-team.github.io/fflas-ffpack/ Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/fflas-ffpack.git Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/fflas-ffpack.git diff -Nru fflas-ffpack-2.2.2/debian/patches/add-include-functional-to-test-utils.h.patch fflas-ffpack-2.2.2/debian/patches/add-include-functional-to-test-utils.h.patch --- fflas-ffpack-2.2.2/debian/patches/add-include-functional-to-test-utils.h.patch 1970-01-01 00:00:00.000000000 +0000 +++ fflas-ffpack-2.2.2/debian/patches/add-include-functional-to-test-utils.h.patch 2017-07-11 11:12:49.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Add "#include " to test-utils.h. + Fixes build failure with GCC 7. +Origin: https://github.com/linbox-team/fflas-ffpack/commit/d57c3c8 +Bug-Debian: https://bugs.debian.org/853399 +Last-Update: 2017-07-11 + +--- a/tests/test-utils.h ++++ b/tests/test-utils.h +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + + namespace FFPACK { + diff -Nru fflas-ffpack-2.2.2/debian/patches/series fflas-ffpack-2.2.2/debian/patches/series --- fflas-ffpack-2.2.2/debian/patches/series 2017-01-07 20:54:09.000000000 +0000 +++ fflas-ffpack-2.2.2/debian/patches/series 2017-07-11 11:12:49.000000000 +0000 @@ -3,3 +3,4 @@ skip-test-ftrsm.patch fix_ftbfs_bigendian.patch do-not-fail-cp-INSTALL.patch +add-include-functional-to-test-utils.h.patch diff -Nru fflas-ffpack-2.2.2/debian/rules fflas-ffpack-2.2.2/debian/rules --- fflas-ffpack-2.2.2/debian/rules 2017-01-08 18:22:58.000000000 +0000 +++ fflas-ffpack-2.2.2/debian/rules 2017-07-11 11:12:49.000000000 +0000 @@ -3,10 +3,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# needed for armel build; inspired by -# http://pkgs.fedoraproject.org/cgit/rpms/fflas-ffpack.git/commit/?id=76a0a82 -export DEB_CXXFLAGS_MAINT_APPEND = -fno-strict-aliasing - override_dh_auto_configure: dh_auto_configure -- --prefix=/usr --with-all \ --with-blas-libs="-lblas -llapack" --disable-simd diff -Nru fflas-ffpack-2.2.2/debian/tests/control fflas-ffpack-2.2.2/debian/tests/control --- fflas-ffpack-2.2.2/debian/tests/control 2016-11-11 17:33:19.000000000 +0000 +++ fflas-ffpack-2.2.2/debian/tests/control 2017-07-11 11:12:49.000000000 +0000 @@ -1,3 +1,4 @@ Tests: upstream-tests Depends: build-essential,fflas-ffpack, libgmp-dev, libgivaro-dev, libblas-dev, liblapack-dev, pkg-config +Restrictions: allow-stderr diff -Nru fflas-ffpack-2.2.2/debian/tests/upstream-tests fflas-ffpack-2.2.2/debian/tests/upstream-tests --- fflas-ffpack-2.2.2/debian/tests/upstream-tests 2016-11-11 17:33:19.000000000 +0000 +++ fflas-ffpack-2.2.2/debian/tests/upstream-tests 2017-07-11 11:12:49.000000000 +0000 @@ -1,59 +1,58 @@ #!/usr/bin/make -f -CPPFLAGS = $(shell pkg-config fflas-ffpack --cflags) -std=gnu++11 \ +CPPFLAGS = $(shell pkg-config fflas-ffpack --cflags) \ -I/usr/include/fflas-ffpack/utils -LIBS = $(shell pkg-config fflas-ffpack --libs) +LDLIBS = $(shell pkg-config fflas-ffpack --libs) +CC = g++ +VPATH=tests TESTS = test-lu \ test-det \ test-echelon \ test-rankprofiles \ test-compressQ \ + test-permutations \ test-fadd \ test-finit \ test-fscal \ test-fgemm \ + test-pluq-check \ + test-fgemm-check \ + test-ftrsm-check \ + test-invert-check \ + test-charpoly-check \ test-fger \ - test-ftrsm \ - test-multifile \ + test-multifile1 \ + test-maxdelayeddim \ regression-check - -test-lu_SOURCES = tests/test-lu.C -test-det_SOURCES = tests/test-det.C -test-echelon_SOURCES = tests/test-echelon.C -test-rankprofiles_SOURCES = tests/test-rankprofiles.C -test-compressQ_SOURCES = tests/test-compressQ.C -test-fadd_SOURCES = tests/test-fadd.C -test-finit_SOURCES = tests/test-finit.C -test-fscal_SOURCES = tests/test-fscal.C -test-fgemm_SOURCES = tests/test-fgemm.C -test-fger_SOURCES = tests/test-fger.C -test-ftrsm_SOURCES = tests/test-ftrsm.C -test-multifile_SOURCES = tests/test-multifile1.C tests/test-multifile2.C -regression-check_SOURCES = tests/regression-check.C +# test-ftrsm - skipping for now +# (see https://github.com/linbox-team/fflas-ffpack/issues/29) all: $(TESTS) @PASS=0; \ FAIL=0; \ for TEST in $(TESTS); \ do \ - ./$$TEST > /dev/null ; \ + ./$$TEST; \ if [ $$? = 0 ]; \ then \ - echo "PASS: $$TEST"; \ - PASS=$$(($$PASS+1)); \ - else \ - echo "FAIL: $$TEST"; \ - FAIL=$$(($$FAIL+1)); \ - fi; \ + echo "PASS: $$TEST"; \ + PASS=$$(($$PASS+1)); \ + else \ + echo "FAIL: $$TEST"; \ + FAIL=$$(($$FAIL+1)); \ + fi; \ done; \ echo "========"; \ echo "Summary:"; \ echo "========"; \ echo "PASS: $$PASS"; \ echo "FAIL: $$FAIL"; \ - rm -f $(TESTS) fflas-fpack/config.h; \ + rm -f $(TESTS) *.o; \ exit $$FAIL -$(TESTS): - $(CXX) $(CPPFLAGS) $($@_SOURCES) $(LIBS) -o $@ +# we rename test-multifile -> testmultifile1 to take advantage of implicit rules +test-multifile1: test-multifile2.o + +clean: + rm -f $(TESTS) *.o