diff -Nru autoconf-2.69/debian/autoconf.manpages autoconf-2.69/debian/autoconf.manpages
--- autoconf-2.69/debian/autoconf.manpages	2012-04-29 20:35:10.000000000 +0000
+++ autoconf-2.69/debian/autoconf.manpages	2014-02-23 16:15:46.000000000 +0000
@@ -1 +1 @@
-debian/man/*.1
+man/*.1
diff -Nru autoconf-2.69/debian/changelog autoconf-2.69/debian/changelog
--- autoconf-2.69/debian/changelog	2014-02-10 00:35:54.000000000 +0000
+++ autoconf-2.69/debian/changelog	2014-02-23 16:29:25.000000000 +0000
@@ -1,3 +1,13 @@
+autoconf (2.69-5) unstable; urgency=low
+
+  * debian/rules: Use upstream manpages instead of Debian-specific ones.
+    Closes: #680079.  Thanks to Vincent Lefevre <vincent@vinc17.net> for
+    reporting this bug.
+  * debian/control: Add help2man build dependency.
+  * debian/source/options: Ignore generated documentation.
+
+ -- Ben Pfaff <pfaffben@debian.org>  Sun, 23 Feb 2014 08:07:54 -0800
+
 autoconf (2.69-4) unstable; urgency=low
 
   * debian/control: Add build dependency on texlive-fonts-recommended.
diff -Nru autoconf-2.69/debian/control autoconf-2.69/debian/control
--- autoconf-2.69/debian/control	2014-02-10 00:34:50.000000000 +0000
+++ autoconf-2.69/debian/control	2014-02-23 16:26:01.000000000 +0000
@@ -5,7 +5,7 @@
 Standards-Version: 3.9.3
 Build-Depends-Indep: texinfo (>= 4.6), m4 (>= 1.4.13),
  texlive-base, texlive-generic-recommended, texlive-latex-base,
- texlive-latex-recommended, texlive-fonts-recommended
+ texlive-latex-recommended, texlive-fonts-recommended, help2man
 Build-Depends: debhelper (>= 7.0.50~)
 Homepage: http://www.gnu.org/software/autoconf/
 
diff -Nru autoconf-2.69/debian/man/autoconf.1 autoconf-2.69/debian/man/autoconf.1
--- autoconf-2.69/debian/man/autoconf.1	2012-04-28 17:01:35.000000000 +0000
+++ autoconf-2.69/debian/man/autoconf.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-.TH AUTOCONF "1" "September 2005" "autoconf 2.59" "User Commands"
-.SH NAME
-autoconf \- Generate configuration scripts
-.SH SYNOPSIS
-.B autoconf
-[\fIOPTION\fR] ... [\fITEMPLATE-FILE\fR]
-.SH DESCRIPTION
-Generate a configuration script from a TEMPLATE\-FILE if given, or
-`configure.ac' if present, or else `configure.in'.  Output is sent
-to the standard output if TEMPLATE\-FILE is given, else into
-`configure'.
-.SS "Operation modes:"
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help, then exit
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print version number, then exit
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-verbosely report processing
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-don't remove temporary files
-.TP
-\fB\-f\fR, \fB\-\-force\fR
-consider all files obsolete
-.TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-save output in FILE (stdout is the default)
-.TP
-\fB\-W\fR, \fB\-\-warnings\fR=\fICATEGORY\fR
-report the warnings falling in CATEGORY [syntax]
-.SS "Warning categories include:"
-.TP
-`cross'
-cross compilation issues
-.TP
-`obsolete'
-obsolete constructs
-.TP
-`syntax'
-dubious syntactic constructs
-.TP
-`all'
-all the warnings
-.TP
-`no\-CATEGORY'
-turn off the warnings on CATEGORY
-.TP
-`none'
-turn off all the warnings
-.TP
-`error'
-warnings are error
-.PP
-The environment variable `WARNINGS' is honored.
-.SS "Library directories:"
-.TP
-\fB\-B\fR, \fB\-\-prepend\-include\fR=\fIDIR\fR
-prepend directory DIR to search path
-.TP
-\fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-append directory DIR to search path
-.SS "Tracing:"
-.TP
-\fB\-t\fR, \fB\-\-trace\fR=\fIMACRO\fR
-report the list of calls to MACRO
-.TP
-\fB\-i\fR, \fB\-\-initialization\fR
-also trace Autoconf's initialization process
-.PP
-In tracing mode, no configuration script is created.
-.SH AUTHOR
-Written by David J. MacKenzie and Akim Demaille.
-.SH "REPORTING BUGS"
-Report bugs to <bug\-autoconf@gnu.org>.
-.SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
-.br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR autoconf (1),
-.BR automake (1),
-.BR autoreconf (1),
-.BR autoupdate (1),
-.BR autoheader (1),
-.BR autoscan (1),
-.BR config.guess (1),
-.BR config.sub (1),
-.BR ifnames (1),
-.BR libtool (1).
-.PP
-The Debian project regards the full documentation for
-.B autoconf
-to be non-free, so it is not included in Debian.  Nevertheless, the
-non-free distribution that accompanies Debian includes the manual in
-its
-.B autoconf-doc
-package.  Otherwise, you may be able to access the Autoconf manual
-online.
-.B /usr/share/doc/autoconf/autoconf.html
-for more information.
diff -Nru autoconf-2.69/debian/man/autoheader.1 autoconf-2.69/debian/man/autoheader.1
--- autoconf-2.69/debian/man/autoheader.1	2012-04-28 17:01:35.000000000 +0000
+++ autoconf-2.69/debian/man/autoheader.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-.TH AUTOHEADER "1" "September 2005" "autoheader 2.59" "User Commands"
-.SH NAME
-autoheader \- Create a template header for configure
-.SH SYNOPSIS
-.B autoheader
-[\fIOPTION\fR] ... [\fITEMPLATE-FILE\fR]
-.SH DESCRIPTION
-Create a template file of C `#define' statements for `configure' to
-use.  To this end, scan TEMPLATE\-FILE, or `configure.ac' if present,
-or else `configure.in'.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help, then exit
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print version number, then exit
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-verbosely report processing
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-don't remove temporary files
-.TP
-\fB\-f\fR, \fB\-\-force\fR
-consider all files obsolete
-.TP
-\fB\-W\fR, \fB\-\-warnings\fR=\fICATEGORY\fR
-report the warnings falling in CATEGORY
-.SS "Warning categories include:"
-.TP
-`cross'
-cross compilation issues
-.TP
-`gnu'
-GNU coding standards (default in gnu and gnits modes)
-.TP
-`obsolete'
-obsolete features or constructions
-.TP
-`override'
-user redefinitions of Automake rules or variables
-.TP
-`portability'
-portability issues
-.TP
-`syntax'
-dubious syntactic constructs (default)
-.TP
-`unsupported'
-unsupported or incomplete features (default)
-.TP
-`all'
-all the warnings
-.TP
-`no\-CATEGORY'
-turn off warnings in CATEGORY
-.TP
-`none'
-turn off all the warnings
-.TP
-`error'
-treat warnings as errors
-.SS "Library directories:"
-.TP
-\fB\-B\fR, \fB\-\-prepend\-include\fR=\fIDIR\fR
-prepend directory DIR to search path
-.TP
-\fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-append directory DIR to search path
-.SH AUTHOR
-Written by Roland McGrath and Akim Demaille.
-.SH "REPORTING BUGS"
-Report bugs to <bug\-autoconf@gnu.org>.
-.SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
-.br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR autoconf (1),
-.BR automake (1),
-.BR autoreconf (1),
-.BR autoupdate (1),
-.BR autoheader (1),
-.BR autoscan (1),
-.BR config.guess (1),
-.BR config.sub (1),
-.BR ifnames (1),
-.BR libtool (1).
-.PP
-The Debian project regards the full documentation for
-.B autoheader
-to be non-free, so it is not included in Debian.  Nevertheless, the
-non-free distribution that accompanies Debian includes the manual in
-its
-.B autoconf-doc
-package.  Otherwise, you may be able to access the Autoconf manual
-online.
-.B /usr/share/doc/autoconf/autoconf.html
-for more information.
diff -Nru autoconf-2.69/debian/man/autom4te.1 autoconf-2.69/debian/man/autom4te.1
--- autoconf-2.69/debian/man/autom4te.1	2012-04-28 17:01:35.000000000 +0000
+++ autoconf-2.69/debian/man/autom4te.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-.TH AUTOM4TE "1" "September 2005" "autom4te 2.59" "User Commands"
-.SH NAME
-autom4te \- Generate files and scripts thanks to M4
-.SH SYNOPSIS
-.B autom4te
-[\fIOPTION\fR] ... [\fIFILES\fR]
-.SH DESCRIPTION
-Run GNU M4 on the FILES, avoiding useless runs.  Output the traces if tracing,
-the frozen file if freezing, otherwise the expansion of the FILES.
-.PP
-If some of the FILES are named `FILE.m4f' they are considered to be M4
-frozen files of all the previous files (which are therefore not loaded).
-If `FILE.m4f' is not found, then `FILE.m4' will be used, together with
-all the previous files.
-.PP
-Some files may be optional, i.e., will only be processed if found in the
-include path, but then must end in `.m4?';  the question mark is not part of
-the actual file name.
-.SS "Operation modes:"
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help, then exit
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print version number, then exit
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-verbosely report processing
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-don't remove temporary files
-.TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-save output in FILE (defaults to `\-', stdout)
-.TP
-\fB\-f\fR, \fB\-\-force\fR
-don't rely on cached values
-.TP
-\fB\-W\fR, \fB\-\-warnings\fR=\fICATEGORY\fR
-report the warnings falling in CATEGORY
-.TP
-\fB\-l\fR, \fB\-\-language\fR=\fILANG\fR
-specify the set of M4 macros to use
-.TP
-\fB\-C\fR, \fB\-\-cache\fR=\fIDIRECTORY\fR
-preserve results for future runs in DIRECTORY
-.TP
-\fB\-\-no\-cache\fR
-disable the cache
-.TP
-\fB\-m\fR, \fB\-\-mode\fR=\fIOCTAL\fR
-change the non trace output file mode (0666)
-.TP
-\fB\-M\fR, \fB\-\-melt\fR
-don't use M4 frozen files
-.SS "Languages include:"
-.TP
-`Autoconf'
-create Autoconf configure scripts
-.TP
-`Autotest'
-create Autotest test suites
-.TP
-`M4sh'
-create M4sh shell scripts
-.TP
-`M4sugar'
-create M4sugar output
-.SS "Warning categories include:"
-.TP
-`cross'
-cross compilation issues
-.TP
-`gnu'
-GNU coding standards (default in gnu and gnits modes)
-.TP
-`obsolete'
-obsolete features or constructions
-.TP
-`override'
-user redefinitions of Automake rules or variables
-.TP
-`portability'
-portability issues
-.TP
-`syntax'
-dubious syntactic constructs (default)
-.TP
-`unsupported'
-unsupported or incomplete features (default)
-.TP
-`all'
-all the warnings
-.TP
-`no\-CATEGORY'
-turn off warnings in CATEGORY
-.TP
-`none'
-turn off all the warnings
-.TP
-`error'
-treat warnings as errors
-.PP
-The environment variable `WARNINGS' is honored.
-.SS "Library directories:"
-.TP
-\fB\-B\fR, \fB\-\-prepend\-include\fR=\fIDIR\fR
-prepend directory DIR to search path
-.TP
-\fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-append directory DIR to search path
-.SS "Tracing:"
-.TP
-\fB\-t\fR, \fB\-\-trace\fR=\fIMACRO\fR
-report the MACRO invocations
-.TP
-\fB\-p\fR, \fB\-\-preselect\fR=\fIMACRO\fR
-prepare to trace MACRO in a future run
-.SS "Freezing:"
-.TP
-\fB\-F\fR, \fB\-\-freeze\fR
-produce an M4 frozen state file for FILES
-.SH AUTHOR
-Written by Akim Demaille.
-.SH "REPORTING BUGS"
-Report bugs to <bug\-autoconf@gnu.org>.
-.SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
-.br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR autoconf (1),
-.BR automake (1),
-.BR autoreconf (1),
-.BR autoupdate (1),
-.BR autoheader (1),
-.BR autoscan (1),
-.BR config.guess (1),
-.BR config.sub (1),
-.BR ifnames (1),
-.BR libtool (1).
-.PP
-The Debian project regards the full documentation for
-.B autom4te
-to be non-free, so it is not included in Debian.  Nevertheless, the
-non-free distribution that accompanies Debian includes the manual in
-its
-.B autoconf-doc
-package.  Otherwise, you may be able to access the Autoconf manual
-online.
diff -Nru autoconf-2.69/debian/man/autoreconf.1 autoconf-2.69/debian/man/autoreconf.1
--- autoconf-2.69/debian/man/autoreconf.1	2012-04-28 17:01:35.000000000 +0000
+++ autoconf-2.69/debian/man/autoreconf.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-.TH AUTORECONF "1" "September 2005" "autoreconf 2.59" "User Commands"
-.SH NAME
-autoreconf \- Update generated configuration files
-.SH SYNOPSIS
-.B autoreconf
-[\fIOPTION\fR] ... [\fICONFIGURE-AC or DIRECTORY\fR] ...
-.SH DESCRIPTION
-Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint'
-(formerly `gettextize'), and `libtoolize' where appropriate)
-repeatedly to remake the GNU Build System files in the DIRECTORIES or
-the directory trees driven by CONFIGURE\-AC (defaulting to `.').
-.PP
-By default, it only remakes those files that are older than their
-predecessors.  If you install new versions of the GNU Build System,
-running `autoreconf' remakes all of the files by giving it the
-`\-\-force' option.
-.SS "Operation modes:"
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help, then exit
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print version number, then exit
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-verbosely report processing
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-don't remove temporary files
-.TP
-\fB\-f\fR, \fB\-\-force\fR
-consider all files obsolete
-.TP
-\fB\-i\fR, \fB\-\-install\fR
-copy missing auxiliary files
-.TP
-\fB\-s\fR, \fB\-\-symlink\fR
-with \fB\-i\fR, install symbolic links instead of copies
-.TP
-\fB\-m\fR, \fB\-\-make\fR
-when applicable, re\-run ./configure && make
-.TP
-\fB\-W\fR, \fB\-\-warnings\fR=\fICATEGORY\fR
-report the warnings falling in CATEGORY [syntax]
-.SS "Warning categories include:"
-.TP
-`cross'
-cross compilation issues
-.TP
-`gnu'
-GNU coding standards (default in gnu and gnits modes)
-.TP
-`obsolete'
-obsolete features or constructions
-.TP
-`override'
-user redefinitions of Automake rules or variables
-.TP
-`portability'
-portability issues
-.TP
-`syntax'
-dubious syntactic constructs (default)
-.TP
-`unsupported'
-unsupported or incomplete features (default)
-.TP
-`all'
-all the warnings
-.TP
-`no\-CATEGORY'
-turn off warnings in CATEGORY
-.TP
-`none'
-turn off all the warnings
-.TP
-`error'
-treat warnings as errors
-.PP
-The environment variable `WARNINGS' is honored.  Some subtools might
-support other warning types, using `all' is encouraged.
-.SS "Library directories:"
-.TP
-\fB\-B\fR, \fB\-\-prepend\-include\fR=\fIDIR\fR
-prepend directory DIR to search path
-.TP
-\fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-append directory DIR to search path
-.PP
-The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, ACLOCAL,
-AUTOPOINT, LIBTOOLIZE are honored.
-.SH AUTHOR
-Written by David J. MacKenzie and Akim Demaille.
-.SH "REPORTING BUGS"
-Report bugs to <bug\-autoconf@gnu.org>.
-.SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
-.br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR autoconf (1),
-.BR automake (1),
-.BR autoreconf (1),
-.BR autoupdate (1),
-.BR autoheader (1),
-.BR autoscan (1),
-.BR config.guess (1),
-.BR config.sub (1),
-.BR ifnames (1),
-.BR libtool (1).
-.PP
-The Debian project regards the full documentation for
-.B autoreconf
-to be non-free, so it is not included in Debian.  Nevertheless, the
-non-free distribution that accompanies Debian includes the manual in
-its
-.B autoconf-doc
-package.  Otherwise, you may be able to access the Autoconf manual
-online.
diff -Nru autoconf-2.69/debian/man/autoscan.1 autoconf-2.69/debian/man/autoscan.1
--- autoconf-2.69/debian/man/autoscan.1	2012-04-28 17:01:35.000000000 +0000
+++ autoconf-2.69/debian/man/autoscan.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-.TH AUTOSCAN "1" "September 2005" "autoscan 2.59" "User Commands"
-.SH NAME
-autoscan \- Generate a preliminary configure.in
-.SH SYNOPSIS
-.B autoscan
-[\fIOPTION\fR] ... [\fISRCDIR\fR]
-.SH DESCRIPTION
-Examine source files in the directory tree rooted at SRCDIR, or the
-current directory if none is given.  Search the source files for
-common portability problems, check for incompleteness of
-`configure.ac', and create a file `configure.scan' which is a
-preliminary `configure.ac' for that package.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help, then exit
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print version number, then exit
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-verbosely report processing
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-don't remove temporary files
-.SS "Library directories:"
-.TP
-\fB\-B\fR, \fB\-\-prepend\-include\fR=\fIDIR\fR
-prepend directory DIR to search path
-.TP
-\fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-append directory DIR to search path
-.SH AUTHOR
-Written by David J. MacKenzie and Akim Demaille.
-.SH "REPORTING BUGS"
-Report bugs to <bug\-autoconf@gnu.org>.
-.SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
-.br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR autoconf (1),
-.BR automake (1),
-.BR autoreconf (1),
-.BR autoupdate (1),
-.BR autoheader (1),
-.BR autoscan (1),
-.BR config.guess (1),
-.BR config.sub (1),
-.BR ifnames (1),
-.BR libtool (1).
-.PP
-The Debian project regards the full documentation for
-.B autoscan
-to be non-free, so it is not included in Debian.  Nevertheless, the
-non-free distribution that accompanies Debian includes the manual in
-its
-.B autoconf-doc
-package.  Otherwise, you may be able to access the Autoconf manual
-online.
diff -Nru autoconf-2.69/debian/man/autoupdate.1 autoconf-2.69/debian/man/autoupdate.1
--- autoconf-2.69/debian/man/autoupdate.1	2012-04-28 17:01:35.000000000 +0000
+++ autoconf-2.69/debian/man/autoupdate.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-.TH AUTOUPDATE "1" "September 2005" "autoupdate 2.59" "User Commands"
-.SH NAME
-autoupdate \- Update a configure.in to a newer Autoconf
-.SH SYNOPSIS
-.B autoupdate
-[\fIOPTION\fR] ...  [\fITEMPLATE-FILE\fR...]
-.SH DESCRIPTION
-Update the TEMPLATE\-FILE... if given, or `configure.ac' if present,
-or else `configure.in', to the syntax of the current version of
-Autoconf.  The original files are backed up.
-.SS "Operation modes:"
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help, then exit
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print version number, then exit
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-verbosely report processing
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-don't remove temporary files
-.TP
-\fB\-f\fR, \fB\-\-force\fR
-consider all files obsolete
-.SS "Library directories:"
-.TP
-\fB\-B\fR, \fB\-\-prepend\-include\fR=\fIDIR\fR
-prepend directory DIR to search path
-.TP
-\fB\-I\fR, \fB\-\-include\fR=\fIDIR\fR
-append directory DIR to search path
-.SH AUTHOR
-Written by David J. MacKenzie and Akim Demaille.
-.SH "REPORTING BUGS"
-Report bugs to <bug\-autoconf@gnu.org>.
-.SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
-.br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR autoconf (1),
-.BR automake (1),
-.BR autoreconf (1),
-.BR autoupdate (1),
-.BR autoheader (1),
-.BR autoscan (1),
-.BR config.guess (1),
-.BR config.sub (1),
-.BR ifnames (1),
-.BR libtool (1).
-.PP
-The Debian project regards the full documentation for
-.B autoupdate
-to be non-free, so it is not included in Debian.  Nevertheless, the
-non-free distribution that accompanies Debian includes the manual in
-its
-.B autoconf-doc
-package.  Otherwise, you may be able to access the Autoconf manual
-online.
diff -Nru autoconf-2.69/debian/man/config.guess.1 autoconf-2.69/debian/man/config.guess.1
--- autoconf-2.69/debian/man/config.guess.1	2012-04-28 17:01:35.000000000 +0000
+++ autoconf-2.69/debian/man/config.guess.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-.TH CONFIG.GUESS "1" "September 2005" "config.guess (2005-09-19)" "User Commands"
-.SH NAME
-config.guess \- guess the build system triplet
-.SH SYNOPSIS
-.B config.guess
-[\fIOPTION\fR]
-.SH DESCRIPTION
-The GNU build system distinguishes three types of machines, the
-`build' machine on which the compilers are run, the `host' machine
-on which the package being built will run, and, exclusively when you
-build a compiler, assembler etc., the `target' machine, for which the
-compiler being built will produce code.
-
-This script will guess the type of the `build' machine.
-.PP
-Output the configuration name of the system `config.guess' is run on.
-.SS "Operation modes:"
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help, then exit
-.TP
-\fB\-t\fR, \fB\-\-time\-stamp\fR
-print date of last modification, then exit
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-print version number, then exit
-.SH "ENVIRONMENT VARIABLES"
-config.guess might need to compile and run C code, hence it needs a
-compiler for the `build' machine: use the environment variable
-`CC_FOR_BUILD' to specify the compiler for the build machine.  If
-`CC_FOR_BUILD' is not specified, `CC' will be used.  Be sure to
-specify `CC_FOR_BUILD' is `CC' is a cross-compiler to the `host'
-machine.
-
-  CC_FOR_BUILD    a native C compiler, defaults to `cc'
-  CC              a native C compiler, the previous variable is preferred
-.SH "REPORTING BUGS"
-Report bugs and patches to <config\-patches@gnu.org>.
-.PP
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-.PP
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR autoconf (1),
-.BR automake (1),
-.BR autoreconf (1),
-.BR autoupdate (1),
-.BR autoheader (1),
-.BR autoscan (1),
-.BR config.guess (1),
-.BR config.sub (1),
-.BR ifnames (1),
-.BR libtool (1).
diff -Nru autoconf-2.69/debian/man/config.sub.1 autoconf-2.69/debian/man/config.sub.1
--- autoconf-2.69/debian/man/config.sub.1	2012-04-28 17:01:35.000000000 +0000
+++ autoconf-2.69/debian/man/config.sub.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-.TH CONFIG.SUB "1" "September 2005" "config.sub (2005-09-19)" "User Commands"
-.SH NAME
-config.sub \- validate and canonicalize a configuration triplet
-.SH SYNOPSIS
-.B config.sub
-[\fIOPTION\fR] \fICPU-MFR-OPSYS\fR
-.SH DESCRIPTION
-.IP
-\&../config/config.sub [OPTION] ALIAS
-.PP
-Canonicalize a configuration name.
-.SS "Operation modes:"
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help, then exit
-.TP
-\fB\-t\fR, \fB\-\-time\-stamp\fR
-print date of last modification, then exit
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-print version number, then exit
-.SH "REPORTING BUGS"
-Report bugs and patches to <config\-patches@gnu.org>.
-.SH COPYRIGHT
-Copyright \(co 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-.PP
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR autoconf (1),
-.BR automake (1),
-.BR autoreconf (1),
-.BR autoupdate (1),
-.BR autoheader (1),
-.BR autoscan (1),
-.BR config.guess (1),
-.BR config.sub (1),
-.BR ifnames (1),
-.BR libtool (1).
diff -Nru autoconf-2.69/debian/man/ifnames.1 autoconf-2.69/debian/man/ifnames.1
--- autoconf-2.69/debian/man/ifnames.1	2012-04-28 17:01:35.000000000 +0000
+++ autoconf-2.69/debian/man/ifnames.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-.TH IFNAMES "1" "September 2005" "ifnames 2.59" "User Commands"
-.SH NAME
-ifnames \- Extract CPP conditionals from a set of files
-.SH SYNOPSIS
-.B ifnames
-[\fIOPTION\fR] ...  [\fIFILE\fR] ...
-.SH DESCRIPTION
-Scan all of the C source FILES (or the standard input, if none are
-given) and write to the standard output a sorted list of all the
-identifiers that appear in those files in `#if', `#elif', `#ifdef', or
-`#ifndef' directives.  Print each identifier on a line, followed by a
-space\-separated list of the files in which that identifier occurs.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-print this help, then exit
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-print version number, then exit
-.SH AUTHOR
-Written by David J. MacKenzie and Paul Eggert.
-.SH "REPORTING BUGS"
-Report bugs to <bug\-autoconf@gnu.org>.
-.SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
-.br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "SEE ALSO"
-.BR autoconf (1),
-.BR automake (1),
-.BR autoreconf (1),
-.BR autoupdate (1),
-.BR autoheader (1),
-.BR autoscan (1),
-.BR config.guess (1),
-.BR config.sub (1),
-.BR ifnames (1),
-.BR libtool (1).
-.PP
-The Debian project regards the full documentation for
-.B ifnames
-to be non-free, so it is not included in Debian.  Nevertheless, the
-non-free distribution that accompanies Debian includes the manual in
-its
-.B autoconf-doc
-package.  Otherwise, you may be able to access the Autoconf manual
-online.
diff -Nru autoconf-2.69/debian/rules autoconf-2.69/debian/rules
--- autoconf-2.69/debian/rules	2014-02-09 18:41:44.000000000 +0000
+++ autoconf-2.69/debian/rules	2014-02-23 16:27:53.000000000 +0000
@@ -12,7 +12,9 @@
 override_dh_auto_configure:
 	# Ensure nothing tries to re-bootstrap Autoconf with itself.
 	touch configure `find . -name Makefile.in`
-	dh_auto_configure -- EMACS=no HELP2MAN="`pwd`/build-aux/missing --run help2man" --with-lispdir=
+	dh_auto_configure -- EMACS=no --with-lispdir=
+	# Force manpages to get rebuilt with correct version number.
+	touch man/*.x
 
 override_dh_auto_build:
 	dh_auto_build
@@ -26,7 +28,7 @@
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 ifneq ($(DEB_BUILD_PROFILE),stage1)
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp \
-	    install-html install-info install-pdf install-ps
+	    install-html install-info install-pdf install-ps install-man
 endif
 	perl -pi -e 's/^my \$$VERSION.*/my \$$VERSION = "'"`date`"'";/;' \
 	    debian/tmp/usr/share/autoconf/Autom4te/C4che.pm 
diff -Nru autoconf-2.69/debian/source/options autoconf-2.69/debian/source/options
--- autoconf-2.69/debian/source/options	1970-01-01 00:00:00.000000000 +0000
+++ autoconf-2.69/debian/source/options	2014-02-23 16:24:33.000000000 +0000
@@ -0,0 +1 @@
+extend-diff-ignore = "man/.*\.1$|doc/autoconf.info|doc/stamp-vti|doc/version.texi"