[fftw3] 03/07: New upstream release (Closes: #741851)
Julian Taylor
jtaylor.debian at googlemail.com
Sun Mar 16 16:27:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch master
in repository fftw3.
commit 360f7e5b5f8e668c943e9628dc2dad80eeb380ad
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Mar 16 16:00:45 2014 +0100
New upstream release (Closes: #741851)
all patches applied upstream
---
debian/changelog | 6 +-
debian/patches/01_fftw3_texi.diff | 12 --
debian/patches/02_fftw-faq_bfnn.diff | 11 --
debian/patches/03_fix_manpages.diff | 228 ---------------------------
debian/patches/fix-fftw-wisdom-to-conf.patch | 16 --
debian/patches/pkg-config.patch | 14 --
debian/patches/series | 7 -
debian/patches/texinfo5-compat.patch | 30 ----
debian/patches/wisdom-manpage.patch | 15 --
9 files changed, 4 insertions(+), 335 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a2048b5..646ccbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-fftw3 (3.3.3-8) UNRELEASED; urgency=medium
+fftw3 (3.3.4-1) unstable; urgency=medium
+ * New upstream release (Closes: #741851)
+ - all patches applied upstream
* add autopkgtest depend on build-essential (Closes: #740095)
- -- Julian Taylor <jtaylor.debian at googlemail.com> Sun, 16 Mar 2014 15:32:18 +0100
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Sun, 16 Mar 2014 15:59:47 +0100
fftw3 (3.3.3-7) unstable; urgency=low
diff --git a/debian/patches/01_fftw3_texi.diff b/debian/patches/01_fftw3_texi.diff
deleted file mode 100644
index 8af7778..0000000
--- a/debian/patches/01_fftw3_texi.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Forwarded: fftw at fftw.org
---- a/doc/fftw3.texi
-+++ b/doc/fftw3.texi
-@@ -148,7 +148,7 @@
- @end quotation
- @end copying
-
-- at dircategory Texinfo documentation system
-+ at dircategory Development
- @direntry
- * fftw3: (fftw3). FFTW User's Manual.
- @end direntry
diff --git a/debian/patches/02_fftw-faq_bfnn.diff b/debian/patches/02_fftw-faq_bfnn.diff
deleted file mode 100644
index 4866c91..0000000
--- a/debian/patches/02_fftw-faq_bfnn.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Forwarded: fftw at fftw.org
---- a/doc/FAQ/fftw-faq.bfnn
-+++ b/doc/FAQ/fftw-faq.bfnn
-@@ -19,6 +19,7 @@
-
- \endcopy
- \copyto INFO
-+INFO-DIR-SECTION Development
- 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
deleted file mode 100644
index d377b12..0000000
--- a/debian/patches/03_fix_manpages.diff
+++ /dev/null
@@ -1,228 +0,0 @@
-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
- is a utility to generate FFTW
- .B wisdom
- 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
- 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/fix-fftw-wisdom-to-conf.patch b/debian/patches/fix-fftw-wisdom-to-conf.patch
deleted file mode 100644
index befb68d..0000000
--- a/debian/patches/fix-fftw-wisdom-to-conf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix fftw-wisdom-to-conf
-Origin f230f8cf903f1e2bb1261ed2f8657a99ac12a9ca
-Author: Matteo Frigo <athena at fftw.org>
-Date: Thu, 11 Jul 2013 19:28:50 -0400
-
---- a/tools/fftw-wisdom-to-conf.in
-+++ b/tools/fftw-wisdom-to-conf.in
-@@ -39,7 +39,7 @@ fi
- read preamble fftw_wisdom
-
- case "$preamble $fftw_wisdom" in
-- \(@PACKAGE at -@VERSION@\ *_wisdom)
-+ \(@PACKAGE at -@VERSION@\ *_wisdom*)
- prefix=`echo $fftw_wisdom | cut -d_ -f1`_
- ;;
- *)
diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
deleted file mode 100644
index fadda32..0000000
--- a/debian/patches/pkg-config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: move -lm to Libs.private
-Forwarded: fftw at fftw.org
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
-
---- a/fftw.pc.in
-+++ b/fftw.pc.in
-@@ -6,5 +6,6 @@
- Name: FFTW
- Description: fast Fourier transform library
- Version: @VERSION@
--Libs: -L${libdir} -lfftw3 at PREC_SUFFIX@ @LIBQUADMATH@ -lm
-+Libs: -L${libdir} -lfftw3 at PREC_SUFFIX@ @LIBQUADMATH@
-+Libs.private: -lm
- Cflags: -I${includedir}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 24de620..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-01_fftw3_texi.diff
-02_fftw-faq_bfnn.diff
-03_fix_manpages.diff
-pkg-config.patch
-texinfo5-compat.patch
-wisdom-manpage.patch
-fix-fftw-wisdom-to-conf.patch
diff --git a/debian/patches/texinfo5-compat.patch b/debian/patches/texinfo5-compat.patch
deleted file mode 100644
index 0240508..0000000
--- a/debian/patches/texinfo5-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
diff --git a/debian/patches/wisdom-manpage.patch b/debian/patches/wisdom-manpage.patch
deleted file mode 100644
index fe57999..0000000
--- a/debian/patches/wisdom-manpage.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix wrong example
- tool requires flags to be specified before sizes
-Forwarded: https://github.com/FFTW/fftw3/issues/8
-
---- a/tools/fftw-wisdom-to-conf.1
-+++ b/tools/fftw-wisdom-to-conf.1
-@@ -54,7 +54,7 @@ standard output. It can easily be combi
- .I fftw\-wisdom
- tool, for example:
-
--fftw\-wisdom \-n cof1024 cob1024 \-o wisdom
-+fftw\-wisdom \-n \-o wisdom cof1024 cob1024
- .br
- fftw\-wisdom\-to\-conf < wisdom > conf.c
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fftw3.git
More information about the debian-science-commits
mailing list