r47058 - in /packages/fftw/trunk/debian: changelog control patches/info-syntax patches/series rules

[thibaut at users.alioth.debian.org]

Author: thibaut
Date: Tue Jun 23 16:06:33 2015
New Revision: 47058

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47058
Log:
Fix FTBFS due to makinfo, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786694#25

Added:
    packages/fftw/trunk/debian/patches/info-syntax
Modified:
    packages/fftw/trunk/debian/changelog
    packages/fftw/trunk/debian/control
    packages/fftw/trunk/debian/patches/series
    packages/fftw/trunk/debian/rules

Modified: packages/fftw/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/changelog?rev=47058&op=diff
==============================================================================
--- packages/fftw/trunk/debian/changelog	(original)
+++ packages/fftw/trunk/debian/changelog	Tue Jun 23 16:06:33 2015
@@ -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.

Modified: packages/fftw/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/control?rev=47058&op=diff
==============================================================================
--- packages/fftw/trunk/debian/control	(original)
+++ packages/fftw/trunk/debian/control	Tue Jun 23 16:06:33 2015
@@ -4,8 +4,8 @@
 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

Added: packages/fftw/trunk/debian/patches/info-syntax
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/patches/info-syntax?rev=47058&op=file
==============================================================================
--- packages/fftw/trunk/debian/patches/info-syntax	(added)
+++ packages/fftw/trunk/debian/patches/info-syntax	Tue Jun 23 16:06:33 2015
@@ -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

Modified: packages/fftw/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/patches/series?rev=47058&op=diff
==============================================================================
--- packages/fftw/trunk/debian/patches/series	(original)
+++ packages/fftw/trunk/debian/patches/series	Tue Jun 23 16:06:33 2015
@@ -2,3 +2,4 @@
 #03_fix_doc.dpatch
 #04_configure.dpatch
 05_ac_define_syntax.diff
+info-syntax

Modified: packages/fftw/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw/trunk/debian/rules?rev=47058&op=diff
==============================================================================
--- packages/fftw/trunk/debian/rules	(original)
+++ packages/fftw/trunk/debian/rules	Tue Jun 23 16:06:33 2015
@@ -48,6 +48,7 @@
 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