[SCM] Library for computing Fast Fourier Transforms branch, master, updated. debian/3.3.3-3-3-g610d6df

[Julian Taylor]

The following commit has been merged in the master branch:
commit d63d02c3d1e3c3a6cfdd5a02705a1bcfb67476d7
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue May 21 20:38:17 2013 +0200

    texinfo5-compat.patch: fix ftbfs with texinfo5

diff --git a/debian/changelog b/debian/changelog
index 27205f8..d30cff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fftw3 (3.3.3-4) unstable; urgency=low
+
+  * texinfo5-compat.patch: fix ftbfs with texinfo5
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 21 May 2013 20:37:52 +0200
+
 fftw3 (3.3.3-3) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/patches/series b/debian/patches/series
index b84c424..baaa45d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_fftw-faq_bfnn.diff
 03_fix_manpages.diff
 pkg-config.patch
+texinfo5-compat.patch
diff --git a/debian/patches/texinfo5-compat.patch b/debian/patches/texinfo5-compat.patch
new file mode 100644
index 0000000..0240508
--- /dev/null
+++ b/debian/patches/texinfo5-compat.patch
@@ -0,0 +1,30 @@
+Description: fix errors with texinfo 5
+ ignore errors, can't find a way to fix the macros with @html @tex
+ @math does not work with tex, multiple @if separated macros don't escape
+ html core ...
+ output is fine when errors are ignore
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+--- a/doc/fftw3.texi
++++ b/doc/fftw3.texi
+@@ -156,8 +156,8 @@ approved by the Free Software Foundation
+ @titlepage
+ @title FFTW
+ @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 
+ @page
+ @vskip 0pt plus 1filll
+ @insertcopying
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -13,6 +13,8 @@ equation-rodft10.png equation-rodft11.pn
+ EXTRA_DIST = f77_wisdom.f fftw3.pdf html rfftwnd.fig rfftwnd.eps	\
+ rfftwnd.pdf rfftwnd-for-html.png $(EQN_IMAGES)
+ 
++AM_MAKEINFOFLAGS=--force
++
+ html: $(fftw3_TEXINFOS) $(EQN_IMAGES) rfftwnd-for-html.png
+ 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+ 		--html --number-sections -o html fftw3.texi

-- 
Library for computing Fast Fourier Transforms