[fftw] 01/01: Import Debian changes 2.1.5-4.2

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository fftw.

commit 7e738f30b3f372aae69b5ecabedae6e66c88dd60
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Aug 16 03:22:14 2017 +0200

    Import Debian changes 2.1.5-4.2
    
    fftw (2.1.5-4.2) unstable; urgency=medium
    
      * Non-maintainer upload.
      * Fix "FTBFS: Unescaped left brace in regex is deprecated here":
        add patch fix-texi2html-perl526.patch to fix Perl 5.26 regexp
        warnings/errors.
        (Closes: #871367)
      * Add support for DEB_BUILD_OPTIONS=nocheck in debian/rules.
---
 debian/changelog                           | 11 ++++++++++
 debian/patches/fix-texi2html-perl526.patch | 35 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 debian/rules                               |  4 ++++
 4 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2b57fa3..806ea0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+fftw (2.1.5-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: Unescaped left brace in regex is deprecated here":
+    add patch fix-texi2html-perl526.patch to fix Perl 5.26 regexp
+    warnings/errors.
+    (Closes: #871367)
+  * Add support for DEB_BUILD_OPTIONS=nocheck in debian/rules.
+
+ -- gregor herrmann <gregoa at debian.org>  Wed, 16 Aug 2017 03:22:14 +0200
+
 fftw (2.1.5-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/fix-texi2html-perl526.patch b/debian/patches/fix-texi2html-perl526.patch
new file mode 100644
index 0000000..32f0232
--- /dev/null
+++ b/debian/patches/fix-texi2html-perl526.patch
@@ -0,0 +1,35 @@
+Description: Fix perl 5.26 regexp warnings/errors
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/871367
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2017-08-07
+
+--- a/doc/texi2html
++++ b/doc/texi2html
+@@ -839,7 +839,7 @@
+     s/\@refill\s+//g;
+     # other substitutions
+     &simple_substitutions;
+-    s/\@value{($VARRE)}/$value{$1}/eg;
++    s/\@value\{($VARRE)}/$value{$1}/eg;
+     s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4
+     #
+     # analyze the tag again
+@@ -1169,7 +1169,7 @@
+     #
+     # xref
+     #
+-    while (/\@(x|px|info|)ref{($XREFRE)(}?)/o) {
++    while (/\@(x|px|info|)ref\{($XREFRE)(}?)/o) {
+ 	# note: Texinfo may accept other characters
+ 	($type, $nodes, $full) = ($1, $2, $3);
+ 	($before, $after) = ($`, $');
+@@ -1768,7 +1768,7 @@
+     while ($changed) {
+ 	$changed = 0;
+ 	$done = '';
+-	while (/\@(\w+){([^\{\}]+)}/) {
++	while (/\@(\w+)\{([^\{\}]+)}/) {
+ 	    $text = &apply_style($1, $2);
+ 	    if ($text) {
+ 		$_ = "$`$text$'";
diff --git a/debian/patches/series b/debian/patches/series
index 7059d77..ebe3124 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 info-syntax
 fix-texi2html-perl522.patch
 perl-cwd-in-inc.patch
+fix-texi2html-perl526.patch
diff --git a/debian/rules b/debian/rules
index 3d1a7ba..c2f7d29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,17 +30,21 @@ build-arch-stamp: autoreconf-stamp
 	# single precision
 	F77=gfortran CFLAGS="$(CFLAGS)" CC=mpicc ./configure $(CONFFLAGS) --enable-float --enable-type-prefix $(ARCHCONFFLAGS)
 	$(MAKE)
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	#$(MAKE) -C tests check
 	./tests/fftw_test  -t -e -v -p 1024 -x 1
 	./tests/rfftw_test -t -e -v -p 1024 -x 1
+endif
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-single
 	$(MAKE) clean
 	# double precision
 	F77=gfortran CFLAGS="$(CFLAGS)" CC=mpicc ./configure $(CONFFLAGS) $(ARCHCONFFLAGS)
 	$(MAKE)
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	#$(MAKE) -C tests check
 	./tests/fftw_test  -t -e -v -p 1024 -x 1
 	./tests/rfftw_test -t -e -v -p 1024 -x 1
+endif
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-double
 	touch build-arch-stamp
 

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