autoconf-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU Autoconf source repository branch, master, updated. v2.63-155-


From: Eric Blake
Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-155-ga30e6f3
Date: Tue, 04 Nov 2008 13:37:08 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=a30e6f3f7714eda89d0d3a5369d537a6a42f05c3

The branch, master has been updated
       via  a30e6f3f7714eda89d0d3a5369d537a6a42f05c3 (commit)
      from  d5445543c50650c874a92775722d5cfbc20da648 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a30e6f3f7714eda89d0d3a5369d537a6a42f05c3
Author: Eric Blake <address@hidden>
Date:   Tue Nov 4 06:36:20 2008 -0700

    Upgrade to FDL 1.3.
    
    * cfg.mk (fetch): Add fdl-1.3.texi.
    * .gitattributes: Likewise.
    * doc/autoconf.texi (GNU Free Documentation License): Point to new
    upstream version.
    * doc/Makefile.am (autoconf_TEXINFOS): Likewise.
    (standards_TEXINFOS): Mention current dependence on older license.
    * doc/fdl-1.3.texi: New upstream file.
    * GNUmakefile: Resync from upstream.
    * build-aux/announce-gen: Likewise.
    * build-aux/texinfo.tex: Likewise.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 .gitattributes                 |    1 +
 ChangeLog                      |   14 +++++++
 GNUmakefile                    |    8 ++--
 build-aux/announce-gen         |   12 +++--
 build-aux/texinfo.tex          |   80 ++++++++++++++++++++++++++++++---------
 cfg.mk                         |    1 +
 doc/Makefile.am                |    4 +-
 doc/autoconf.texi              |    2 +-
 doc/{fdl.texi => fdl-1.3.texi} |   79 +++++++++++++++++++++++++++++++++------
 9 files changed, 158 insertions(+), 43 deletions(-)
 copy doc/{fdl.texi => fdl-1.3.texi} (86%)

diff --git a/.gitattributes b/.gitattributes
index 621e75b..82752b0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,5 +9,6 @@ mdate-sh        -whitespace
 missing                -whitespace
 texinfo.tex    -whitespace
 fdl.texi       -whitespace
+fdl-1.3.texi   -whitespace
 make-stds.texi -whitespace
 standards.texi -whitespace
diff --git a/ChangeLog b/ChangeLog
index 9024ea0..269eee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-11-04  Eric Blake  <address@hidden>
+
+       Upgrade to FDL 1.3.
+       * cfg.mk (fetch): Add fdl-1.3.texi.
+       * .gitattributes: Likewise.
+       * doc/autoconf.texi (GNU Free Documentation License): Point to new
+       upstream version.
+       * doc/Makefile.am (autoconf_TEXINFOS): Likewise.
+       (standards_TEXINFOS): Mention current dependence on older license.
+       * doc/fdl-1.3.texi: New upstream file.
+       * GNUmakefile: Resync from upstream.
+       * build-aux/announce-gen: Likewise.
+       * build-aux/texinfo.tex: Likewise.
+
 2008-11-03  Ralf Wildenhues  <address@hidden>
 
        Point at AM_SUBST_NOTMAKE.
diff --git a/GNUmakefile b/GNUmakefile
index 7816416..0fdd3fa 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -72,18 +72,18 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
           # should run 'autoreconf' (or something like 'make distcheck') to
           # fix the version, 'make all' to propagate it, then 'make install'.
           $(info WARNING: version string $(VERSION) is out of date;)
-          $(info run '$(MAKE) version' to fix it)
+          $(info run '$(MAKE) _version' to fix it)
         else
           $(info INFO: running autoreconf for new version string: $(_curr-ver))
-          _dummy := $(shell $(MAKE) $(AM_MAKEFLAGS) version)
+          _dummy := $(shell $(MAKE) $(AM_MAKEFLAGS) _version)
         endif
       endif
     endif
   endif
 endif
 
