[SCM] Library for computing Fast Fourier Transforms branch, master, updated. debian/3.3.2-3-23-ge595a2d

Julian Taylor jtaylor.debian at googlemail.com
Tue Dec 4 20:50:22 UTC 2012 

The following commit has been merged in the master branch:
commit 27b88c45ba14fec8b00b5a8ed9b78ace21cffd01
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue Dec 4 20:28:08 2012 +0100

    escape minus signs in 03_fix_manpages.diff

diff --git a/debian/changelog b/debian/changelog
index 940038e..337af1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ fftw3 (3.3.3-1) experimental; urgency=low
   * use dh-autoreconf
   * Bump to standards 3.9.4, no changes required
   * add .NOTPARALLEL to debian/rules
+  * escape minus signs in 03_fix_manpages.diff
   * pkg-config.patch: move -lm to Libs.private
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 01 Dec 2012 19:12:03 +0100
diff --git a/debian/patches/01_fftw3_texi.diff b/debian/patches/01_fftw3_texi.diff
index c28e8ca..8af7778 100644
--- a/debian/patches/01_fftw3_texi.diff
+++ b/debian/patches/01_fftw3_texi.diff
@@ -1,6 +1,7 @@
---- fftw3-3.1.2.orig/doc/fftw3.texi
-+++ fftw3-3.1.2/doc/fftw3.texi
-@@ -88,7 +88,7 @@
+Forwarded: fftw at fftw.org
+--- a/doc/fftw3.texi
++++ b/doc/fftw3.texi
+@@ -148,7 +148,7 @@
  @end quotation
  @end copying
  
diff --git a/debian/patches/02_fftw-faq_bfnn.diff b/debian/patches/02_fftw-faq_bfnn.diff
index b2d38d6..4866c91 100644
--- a/debian/patches/02_fftw-faq_bfnn.diff
+++ b/debian/patches/02_fftw-faq_bfnn.diff
@@ -1,5 +1,6 @@
---- fftw3-3.1.2.orig/doc/FAQ/fftw-faq.bfnn
-+++ fftw3-3.1.2/doc/FAQ/fftw-faq.bfnn
+Forwarded: fftw at fftw.org
+--- a/doc/FAQ/fftw-faq.bfnn
++++ b/doc/FAQ/fftw-faq.bfnn
 @@ -19,6 +19,7 @@
  
  \endcopy
@@ -8,4 +9,3 @@
  START-INFO-DIR-ENTRY
  * FFTW FAQ: (fftw-faq). FFTW Frequently Asked Questions with Answers.
  END-INFO-DIR-ENTRY
-
diff --git a/debian/patches/03_fix_manpages.diff b/debian/patches/03_fix_manpages.diff
index bf09af1..d377b12 100644
--- a/debian/patches/03_fix_manpages.diff
+++ b/debian/patches/03_fix_manpages.diff
@@ -1,22 +1,228 @@
---- fftw3-3.2.1.orig/tools/fftw_wisdom.1.in	2009-03-17 14:46:42.000000000 +0100
-+++ fftw3-3.2.1/tools/fftw_wisdom.1.in	2009-03-17 14:45:59.000000000 +0100
-@@ -24,7 +24,7 @@
+Description: escape minus signs and fix two comments
+Forwarded: fftw at fftw.org
+--- a/tools/fftw_wisdom.1.in
++++ b/tools/fftw_wisdom.1.in
+@@ -18,14 +18,14 @@
+ .\"
+ .TH FFTW-WISDOM 1 "February, 2003" "fftw" "fftw"
+ .SH NAME
+-fftw at PREC_SUFFIX@-wisdom \- create wisdom (pre-optimized FFTs)
++fftw at PREC_SUFFIX@\-wisdom \- create wisdom (pre-optimized FFTs)
+ .SH SYNOPSIS
+-.B fftw at PREC_SUFFIX@-wisdom
++.B fftw at PREC_SUFFIX@\-wisdom
  [\fIOPTION\fR]... [\fISIZE\fR]...
  .SH DESCRIPTION
  .PP
 -." Add any additional description here
+-.I fftw at PREC_SUFFIX@-wisdom
 +.\" Add any additional description here
- .I fftw at PREC_SUFFIX@-wisdom
++.I fftw at PREC_SUFFIX@\-wisdom
  is a utility to generate FFTW
  .B wisdom
