[normaliz] 04/04: Imported Debian patch 3.5.0+ds-1

[Jerome Benoit]

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

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

commit 0bf9710e792254c1895e88d87197d222707b8134
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Thu Dec 21 22:56:48 2017 +0400

    Imported Debian patch 3.5.0+ds-1
---
 debian/README.Debian                               |  7 +++++++
 debian/changelog                                   | 13 +++++++++++--
 debian/control                                     |  4 ++--
 debian/patches/series                              |  1 -
 ...test-extremely_sensitive_tests-neutralize.patch | 22 ----------------------
 debian/rules                                       |  2 +-
 6 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..7b5d0f4
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,7 @@
+Normaliz for Debian GNU/Linux
+==============================
+
+The Nomaliz program and library are built against flint (as recommended by
+the upstream team) and with OpenMP support (where applicable).
+
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 21 Dec 2017 18:55:25 +0000
diff --git a/debian/changelog b/debian/changelog
index df1d253..15d0535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,20 @@
-normaliz (3.5.0+ds-0) UNRELEASED; urgency=medium
+normaliz (3.5.0+ds-1) unstable; urgency=medium
 
   * New upstream minor version.
   * Debianization:
     - debian/copyright:
       - Files-Excluded field, refresh.
+    - debian/control:
+      - Standards Version, bump to 4.1.2 (no change);
+      - Build-Depends field, add libflint-dev;
+    - debian/patches/*:
+      - d/p/upstream-test-extremely_sensitive_tests-neutralize.patch,
+        integrated;
+    - debian/rules:
+      - autotool chain, build against flint.
+    - debian/README.Debian, introduce.
 
- -- Jerome Benoit <calculus at rezozer.net>  Thu, 21 Dec 2017 18:40:42 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 21 Dec 2017 18:55:49 +0000
 
 normaliz (3.4.1+ds-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 41f595d..53174a3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
  debhelper (>= 10), autoconf-archive,
  help2man,
- libgmp-dev, libboost-dev
-Standards-Version: 4.1.1
+ libgmp-dev, libflint-dev, libboost-dev
+Standards-Version: 4.1.2
 Homepage: https://www.normaliz.uni-osnabrueck.de/
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/normaliz.git
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/normaliz.git
diff --git a/debian/patches/series b/debian/patches/series
index 99503ad..bda6985 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-upstream-test-extremely_sensitive_tests-neutralize.patch
 debianization.patch
diff --git a/debian/patches/upstream-test-extremely_sensitive_tests-neutralize.patch b/debian/patches/upstream-test-extremely_sensitive_tests-neutralize.patch
deleted file mode 100644
index eaeb37d..0000000
--- a/debian/patches/upstream-test-extremely_sensitive_tests-neutralize.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: upstream: tests: ignore extremely sensitive tests
- Ignore an extremely sensitive test [1] that fails on arm64, ppc64el,
- s390x, powerpc and ppc64 architectures at the time of writing.
- [1] https://github.com/Normaliz/Normaliz/issues/161
-Origin: vendor, Debian
-Forwarded: https://github.com/Normaliz/Normaliz/pull/162
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-11-17
-
---- a/test/Makefile.classic
-+++ b/test/Makefile.classic
-@@ -51,6 +51,10 @@
- %.diff: %.out %.ref
- 	$(DIFF) $*.ref $*.out > $*.diff
- 
-+#ignore comparison for some extremely sensitive tests
-+test-/5x5PF.diff: test-/5x5PF.out test-/5x5PF.ref
-+	-$(DIFF) test-/5x5PF.ref test-/5x5PF.out > test-/5x5PF.diff
-+
- #rules to generate the test files
- test-s/%.out: $(NORMALIZ) test-s/%.in
- 	$(NICE) $(NORMALIZ) $(NORMPARA) -s test-s/$*
diff --git a/debian/rules b/debian/rules
index b9954d4..23e16ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ default:
 	dh $@ --builddirectory=_build
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-openmp=$(DEB_PKG_NMZ_OPENMP)
+	dh_auto_configure -- --enable-openmp=$(DEB_PKG_NMZ_OPENMP) --enable-flint
 
 override_dh_auto_build-indep:
 

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