-.PHONY: version
-version:
+.PHONY: _version
+_version:
        cd $(srcdir) && rm -rf autom4te.cache .version && $(_autoreconf)
 
 else
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 385ce8c..6775665 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Generate a release announcement message.
 
-my $VERSION = '2008-06-02 08:18'; # UTC
+my $VERSION = '2008-10-10 05:12'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -92,10 +92,10 @@ The following are optional:
    --news=NEWS_FILE
    --bootstrap-tools=TOOL_LIST  a comma-separated list of tools, e.g.,
                                 autoconf,automake,bison,gnulib
-   --gnulib-snapshot-date=DATE  if gnulib is in the bootstrap tool list,
-                                then report this as the snapshot date.
-                                If not specified, use the current date/time.
-                                If you specify a date here, be sure it is UTC.
+   --gnulib-version=VERSION     report VERSION as the gnulib version, where
+                                VERSION is the result of running git describe
+                                in the gnulib source directory.
+                                required if gnulib is in TOOL_LIST.
 
    --help             display this help and exit
    --version          output version information and exit
@@ -432,6 +432,8 @@ sub get_tool_versions ($$)
   my $xd = "$package_name-$prev_version-$curr_version.xdelta";
 
   my @tarballs = grep {-f $_} ($tgz, $tbz, $lzma);