---- fftw3-3.2.1.orig/tools/fftw-wisdom-to-conf.1	2008-11-11 02:18:10.000000000 +0100
-+++ fftw3-3.2.1/tools/fftw-wisdom-to-conf.1	2009-03-17 14:45:27.000000000 +0100
-@@ -23,7 +23,7 @@
- \fBfftw-wisdom-to-conf\fR [< \fIINPUT\fR] [> \fIOUTPUT\fR]
+ files, which contain saved information about how to optimally compute
+@@ -41,16 +41,16 @@
+ programs will load the \fBsystem wisdom\fR file, which is stored in
+ .I /etc/fftw/wisdom at PREC_SUFFIX@
+ by default.
+-.I fftw at PREC_SUFFIX@-wisdom
++.I fftw at PREC_SUFFIX@\-wisdom
+ can be used to create or add to such wisdom files.  In its most
+ typical usage, the wisdom file can be created to pre-plan a canonical
+ set of sizes (see below) via:
+ 
+ .ce
+-fftw at PREC_SUFFIX@-wisdom -v -c -o wisdom at PREC_SUFFIX@
++fftw at PREC_SUFFIX@\-wisdom \-v \-c \-o wisdom at PREC_SUFFIX@
+ 
+ (this will take many hours, which can be limited by the 
+-.B -t
++.B \-t
+ option) and the output
+ .I wisdom at PREC_SUFFIX@
+ file can then be copied (as root) to
+@@ -58,33 +58,33 @@
+ or whatever.
+ 
+ The
+-.I fftw at PREC_SUFFIX@-wisdom
++.I fftw at PREC_SUFFIX@\-wisdom
+ program normally writes the wisdom directly to standard output, but this
+ can be changed via the
+-.B -o
++.B \-o
+ option, as in the example above.
+ 
+ If the system wisdom file
+ .I /etc/fftw/wisdom at PREC_SUFFIX@
+ already exists, then
+-.I fftw at PREC_SUFFIX@-wisdom
++.I fftw at PREC_SUFFIX@\-wisdom
+ reads this existing wisdom (unless the
+-.B -n
++.B \-n
+ option is specified) and outputs both the old wisdom and any
+ newly created wisdom.  In this way, it can be used to add new transform
+ sizes to the existing system wisdom (or other wisdom file, with the 
+-.B -w
++.B \-w
+ option).
+ .SH SPECIFYING SIZES
+ Although a canonical set of sizes to optimize is specified by the 
+-.B -c
++.B \-c
+ option, the user can also specify zero or more non-canonical transform
+ sizes and types to optimize, via the 
+ .I SIZE
+ arguments following the option flags.  Alternatively, the sizes to
+ optimize can be read from standard input (whitespace-separated), if a
+ .I SIZE
+-argument of "-" is supplied.
++argument of "\-" is supplied.
+ 
+ Sizes are specified by the syntax:
+ 
+@@ -117,41 +117,41 @@
+ 
+ .SH OPTIONS
+ .TP
+-\fB\-h\fR, \fB\--help\fR
++\fB\-h\fR, \fB\-\-help\fR
+ Display help on the command-line options and usage.
+ .TP
+-\fB\-V\fR, \fB\--version\fR
++\fB\-V\fR, \fB\-\-version\fR
+ Print the version number and copyright information.
+ .TP
+-\fB\-v\fR, \fB\--verbose\fR
++\fB\-v\fR, \fB\-\-verbose\fR
+ Verbose output.  (You can specify this multiple times, or supply a numeric
+ argument greater than 1, to increase the verbosity level.)  Note that the
+ verbose output will be mixed with the wisdom output (making it impossible
+ to import), unless you write the wisdom to a file via the 
+-.B -o
++.B \-o
+ option.
+ .TP
+-\fB\-c\fR, \fB\--canonical\fR
++\fB\-c\fR, \fB\-\-canonical\fR
+ Optimize/pre-plan a canonical set of sizes: all powers of two and ten
+ up to 2^20 (1048576), including both real and complex, forward and
+ backwards, in-place and out-of-place transforms.  Also includes two-
+ and three-dimensional transforms of equal-size dimensions
+ (e.g. 16x16x16).
+ .TP
+-\fB\-t\fR \fIhours\fR, \fB\--time-limit\fR=\fIhours\fR
++\fB\-t\fR \fIhours\fR, \fB\-\-time\-limit\fR=\fIhours\fR
+ Stop after a time of
+ .I hours
+ (hours) has elapsed, outputting accumulated wisdom.  (The problems are planned
+ in increasing order of size.)  Defaults to 0, indicating no time limit.
+ .TP
+-\fB\-o\fR \fIfile\fR, \fB\--output-file\fR=\fIfile\fR
++\fB\-o\fR \fIfile\fR, \fB\-\-output-file\fR=\fIfile\fR
+ Send wisdom output to
+ .I file
+ rather than to standard output (the default).
+ .TP
+-\fB\-m\fR, \fB\--measure\fR; \fB\-e\fR, \fB\--estimate\fR; \fB\-x\fR, \fB\--exhaustive\fR
++\fB\-m\fR, \fB\-\-measure\fR; \fB\-e\fR, \fB\-\-estimate\fR; \fB\-x\fR, \fB\-\-exhaustive\fR
+ Normally, 
+-.I fftw at PREC_SUFFIX@-wisdom
++.I fftw at PREC_SUFFIX@\-wisdom
+ creates plans in FFTW_PATIENT mode, but with these options you can instead
+ use FFTW_MEASURE, FFTW_ESTIMATE, or FFTW_EXHAUSTIVE modes, respectively,
+ as described in more detail by the FFTW manual.
+@@ -160,24 +160,24 @@
+ single file can mix different levels of wisdom (e.g. you can mostly
+ use the patient default, but plan a few sizes that you especially care
+ about in
+-.B --exhaustive
++.B \-\-exhaustive
+ mode).
+ .TP
+-\fB\-n\fR, \fB\--no-system-wisdom\fR
++\fB\-n\fR, \fB\-\-no\-system\-wisdom\fR
+ Do not import the system wisdom from
+ .I /etc/fftw/wisdom at PREC_SUFFIX@
+ (which is normally read by default).
+ .TP
+-\fB\-w\fR \fIfile\fR, \fB\--wisdom-file\fR=\fIfile\fR
++\fB\-w\fR \fIfile\fR, \fB\-\-wisdom\-file\fR=\fIfile\fR
+ Import wisdom from
+ .I file
+ (in addition to the system wisdom, unless 
+-.B -n
++.B \-n
+ is specified).  Multiple wisdom files can be read via multiple
+-.B -w
++.B \-w
+ options.  If
+ .I file
+-is "-", then read wisdom from standard input.
++is "\-", then read wisdom from standard input.
+ .SH BUGS
+ Send bug reports to fftw at fftw.org.
+ .SH AUTHORS
+--- a/tools/fftw-wisdom-to-conf.1
++++ b/tools/fftw-wisdom-to-conf.1
+@@ -18,13 +18,13 @@
+ .\"
+ .TH FFTW-WISDOM-TO-CONF 1 "February, 2003" "fftw" "fftw"
+ .SH NAME
+-fftw-wisdom-to-conf \- generate FFTW wisdom (pre-planned transforms)
++fftw\-wisdom\-to\-conf \- generate FFTW wisdom (pre-planned transforms)
+ .SH SYNOPSIS
+-\fBfftw-wisdom-to-conf\fR [< \fIINPUT\fR] [> \fIOUTPUT\fR]
++\fBfftw\-wisdom\-to\-conf\fR [< \fIINPUT\fR] [> \fIOUTPUT\fR]
  .SH DESCRIPTION
  .PP
 -." Add any additional description here
