9 files changed, 54 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index a4e678ab3b7..f771d52268a 100644
--- a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
+++ b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
diff --git a/Master/texmf-dist/source/latex/pdfpages/README b/Master/texmf-dist/source/latex/pdfpages/README
index 3d734620295..923d56bcf45 100644
--- a/Master/texmf-dist/source/latex/pdfpages/README
+++ b/Master/texmf-dist/source/latex/pdfpages/README
@@ -13,27 +13,33 @@ this package to insert PostScript files, in addition to PDF files.
 
 INSTALLATION:
 
-To install this package, unzip pdfpages-tds.zip into your TeX-tree,
-e.g.:
+An easy way to install this package is to download the TDS-packaged
+zip file form
 
-   unzip -d /usr/local/TL2007/texmf-local/ pdfpages-tds.zip
+   CTAN:install/macros/latex/contrib/pdfpages.tds.zip
 
+and to unzip this file into your TeX-tree, e.g.:
 
-To create and install the files manually, proceed as follows:
+   unzip -d /usr/local/TL2008/texmf-local/  pdfpages.tds.zip
+
+That's all you have to do.
+
+
+Only if you want to extract and install the files manually, proceed
+as follows:
 
  * Run `latex pdfpages.ins' to produce the LaTeX files
  * Run `latex pdfpages.dtx' to produce the documentation
  * Move the files into appropriate directories searched by LaTeX.
 
 
+LICENSE:
+
 This work may be distributed and/or modified under the conditions
-of the LaTeX Project Public License, either version 1.3 of this
+of the LaTeX Project Public License, either version 1.3c of this
 license or (at your option) any later version.
 The latest version of this license is in
-  <http://www.latex-project.org/lppl.txt>
-and version 1.3 or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
-
+  <http://www.latex-project.org/lppl.txt>.
 
 
                                 Andreas MATTHIAS
diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
index 259ab056cf3..742c898c047 100644
--- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
+++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
@@ -5,12 +5,10 @@
 %% Copyright (C) 2001-2006 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3
+%% of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%%   <http://www.latex-project.org/lppl.txt>.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -29,10 +27,10 @@
 %<*dtx>
 \makeatletter
 %</dtx>
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
 \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 %</!(example1,example2,example3,installer)>
 %
 %
@@ -78,7 +76,7 @@
 %
 %    \GetFileInfo{pdfpages.dtx}
 %
-%    \CheckSum{4225}
+%    \CheckSum{4250}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3435,11 +3433,15 @@
     \AM@currentdocname\AM@XeTeXquote\relax}%
 }
 %    \end{macrocode}
+%    |\XeTeXversion| has changed from time to time: 0.997, 0.997-dev,
+%    0.998.1
 %    \begin{macrocode}
 \begingroup
+\def\gobble@nil#1\@nil{}
 \ifnum\XeTeXversion=0
-  \edef\temp{\expandafter\@gobble\XeTeXrevision}
-  \ifnum\temp<997
+  \afterassignment\gobble@nil
+  \count@\expandafter\@gobble\XeTeXrevision.\@nil
+  \ifnum\count@<997
     \PackageError{pdfpages}
     {Package pdfpages requires at least XeTeX-0.997}
     {Update your TeX distribution!}
@@ -3804,6 +3806,10 @@
 %    \item Support of \XeTeX.
 %    \end{itemize}
 %
+%    \subsection*{2008/04/27 v0.4d}
+%    \begin{itemize}
+%    \item A more robust check of |\XeTeXversion|.
+%    \end{itemize}
 %
 %    \Finale
 %
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 72ba894904c..5630b73ac98 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -11,12 +11,10 @@
 %% Copyright (C) 2001-2006 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3
+%% of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%%   <http://www.latex-project.org/lppl.txt>.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
 \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@filedate\space\AM@fileversion\space
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 4782b9f2258..9b437ff0139 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -11,12 +11,10 @@
 %% Copyright (C) 2001-2006 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3
+%% of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%%   <http://www.latex-project.org/lppl.txt>.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
 \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \ProvidesFile{ppnull.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages dummy driver (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index dc9c03569ce..41ba99490e1 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -11,12 +11,10 @@
 %% Copyright (C) 2001-2006 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3
+%% of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%%   <http://www.latex-project.org/lppl.txt>.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
 \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \ProvidesFile{pppdftex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for pdfTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index 0955985d642..b1faf628c5c 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -11,12 +11,10 @@
 %% Copyright (C) 2001-2006 Andreas MATTHIAS
 %%
 %% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3
+%% of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%%   <http://www.latex-project.org/lppl.txt>.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,10 +24,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
 \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \ProvidesFile{ppvtex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for VTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
index ebde43c152b..38d50fe2424 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -12,10 +12,10 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4c}
+\def\AM@fileversion{v0.4d}
 \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
 \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2008-04-01 17:31:14 +0200 (Tue, 01 Apr 2008) $
+\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $
 \ProvidesFile{ppxetex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]
@@ -36,9 +36,11 @@
     \AM@currentdocname\AM@XeTeXquote\relax}%
 }
 \begingroup
+\def\gobble@nil#1\@nil{}
 \ifnum\XeTeXversion=0
-  \edef\temp{\expandafter\@gobble\XeTeXrevision}
-  \ifnum\temp<997
+  \afterassignment\gobble@nil
+  \count@\expandafter\@gobble\XeTeXrevision.\@nil
+  \ifnum\count@<997
     \PackageError{pdfpages}
     {Package pdfpages requires at least XeTeX-0.997}
     {Update your TeX distribution!}
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 1201748e8eb..9e8dec5859e 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -104,7 +104,8 @@ my @WorkingTLP = qw(
         kalender kerkis kerntest keystroke koma-script kpfonts
         l2picfaq l2tabu-english l2tabu-spanish
           labbook labelcas labels lastpage latex latex-tds latexmp
-          layouts lcd lcg leading leaflet ledmac leftidx lewis lfb lgreek lh
+          layouts lcd lcg leading leaflet ledmac leftidx lettrine
+          lewis lfb lgreek lh
           libertine limap linearA lineno linguex
           lipsum listings listliketab lkproof lm
           logpap lps lsc lshort-bulgarian lshort-dutch lshort-english