+  @tarballs
+    or die "$ME: none of $tgz, $tbz, or $lzma were found\n";
   my @sizable = @tarballs;
   -f $xd
     and push @sizable, $xd;
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index bac0726..1901d68 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2008-04-18.10}
+\def\texinfoversion{2008-10-30.07}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -926,6 +926,7 @@ where each line of input produces a line of output.}
   {%
     \makevalueexpandable  % we want to expand any @value in FILE.
     \turnoffactive        % and allow special characters in the expansion
+    \indexnofonts         % Allow `@@' and other weird things in file names.
     \edef\temp{\noexpand\input #1 }%
     %
     % This trickery is to read FILE outside of a group, in case it makes
@@ -2489,6 +2490,7 @@ end
 {
   \catcode`\-=\active \catcode`\_=\active
   \catcode`\'=\active \catcode`\`=\active
+  \global\let'=\rq \global\let`=\lq  % default definitions
   %
   \global\def\code{\begingroup
     \catcode\rquoteChar=\active \catcode\lquoteChar=\active
@@ -3874,11 +3876,11 @@ end
 \def\dosynindex#1#2#3{%
   % Only do \closeout if we haven't already done it, else we'll end up
   % closing the target index.
-  \expandafter \ifx\csname donesynindex#2\endcsname \undefined
+  \expandafter \ifx\csname donesynindex#2\endcsname \relax
     % The \closeout helps reduce unnecessary open files; the limit on the
     % Acorn RISC OS is a mere 16 files.
     \expandafter\closeout\csname#2indfile\endcsname
-    \expandafter\let\csname\donesynindex#2\endcsname = 1
+    \expandafter\let\csname donesynindex#2\endcsname = 1
   \fi
   % redefine \fooindfile:
   \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
@@ -5970,7 +5972,7 @@ end
 % we're doing normal filling.  So, when using \aboveenvbreak and
 % \afterenvbreak, temporarily make \parskip 0.
 %
-\envdef\quotation{%
+\def\quotationstart{%
   {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
   \parindent=0pt
   %
@@ -5985,6 +5987,17 @@ end
   \parsearg\quotationlabel
 }
 
+\envdef\quotation{%
+  \setnormaldispenv
+  \quotationstart
+}
+
+\envdef\smallquotation{%
+  \setsmalldispenv
+  \quotationstart
+}
+\let\Esmallquotation = \Equotation
+
 % We have retained a nonzero parskip for the environment, since we're
 % doing normal filling.
 %
@@ -6026,12 +6039,6 @@ end
 \def\uncatcodespecials{%
   \def\do##1{\catcode`##1=\other}\dospecials}
 %
-% [Knuth] pp. 380,381,391
-% Disable Spanish ligatures ?` and !` of \tt font
-\begingroup
-  \catcode`\`=\active\gdef`{\relax\lq}
-\endgroup
-%
 % Setup for the @verb command.
 %
 % Eight spaces for a tab
@@ -6081,7 +6088,7 @@ end
 \def\codequoteleft{%
   \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
     \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
-      `%
+      \relax`% the \relax disables the `! and `? ligatures
     \else \char'22 \fi
   \else \char'22 \fi
 }
@@ -6176,6 +6183,7 @@ end
   {%
     \makevalueexpandable
     \setupverbatim
+    \indexnofonts       % Allow `@@' and other weird things in file names.
     \input #1
     \afterenvbreak
   }%
@@ -7747,10 +7755,9 @@ end
 
 \message{localization,}
 
-% @documentlanguage is usually given very early, just after
-% @setfilename.  If done too late, it may not override everything
-% properly.  Single argument is the language (de) or locale (de_DE)
-% abbreviation.  It would be nice if we could set up a hyphenation file.
+% For single-language documents, @documentlanguage is usually given very
+% early, just after @documentencoding.  Single argument is the language
+% (de) or locale (de_DE) abbreviation.
 %
 {
   \catcode`\_ = \active
@@ -7763,10 +7770,11 @@ end
     \ifeof 1
       \documentlanguagetrywithoutunderscore{#1_\finish}%
     \else
+      \globaldefs = 1  % everything in the txi-LL files needs to persist
       \input txi-#1.tex
     \fi
     \closein 1
-  \endgroup
+  \endgroup % end raw TeX
 \endgroup}
 }
 %
@@ -7785,9 +7793,36 @@ end
 }
 %
 \newhelp\nolanghelp{The given language definition file cannot be found or
-is empty.  Maybe you need to install it?  In the current directory
-should work if nowhere else does.}
+is empty.  Maybe you need to install it?  Putting it in the current
+directory should work if nowhere else does.}
 
+% This macro is called from txi-??.tex files; the first argument is the
+% \language name to set (without the "\lang@" prefix), the second and
+% third args are \{left,right}hyphenmin.
+% 
+% The language names to pass are determined when the format is built.
+% See the etex.log file created at that time, e.g.,
+% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log.
+% 
+% With TeX Live 2008, etex now includes hyphenation patterns for all
+% available languages.  This means we can support hyphenation in
+% Texinfo, at least to some extent.  (This still doesn't solve the
+% accented characters problem.)
+% 
address@hidden
+\def\txisetlanguage#1#2#3{%
+  % do not set the language if the name is undefined in the current TeX.
+  \expandafter\ifx\csname address@hidden \relax
+    \message{no patterns for #1}%
+  \else
+    \global\language = \csname address@hidden
+  \fi
+  % but there is no harm in adjusting the hyphenmin values regardless.
+  \global\lefthyphenmin = #2\relax
+  \global\righthyphenmin = #3\relax
+}
+
+% Helpers for encodings.
 % Set the catcode of characters 128 through 255 to the specified number.
 %
 \def\setnonasciicharscatcode#1{%
@@ -8981,7 +9016,14 @@ should work if nowhere else does.}
 @address@hidden = @other
 @address@hidden = @other
 
-
address@hidden Finally, make ` and ' active, so that txicodequoteundirected and
address@hidden txicodequotebacktick work right in, e.g., @address@hidden'}}.  
If we
address@hidden don't make ` and ' active, @code will not get them as active 
chars.
address@hidden Do this last of all since we use ` in the previous @catcode 
assignments.
address@hidden (not ready yet, sigh)
address@hidden atcode`@'address@hidden @let'@rq
address@hidden address@hidden@active @address@hidden
+ 
 @c Local variables:
 @c eval: (add-hook 'write-file-hooks 'time-stamp)
 @c page-delimiter: "^\\\\message"
diff --git a/cfg.mk b/cfg.mk
index c4bbb4f..d5db0b7 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -57,6 +57,7 @@ fetch:
        cp $(gnulib_dir)/build-aux/vc-list-files $(srcdir)/build-aux
        cp $(gnulib_dir)/build-aux/texinfo.tex $(srcdir)/build-aux
        cp $(gnulib_dir)/doc/fdl.texi $(srcdir)/doc
+       cp $(gnulib_dir)/doc/fdl-1.3.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/make-stds.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/standards.texi $(srcdir)/doc
        cp $(gnulib_dir)/top/GNUmakefile $(srcdir)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0744add..a823959 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,8 +21,8 @@ TEXI2HTML_FLAGS = -split_chapter
 TEXINFO_TEX = ../build-aux/texinfo.tex
 
 info_TEXINFOS = autoconf.texi standards.texi
-autoconf_TEXINFOS = fdl.texi install.texi
-standards_TEXINFOS = make-stds.texi
+autoconf_TEXINFOS = fdl-1.3.texi install.texi
+standards_TEXINFOS = fdl.texi make-stds.texi
 
 # Files from texi2dvi that should be removed, but which Automake does
 # not know.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 20fd9a0..bc46d77 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -22483,7 +22483,7 @@ have free time again.  I think.  Yeah, right.)
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 
address@hidden fdl.texi
address@hidden fdl-1.3.texi
 
 @node Indices
 @appendix Indices
diff --git a/doc/fdl.texi b/doc/fdl-1.3.texi
similarity index 86%
copy from doc/fdl.texi
copy to doc/fdl-1.3.texi
index 96ce74e..8805f1a 100644
--- a/doc/fdl.texi
+++ b/doc/fdl-1.3.texi
@@ -1,12 +1,12 @@
 @c The GNU Free Documentation License.
address@hidden Version 1.2, November 2002
address@hidden Version 1.3, 3 November 2008
 
 @c This file is intended to be included within another document,
 @c hence no sectioning command or @node.
 
 @display
-Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, 
Inc.
address@hidden://fsf.org/}
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -111,6 +111,9 @@ formats which do not have any title page as such, ``Title 
Page'' means
 the text near the most prominent appearance of the work's title,
 preceding the beginning of the body of the text.
 
+The ``publisher'' means any person or entity that distributes copies
+of the Document to the public.
+
 A section ``Entitled XYZ'' means a named subunit of the Document whose
 title either is precisely XYZ or contains XYZ in parentheses following
 text that translates XYZ in another language.  (Here XYZ stands for a
@@ -379,13 +382,30 @@ title.
 @item
 TERMINATION
 
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
 
 @item
 FUTURE REVISIONS OF THIS LICENSE
@@ -403,7 +423,42 @@ following the terms and conditions either of that 
specified version or
 of any later version that has been published (not as a draft) by the
 Free Software Foundation.  If the Document does not specify a version
 number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
+as a draft) by the Free Software Foundation.  If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
address@hidden
+RELICENSING
+
+``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works.  A
+public wiki that anybody can edit is an example of such a server.  A
+``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the
+site means any set of copyrightable works thus published on the MMC
+site.
+
+``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
+published by that same organization.
+
+``Incorporate'' means to publish or republish a Document, in whole or
+in part, as part of another Document.
+
+An MMC is ``eligible for relicensing'' if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole
+or in part into the MMC, (1) had no cover texts or invariant sections,
+and (2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+
 @end enumerate
 
 @page
@@ -417,7 +472,7 @@ license notices just after the title page:
 @group
   Copyright (C)  @var{year}  @var{your name}.
   Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.2
+  under the terms of the GNU Free Documentation License, Version 1.3
   or any later version published by the Free Software Foundation;
   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
   Texts.  A copy of the license is included in the section entitled ``GNU


hooks/post-receive
--
GNU Autoconf source repository




reply via email to

[Prev in Thread] Current Thread [Next in Thread]