combine update (2sep09)

git-svn-id: svn://tug.org/texlive/trunk@15054 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 32 insertions, 37 deletions

diff --git a/Master/texmf-dist/source/latex/combine/combine.dtx b/Master/texmf-dist/source/latex/combine/combine.dtx
index aa2cb2ecaf7..c6f7c2c870c 100644
--- a/Master/texmf-dist/source/latex/combine/combine.dtx
+++ b/Master/texmf-dist/source/latex/combine/combine.dtx
@@ -1,20 +1,17 @@
 % \iffalse meta-comment
 %
 % combine.dtx
-% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-%                            (or at: pandgwilson at earthlink dot net) 
+% Author: Peter Wilson, Herries Press
+% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 % Copyright 2000, 2001, 2002, 2003, 2004 Peter R. Wilson
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any 
-% later version.
-% The latest version of the license is in
-%    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2003/06/01 or later.
+% version 1.3c of this license or (at your option) any 
+% later version: <http://www.latex-project.org/lppl.txt>
 %
-% This work has the LPPL maintenance status "author-maintained".
+% This work has the LPPL maintenance status "maintained".
+% The Current Maintainer of this work is Will Robertson.
 %
 % This work consists of the files listed in the README file.
 %
@@ -99,6 +96,7 @@
 % \changes{v0.63}{2003/11/09}{Added the combcite package}
 % \changes{v0.64}{2004/03/06}{Minor change to combinet package}
 % \changes{v0.64a}{2004/05/07}{Minor change to the abstract}
+% \changes{v0.64b}{2009/09/02}{New maintainer (Will Robertson)}
 %
 % \def\dtxfilename{\texttt{combine.dtx}}
 % ^^A \def\fileversion{v0.3}
@@ -120,6 +118,7 @@
 % \def\fileversion{v0.63} \def\filedate{2003/11/09}
 % \def\fileversion{v0.64} \def\filedate{2004/03/06}
 % \def\fileversion{v0.64a} \def\filedate{2004/05/07}
+% \def\fileversion{v0.64b} \def\filedate{2009/09/02}
 % \newcommand*{\Lpack}[1]{\textsf {#1}}           ^^A typeset a package
 % \newcommand*{\Lopt}[1]{\textsf {#1}}            ^^A typeset an option
 % \newcommand*{\file}[1]{\texttt {#1}}            ^^A typeset a file
@@ -132,12 +131,13 @@
 %       has version number \fileversion, last revised \filedate.}}
 %
 % \author{%
-% Peter Wilson\thanks{Dick Nickalls (\texttt{dicknickalls@compuserve.com})
+% Peter Wilson, Herries Press^^A
+%   \thanks{Dick Nickalls (\texttt{dicknickalls@compuserve.com})
 %   provided several requirements and suggestions.
 %   He also very helpfully tested earlier experimental versions.}\\
-% Catholic University of America \\
-% Now at \texttt{peter.r.wilson@boeing.com}\thanks{After May 2004 at
-%  \texttt{pandgwilson at earthlink dot net}}
+% \\~
+% Maintainer: Will Robertson\\
+% \texttt{will dot robertson at latex-project dot org}%
 % }
 % \date{\filedate}
 % \maketitle
diff --git a/Master/texmf-dist/source/latex/combine/combine.ins b/Master/texmf-dist/source/latex/combine/combine.ins
index 9808a4b38ba..7e0b2e3ac13 100644
--- a/Master/texmf-dist/source/latex/combine/combine.ins
+++ b/Master/texmf-dist/source/latex/combine/combine.ins
@@ -1,18 +1,15 @@
 %% combine.ins
-%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-%%                            (or at: pandgwilson at earthlink dot net) 
+%% Author: Peter Wilson, Herries Press
+%% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %% Copyright 2000, 2003, 2004 Peter R. Wilson
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
-%% version 1.3 of this license or (at your option) any 
-%% later version.
-%% The latest version of the license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
+%% version 1.3c of this license or (at your option) any 
+%% later version: <http://www.latex-project.org/lppl.txt>
 %%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "maintained".
+%% The Current Maintainer of this work is Will Robertson.
 %%
 %% This work consists of the files listed in the README file.
 %%
@@ -29,39 +26,37 @@
 \input docstrip.tex
 \preamble
 
-  Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com
-                             (or at: pandgwilson at earthlink dot net) 
+  Author: Peter Wilson, Herries Press
+  Maintainer: Will Robertson (will dot robertson at latex-project dot org)
   Copyright 2000, 2001, 2002, 2003 Peter R. Wilson
  
   This work may be distributed and/or modified under the
   conditions of the LaTeX Project Public License, either
-  version 1.3 of this license or (at your option) any 
-  later version.
-  The latest version of the license is in
-     http://www.latex-project.org/lppl.txt
-  and version 1.3 or later is part of all distributions of
-  LaTeX version 2003/06/01 or later.
- 
-  This work has the LPPL maintenance status "author-maintained".
+  version 1.3c of this license or (at your option) any 
+  later version: <http://www.latex-project.org/lppl.txt>
+
+  This work has the LPPL maintenance status "maintained".
+  The Current Maintainer of this work is Will Robertson.
  
   This work consists of the files listed in the README file.
 
 \endpreamble
 
+\askforoverwritefalse
 \keepsilent
 
 %%% \Msg{*** Generating the driver file ***}
-%%% \generateFile{combine.drv}{t}{\from{combine.dtx}{driver}}
+%%% \generate{\file{combine.drv}{\from{combine.dtx}{driver}}}
 
 \Msg{*** Generating the LaTeX2e class file ***}
 
-\generateFile{combine.cls}{t}{\from{combine.dtx}{usc}}
+\generate{\file{combine.cls}{\from{combine.dtx}{usc}}}
 
 \Msg{*** Generating the LaTeX2e package files ***}
 
-\generateFile{combinet.sty}{t}{\from{combine.dtx}{pck}}
-\generateFile{combnat.sty}{t}{\from{combine.dtx}{natpack}}
-\generateFile{combcite.sty}{t}{\from{combine.dtx}{citepack}}
+\generate{\file{combinet.sty}{\from{combine.dtx}{pck}}}
+\generate{\file{combnat.sty}{\from{combine.dtx}{natpack}}}
+\generate{\file{combcite.sty}{\from{combine.dtx}{citepack}}}
 
 \Msg{***********************************************************}
 \Msg{*}