Control: tag -1 + patch

On Sun, 24 May 2015 16:03:44 +0200 Reiner Herrmann <rei...@reiner-h.de>
wrote:
> 
> I think this could be related to an issue we already faced with automake 
> [1][2].
> Depending on the timezone, .info files are sometimes not (re)generated from 
> source (example [3]).
> This could explain why it doesn't happen in your local setup, when you are 
> not varying
> the timezone (the .info files are not regenerated with makeinfo), but on 
> jenkins it does.

Hi,

it's even worse: fftw.info is FTBFS.

I have prepared a patch, I would appreciate if someone could ack before
I upload it, which I will do before the bunch of reverse dependencies
are removed from testing on 2015-07-21.

Kind regards, Thibaut.
diff -Nru fftw-2.1.5/debian/changelog fftw-2.1.5/debian/changelog
--- fftw-2.1.5/debian/changelog	2011-11-29 01:48:33.000000000 +0100
+++ fftw-2.1.5/debian/changelog	2015-06-23 11:48:52.000000000 +0200
@@ -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 <thib...@debian.org>  Tue, 23 Jun 2015 11:48:16 +0200
+
 fftw (2.1.5-1) unstable; urgency=low
 
   * Team upload.
diff -Nru fftw-2.1.5/debian/control fftw-2.1.5/debian/control
--- fftw-2.1.5/debian/control	2011-11-29 01:55:44.000000000 +0100
+++ fftw-2.1.5/debian/control	2015-06-23 11:47:43.000000000 +0200
@@ -4,8 +4,8 @@
 Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders: Paul Brossier <p...@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 -Nru fftw-2.1.5/debian/patches/info-syntax fftw-2.1.5/debian/patches/info-syntax
--- fftw-2.1.5/debian/patches/info-syntax	1970-01-01 01:00:00.000000000 +0100
+++ fftw-2.1.5/debian/patches/info-syntax	2015-06-23 11:43:46.000000000 +0200
@@ -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
+ 
++@dircategory Science
++@direntry
++* FFTW: (fftw).                FFTW User's Manual
++@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.
+-@title{FFTW User's Manual}
++@title FFTW User's Manual
+ @subtitle For version @value{VERSION}, @value{UPDATED}
+-@author{Matteo Frigo}
+-@author{Steven G. Johnson}
++@author Matteo Frigo
++@author Steven G. Johnson
+ 
+ @c The following two commands start the copyright page.
+ @page
diff -Nru fftw-2.1.5/debian/patches/series fftw-2.1.5/debian/patches/series
--- fftw-2.1.5/debian/patches/series	2011-11-29 02:20:21.000000000 +0100
+++ fftw-2.1.5/debian/patches/series	2015-06-23 11:33:59.000000000 +0200
@@ -2,3 +2,4 @@
 #03_fix_doc.dpatch
 #04_configure.dpatch
 05_ac_define_syntax.diff
+info-syntax
diff -Nru fftw-2.1.5/debian/rules fftw-2.1.5/debian/rules
--- fftw-2.1.5/debian/rules	2011-11-29 02:06:06.000000000 +0100
+++ fftw-2.1.5/debian/rules	2015-06-23 11:33:59.000000000 +0200
@@ -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 
-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Reply via email to