[fftw] 16/16: Imported Debian patch 2.1.5-2

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository fftw.

commit 27488a8f4f819ac51e9d8b12ffbb28d6047333ce
Author: Thibaut Paumard <thibaut at debian.org>
Date:   Tue Jun 23 11:48:16 2015 +0200

    Imported Debian patch 2.1.5-2
---
 debian/changelog           | 10 ++++++++++
 debian/control             |  4 ++--
 debian/patches/info-syntax | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 debian/rules               |  1 +
 5 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 744c58b..1952233 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+fftw (2.1.5-2) unstable; urgency=low
+
+  * Team upload.
+  * Bug fix: "FTBFS with TZ=GMT-14", thanks to Holger Levsen (Closes:
+    #786694).
+  * Fix fftw.texi and make sure it is always rebuilt.
+  * Check against Policy 3.9.6
+
+ -- Thibaut Paumard <thibaut at debian.org>  Tue, 23 Jun 2015 11:48:16 +0200
+
 fftw (2.1.5-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 649e6b4..ef7a7ed 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Brossier <piem at debian.org>
 Build-Depends: debhelper (>= 4.0.0), autotools-dev, autoconf, automake, libtool,
- mpi-default-dev, gfortran
-Standards-Version: 3.9.2
+ mpi-default-dev, gfortran, texinfo
+Standards-Version: 3.9.6
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/fftw/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/fftw/
 Homepage: http://fftw.org
diff --git a/debian/patches/info-syntax b/debian/patches/info-syntax
new file mode 100644
index 0000000..3984edb
--- /dev/null
+++ b/debian/patches/info-syntax
@@ -0,0 +1,36 @@
+Description: Fix doc/fftw.info syntax
+ title, subtitle and author commands to use {}
+Author: Thibaut Paumard
+Origin: vendor
+Forwarded: no
+Last-Update: 20015-06-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/fftw.texi
++++ b/doc/fftw.texi
+@@ -5,6 +5,11 @@
+ @settitle FFTW
+ @c %**end of header
+ 
++ at dircategory Science
++ at direntry
++* FFTW: (fftw).                FFTW User's Manual
++ at end direntry
++
+ @include version.texi
+ @setchapternewpage odd
+ @c define constant index (ct)
+@@ -46,10 +51,10 @@
+ @titlepage
+ @sp 10
+ @comment The title is printed in a large font.
+- at title{FFTW User's Manual}
++ at title FFTW User's Manual
+ @subtitle For version @value{VERSION}, @value{UPDATED}
+- at author{Matteo Frigo}
+- at author{Steven G. Johnson}
++ at author Matteo Frigo
++ at author Steven G. Johnson
+ 
+ @c The following two commands start the copyright page.
+ @page
diff --git a/debian/patches/series b/debian/patches/series
index b721526..5161e1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 #03_fix_doc.dpatch
 #04_configure.dpatch
 05_ac_define_syntax.diff
+info-syntax
diff --git a/debian/rules b/debian/rules
index 0a58b90..cd1714f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ build-indep: build-indep-stamp
 build-indep-stamp: autoreconf-stamp
 	# docs
 	F77=gfortran CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) --enable-float --enable-type-prefix $(ARCHCONFFLAGS)
+	rm -f doc/fftw.info
 	$(MAKE) -C doc
 	$(MAKE) -C doc html 
 	$(MAKE) -C FAQ 

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