[singular] 01/01: Imported debian patch 4.0.2-p2+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 singular.

commit 8e20fc29eb924e8d6b4e8848ff4c07f449eaf86c
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Thu Nov 5 20:51:07 2015 +0100

    Imported debian patch 4.0.2-p2+ds-2
---
 debian/changelog                                   |  8 +++
 .../patches/debianization-rename-libraries.patch   |  2 +-
 .../debianization-rename-pkgconfig_files.patch     |  4 +-
 debian/patches/series                              |  1 +
 .../patches/upstream-tests-omalloc-getlucky.patch  | 59 ++++++++++++++++++++++
 debian/rules                                       |  6 ++-
 6 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 454a668..11eeeb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+singular (4.0.2-p2+ds-2) unstable; urgency=medium
+
+  * FTBFS fix, render deterministic an undeterministic check.
+  * Debianization:
+    - debian/rules, refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 05 Nov 2015 20:12:31 +0000
+
 singular (4.0.2-p2+ds-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/patches/debianization-rename-libraries.patch b/debian/patches/debianization-rename-libraries.patch
index 0d73f9d..56bffa8 100644
--- a/debian/patches/debianization-rename-libraries.patch
+++ b/debian/patches/debianization-rename-libraries.patch
@@ -52,7 +52,7 @@ Last-Update: 2015-10-15
  
  BUILT_SOURCES = omTables.inc omTables.h
  
-@@ -72,10 +72,10 @@
+@@ -74,10 +74,10 @@
  
  omtTest_m_CPPFLAGS = ${AM_CPPFLAGS} -DOM_TEST_MALLOC
  omtTest_m_SOURCES  = $(OMTTESTSSOURCES)
diff --git a/debian/patches/debianization-rename-pkgconfig_files.patch b/debian/patches/debianization-rename-pkgconfig_files.patch
index 5fdcb68..a0a41f6 100644
--- a/debian/patches/debianization-rename-pkgconfig_files.patch
+++ b/debian/patches/debianization-rename-pkgconfig_files.patch
@@ -150,13 +150,15 @@ Last-Update: 2015-08-02
  
 --- a/omalloc/Makefile.am
 +++ b/omalloc/Makefile.am
-@@ -78,5 +78,5 @@
+@@ -80,7 +80,7 @@
  omtTest_r_LDADD    = libsingular-omalloc.la
  
  pkgconfigdir = $(libdir)/pkgconfig
 -pkgconfig_DATA = omalloc.pc
 +pkgconfig_DATA = singular-omalloc.pc
  
+ getlucky-omtTest-m: getlucky-omtTest-X.sh
+ 	$(LN_S) $< $@
 --- a/m4/options.m4
 +++ b/m4/options.m4
 @@ -95,7 +95,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 4370ddd..845d401 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-tests-omalloc-getlucky.patch
 upstream-neutralize-tests-singular_dm_syzextra.patch
 upstream-autotools-help2man.patch
 upstream-autotools-help2man-extra.patch
diff --git a/debian/patches/upstream-tests-omalloc-getlucky.patch b/debian/patches/upstream-tests-omalloc-getlucky.patch
new file mode 100644
index 0000000..0490a81
--- /dev/null
+++ b/debian/patches/upstream-tests-omalloc-getlucky.patch
@@ -0,0 +1,59 @@
+Description: tests:
+ Quoting the upstream maintainer: ``omalloc testing/verification may oversee
+ some memory error in some random cases''. This patch introduceds a simple
+ wrapper that is meant to work around those unlucky cases by running a few
+ number of tests instead of just one test; meant to be submitted to the
+ upstream maintainer.
+Origin: debian
+Forwarded: https://github.com/Singular/Sources/pull/733
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-11-05
+
+--- a/omalloc/Makefile.am
++++ b/omalloc/Makefile.am
+@@ -60,9 +60,11 @@
+ ####################################################
+ ## Test program
+ 
+-TESTS = omtTest-m omtTest-r
++TESTS = getlucky-omtTest-m getlucky-omtTest-r
+ 
+-check_PROGRAMS = $(TESTS)
++check_PROGRAMS = omtTest-m omtTest-r
++
++check_SCRIPTS = $(TESTS)
+ 
+ # EXTRA_PROGRAMS = omtTest-r
+ 
+@@ -78,3 +80,12 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = omalloc.pc
+ 
++getlucky-omtTest-m: getlucky-omtTest-X.sh
++	$(LN_S) $< $@
++
++getlucky-omtTest-r: getlucky-omtTest-X.sh
++	$(LN_S) $< $@
++
++CLEANFILES += $(TESTS)
++
++EXTRA_DIST = getlucky-omtTest-X.sh
+--- /dev/null
++++ b/omalloc/getlucky-omtTest-X.sh
+@@ -0,0 +1,16 @@
++#!/bin/sh
++##
++## comment:
++##  omalloc testing/verification may oversee some memory error in some random cases:
++##  this simple wrapper is meant to work around those unlucky cases by running a few
++##  number of tests instead of just one test.
++##
++SCRIPTNAME=${0##*/}
++CHECK_PROGRAM=${SCRIPTNAME#getlucky-}
++NUMBEROF_TRIAL=11
++for idx in $(seq 1 $NUMBEROF_TRIAL); do
++	./$CHECK_PROGRAM && { echo "$SCRIPTNAME: SUMMARY: $idx trial(s)" ; exit 0 ; }
++done
++echo "$SCRIPTNAME: SUMMARY: $idx failed trials"
++exit 1
++# eos
diff --git a/debian/rules b/debian/rules
index 22861fb..37317fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_PKG_DIR = $(abspath $(dir $(filter %rules, $(MAKEFILE_LIST))))
-export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -l$(DEB_PKG_DIR)/changelog | sed -n -e '/^Version:/s/Version: //p')
+export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -l$(DEB_PKG_DIR)/changelog -S Version)
 
 export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -14,6 +14,10 @@ default:
 override_dh_auto_build-indep:
 	make -C dox html
 
+override_dh_auto_test-arch:
+	chmod a+x omalloc/getlucky-omtTest-X.sh
+	dh_auto_test -a
+
 override_dh_auto_test-indep:
 
 DEB_AUTO_INSTALL_MAKEFLAGS = TOPSRCDIR=$(CURDIR) DESTDIR=$(CURDIR)/debian/tmp

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