+-.I fftw-wisdom-to-conf
 +.\" Add any additional description here
- .I fftw-wisdom-to-conf
++.I fftw\-wisdom\-to\-conf
  is a utility to generate C
  .B configuration
+ routines from FFTW
+@@ -48,15 +48,15 @@
+ found at the FFTW home page:
+ .I http://www.fftw.org
+ 
+-.I fftw-wisdom-to-conf
++.I fftw\-wisdom\-to\-conf
+ reads wisdom from standard input and writes the configuration to
+ standard output.  It can easily be combined with the
+-.I fftw-wisdom
++.I fftw\-wisdom
+ tool, for example:
+ 
+-fftw-wisdom -n cof1024 cob1024 -o wisdom
++fftw\-wisdom \-n cof1024 cob1024 \-o wisdom
+ .br
+-fftw-wisdom-to-conf < wisdom > conf.c
++fftw\-wisdom\-to\-conf < wisdom > conf.c
+ 
+ will create a configuration "conf.c" containing only those parts of
+ FFTW needed for the optimized complex forwards and backwards
+@@ -65,7 +65,7 @@
+ 
+ Alternatively, you can run your actual program, export wisdom for all
+ plans that were created (ideally in FFTW_PATIENT or FFTW_EXHAUSTIVE
+-mode), use this as input for \fIfftw-wisdom-to-conf\fR,
++mode), use this as input for \fIfftw\-wisdom\-to\-conf\fR,
+ and then re-link your program with the resulting configuration routine.
+ 
+ Note that the configuration routine does not contain the wisdom, only
+@@ -74,10 +74,10 @@
+ plans.
+ .SH OPTIONS
+ .TP
+-\fB\-h\fR, \fB\--help\fR
++\fB\-h\fR, \fB\-\-help\fR
+ Display help on the command-line options and usage.
+ .TP
+-\fB\-V\fR, \fB\--version\fR
++\fB\-V\fR, \fB\-\-version\fR
+ Print the version number and copyright information.
+ .SH BUGS
+ Send bug reports to fftw at fftw.org.
diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
index bf0fab2..fadda32 100644
--- a/debian/patches/pkg-config.patch
+++ b/debian/patches/pkg-config.patch
@@ -1,4 +1,5 @@
 Description: move -lm to Libs.private
+Forwarded: fftw at fftw.org
 Author: Julian Taylor <jtaylor.debian at googlemail.com>
 
 --- a/fftw.pc.in

-- 
Library for computing Fast Fourier Transforms

More information about the debian-science-commits mailing list