2 files changed, 112 insertions, 128 deletions

diff --git a/Master/tlpkg/texlive.pkgver b/Master/tlpkg/texlive.pkgver
index e45b1f2e3d0..4c4d71b9316 100644
--- a/Master/tlpkg/texlive.pkgver
+++ b/Master/tlpkg/texlive.pkgver
@@ -1242,22 +1242,22 @@ bin-texinfo.sparc-linux 7340
 bin-texinfo.sparc-solaris 7340
 bin-texinfo.win32 7340
 bin-texinfo.x86_64-linux 7340
-bin-texlive 7369
-bin-texlive.alpha-linux 7369
-bin-texlive.hppa-hpux 7369
-bin-texlive.i386-darwin 7369
-bin-texlive.i386-freebsd 7369
-bin-texlive.i386-linux 7369
-bin-texlive.i386-openbsd 7369
-bin-texlive.i386-solaris 7369
-bin-texlive.mips-irix 7369
-bin-texlive.powerpc-aix 7369
-bin-texlive.powerpc-darwin 7369
-bin-texlive.powerpc-linux 7369
-bin-texlive.sparc-linux 7369
-bin-texlive.sparc-solaris 7369
-bin-texlive.win32 7369
-bin-texlive.x86_64-linux 7369
+bin-texlive 7382
+bin-texlive.alpha-linux 7382
+bin-texlive.hppa-hpux 7382
+bin-texlive.i386-darwin 7382
+bin-texlive.i386-freebsd 7382
+bin-texlive.i386-linux 7382
+bin-texlive.i386-openbsd 7382
+bin-texlive.i386-solaris 7382
+bin-texlive.mips-irix 7382
+bin-texlive.powerpc-aix 7382
+bin-texlive.powerpc-darwin 7382
+bin-texlive.powerpc-linux 7382
+bin-texlive.sparc-linux 7382
+bin-texlive.sparc-solaris 7382
+bin-texlive.win32 7382
+bin-texlive.x86_64-linux 7382
 bin-texsis 7340
 bin-texsis.alpha-linux 7340
 bin-texsis.hppa-hpux 7340
@@ -1652,7 +1652,7 @@ collection-langukenglish 5384
 collection-langvietnamese 5228
 collection-latex 5288
 collection-latex3 5228
-collection-latexextra 7272
+collection-latexextra 7383
 collection-latexrecommended 6522
 collection-mathextra 6313
 collection-metapost 6041
@@ -1710,7 +1710,7 @@ cryst 7340
 cs 7340
 cslatex 7340
 csplain 7340
-csquotes 7340
+csquotes 7380
 ctable 7340
 ctib 7340
 cuisine 7340
@@ -2298,22 +2298,22 @@ misc 7340
 misc209 7340
 mkind-english 7340
 mkind-german 7340
-mkjobtexmf 7367
-mkjobtexmf.alpha-linux 7367
-mkjobtexmf.hppa-hpux 7367
-mkjobtexmf.i386-darwin 7367
-mkjobtexmf.i386-freebsd 7367
-mkjobtexmf.i386-linux 7367
-mkjobtexmf.i386-openbsd 7367
-mkjobtexmf.i386-solaris 7367
-mkjobtexmf.mips-irix 7367
-mkjobtexmf.powerpc-aix 7367
-mkjobtexmf.powerpc-darwin 7367
-mkjobtexmf.powerpc-linux 7367
-mkjobtexmf.sparc-linux 7367
-mkjobtexmf.sparc-solaris 7367
-mkjobtexmf.win32 7367
-mkjobtexmf.x86_64-linux 7367
+mkjobtexmf 7382
+mkjobtexmf.alpha-linux 7382
+mkjobtexmf.hppa-hpux 7382
+mkjobtexmf.i386-darwin 7382
+mkjobtexmf.i386-freebsd 7382
+mkjobtexmf.i386-linux 7382
+mkjobtexmf.i386-openbsd 7382
+mkjobtexmf.i386-solaris 7382
+mkjobtexmf.mips-irix 7382
+mkjobtexmf.powerpc-aix 7382
+mkjobtexmf.powerpc-darwin 7382
+mkjobtexmf.powerpc-linux 7382
+mkjobtexmf.sparc-linux 7382
+mkjobtexmf.sparc-solaris 7382
+mkjobtexmf.win32 7382
+mkjobtexmf.x86_64-linux 7382
 mkpattern 7340
 mla-paper 7340
 mlist 7340
@@ -2323,7 +2323,6 @@ moderncv 7340
 modroman 7340
 mongolian-babel 7340
 montex 7340
-morehelp 7340
 moresize 7340
 moreverb 7340
 movie15 7340
@@ -2437,22 +2436,22 @@ pdf-forms-tutorial-de 7340
 pdf-forms-tutorial-en 7340
 pdf-trans 7340
 pdfcprot 7340
-pdfcrop 7371
-pdfcrop.alpha-linux 7371
-pdfcrop.hppa-hpux 7371
-pdfcrop.i386-darwin 7371
-pdfcrop.i386-freebsd 7371
-pdfcrop.i386-linux 7371
-pdfcrop.i386-openbsd 7371
-pdfcrop.i386-solaris 7371
-pdfcrop.mips-irix 7371
-pdfcrop.powerpc-aix 7371
-pdfcrop.powerpc-darwin 7371
-pdfcrop.powerpc-linux 7371
-pdfcrop.sparc-linux 7371
-pdfcrop.sparc-solaris 7371
-pdfcrop.win32 7371
-pdfcrop.x86_64-linux 7371
+pdfcrop 7381
+pdfcrop.alpha-linux 7381
+pdfcrop.hppa-hpux 7381
+pdfcrop.i386-darwin 7381
+pdfcrop.i386-freebsd 7381
+pdfcrop.i386-linux 7381
+pdfcrop.i386-openbsd 7381
+pdfcrop.i386-solaris 7381
+pdfcrop.mips-irix 7381
+pdfcrop.powerpc-aix 7381
+pdfcrop.powerpc-darwin 7381
+pdfcrop.powerpc-linux 7381
+pdfcrop.sparc-linux 7381
+pdfcrop.sparc-solaris 7381
+pdfcrop.win32 7381
+pdfcrop.x86_64-linux 7381
 pdfpages 7361
 pdfscreen 7340
 pdfslide 7340
diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index 57d1edadb81..f949aaaa576 100644
--- a/Master/tlpkg/texlive.tlpdb
+++ b/Master/tlpkg/texlive.tlpdb
@@ -20563,120 +20563,121 @@ binfiles arch=x86_64-linux size=274
 
 name bin-texlive
 category TLCore
-revision 7369
+revision 7382
 depend texlive-infra
 depend 0texlive.support
 depend bin-texlive.ARCH
-runfiles size=11
+runfiles size=13
  texmf/fmtutil/fmtutil-hdr.cnf
  texmf/scripts/texlive/generate-fmtutil.pl
  texmf/scripts/texlive/generate-language.pl
  texmf/scripts/texlive/generate-updmap.pl
  texmf/scripts/texlive/tl-package-manager.pl
+ texmf/scripts/texlive/tlmgr.texlua
  texmf/scripts/texlive/uninstall-tl.pl
  texmf/web2c/updmap-hdr.cfg
 
 name bin-texlive.alpha-linux
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for alpha-linux
 binfiles arch=alpha-linux size=1
  bin/alpha-linux/tlmgr
 
 name bin-texlive.hppa-hpux
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for hppa-hpux
 binfiles arch=hppa-hpux size=1
  bin/hppa-hpux/tlmgr
 
 name bin-texlive.i386-darwin
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for i386-darwin
 binfiles arch=i386-darwin size=1
  bin/i386-darwin/tlmgr
 
 name bin-texlive.i386-freebsd
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for i386-freebsd
 binfiles arch=i386-freebsd size=1
  bin/i386-freebsd/tlmgr
 
 name bin-texlive.i386-linux
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for i386-linux
 binfiles arch=i386-linux size=1
  bin/i386-linux/tlmgr
 
 name bin-texlive.i386-openbsd
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for i386-openbsd
 binfiles arch=i386-openbsd size=1
  bin/i386-openbsd/tlmgr
 
 name bin-texlive.i386-solaris
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for i386-solaris
 binfiles arch=i386-solaris size=1
  bin/i386-solaris/tlmgr
 
 name bin-texlive.mips-irix
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for mips-irix
 binfiles arch=mips-irix size=1
  bin/mips-irix/tlmgr
 
 name bin-texlive.powerpc-aix
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for powerpc-aix
 binfiles arch=powerpc-aix size=1
  bin/powerpc-aix/tlmgr
 
 name bin-texlive.powerpc-darwin
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for powerpc-darwin
 binfiles arch=powerpc-darwin size=1
  bin/powerpc-darwin/tlmgr
 
 name bin-texlive.powerpc-linux
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for powerpc-linux
 binfiles arch=powerpc-linux size=1
  bin/powerpc-linux/tlmgr
 
 name bin-texlive.sparc-linux
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for sparc-linux
 binfiles arch=sparc-linux size=1
  bin/sparc-linux/tlmgr
 
 name bin-texlive.sparc-solaris
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for sparc-solaris
 binfiles arch=sparc-solaris size=1
  bin/sparc-solaris/tlmgr
 
 name bin-texlive.win32
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for win32
 binfiles arch=win32 size=1
  bin/win32/tlmgr.texlua
 
 name bin-texlive.x86_64-linux
 category TLCore
-revision 7369
+revision 7382
 shortdesc binary files of bin-texlive for x86_64-linux
 binfiles arch=x86_64-linux size=1
  bin/x86_64-linux/tlmgr
@@ -31524,7 +31525,7 @@ depend collection-latex
 
 name collection-latexextra
 category Collection
-revision 7272
+revision 7383
 shortdesc LaTeX supplementary packages
 longdesc A large collection of add-on packages for LaTeX.
 depend AkkTeX
@@ -31831,7 +31832,6 @@ depend mla-paper
 depend mlist
 depend moderncv
 depend modroman
-depend morehelp
 depend moresize
 depend moreverb
 depend movie15
@@ -35385,7 +35385,7 @@ catalogue-license other-free
 
 name csquotes
 category Package
-revision 7340
+revision 7380
 shortdesc Context sensitive quotation facilities.
 longdesc This package provides advanced facilities for inline and
 longdesc display quotations. It is designed for a wide range of tasks
@@ -35401,7 +35401,7 @@ longdesc in the humanities and the social sciences. All quote styles as
 longdesc well as the optional active quotes are freely configurable. The
 longdesc package is dependent on e-TeX, and requires the author’s
 longdesc etoolbox package.
-docfiles size=92
+docfiles size=93
  texmf-dist/doc/latex/csquotes/LICENSE
  texmf-dist/doc/latex/csquotes/README details="Package README"
  texmf-dist/doc/latex/csquotes/csquotes.pdf details="Tutorial on use of the package"
@@ -35410,8 +35410,8 @@ runfiles size=18
  texmf-dist/tex/latex/csquotes/csquotes.cfg
  texmf-dist/tex/latex/csquotes/csquotes.def
  texmf-dist/tex/latex/csquotes/csquotes.sty
-catalogue-version 4.0
-catalogue-date 2008-03-02 19:57:32 +0100
+catalogue-version 4.1
+catalogue-date 2008-04-11 20:18:22 +0200
 catalogue-ctan /macros/latex/contrib/csquotes
 catalogue-license lppl
 
@@ -63765,7 +63765,7 @@ runfiles size=4
 
 name mkjobtexmf
 category Package
-revision 7367
+revision 7382
 shortdesc Generate a texmf tree for a particular job.
 longdesc The progam mkjobtexmf runs a program and tries to find the used
 longdesc file names. Two methods are available, option "-recorder" of
@@ -63774,7 +63774,13 @@ longdesc directory with a texmf tree. It checks the found files and
 longdesc tries sort them in this texmf tree. It can be used for
 longdesc archiving purposes or to speed up following TeX runs.
 depend mkjobtexmf.ARCH
-docfiles size=4
+docfiles size=44
+ texmf-dist/doc/generic/mkjobtexmf/README
+ texmf-dist/doc/generic/mkjobtexmf/mkjobtexmf.html
+ texmf-dist/doc/generic/mkjobtexmf/mkjobtexmf.ltx
+ texmf-dist/doc/generic/mkjobtexmf/mkjobtexmf.man
+ texmf-dist/doc/generic/mkjobtexmf/mkjobtexmf.pdf details="Package documentation"
+ texmf-dist/doc/generic/mkjobtexmf/mkjobtexmf.txt details="Readme"
  texmf/doc/man/man1/mkjobtexmf.1
 srcfiles size=21
  texmf-dist/source/generic/mkjobtexmf/Makefile.in
@@ -63790,79 +63796,79 @@ catalogue-license artistic
 
 name mkjobtexmf.alpha-linux
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for alpha-linux
 
 name mkjobtexmf.hppa-hpux
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for hppa-hpux
 
 name mkjobtexmf.i386-darwin
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for i386-darwin
 
 name mkjobtexmf.i386-freebsd
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for i386-freebsd
 
 name mkjobtexmf.i386-linux
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for i386-linux
 binfiles arch=i386-linux size=5
  bin/i386-linux/mkjobtexmf
 
 name mkjobtexmf.i386-openbsd
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for i386-openbsd
 
 name mkjobtexmf.i386-solaris
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for i386-solaris
 
 name mkjobtexmf.mips-irix
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for mips-irix
 
 name mkjobtexmf.powerpc-aix
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for powerpc-aix
 
 name mkjobtexmf.powerpc-darwin
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for powerpc-darwin
 
 name mkjobtexmf.powerpc-linux
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for powerpc-linux
 
 name mkjobtexmf.sparc-linux
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for sparc-linux
 
 name mkjobtexmf.sparc-solaris
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for sparc-solaris
 
 name mkjobtexmf.win32
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for win32
 
 name mkjobtexmf.x86_64-linux
 category Package
-revision 7367
+revision 7382
 shortdesc binary files of mkjobtexmf for x86_64-linux
 
 name mkpattern
@@ -64669,27 +64675,6 @@ catalogue-date 2007-01-04 23:51:59 +0100
 catalogue-ctan /language/mongolian/montex
 catalogue-license gpl
 
-name morehelp
-category Package
-revision 7340
-shortdesc Improve LaTeX error messages.
-longdesc The package enhances LaTeX2e error messages by providing
-longdesc descriptions of the possible causes including those that may
-longdesc not be obvious. This style is effectively an online substitute
-longdesc for error lists found in the LaTeX books, although it cannot
-longdesc completely replace them. Only true LaTeX errors are included:
-longdesc TeX errors are beyond the reach of ordinary macros.
-docfiles size=2
- texmf-dist/doc/latex/morehelp/morehelp.README
-runfiles size=5
- texmf-dist/tex/latex/morehelp/morehelp.dyn
- texmf-dist/tex/latex/morehelp/morehelp.eng
- texmf-dist/tex/latex/morehelp/morehelp.sty
-catalogue-version 0.1alpha
-catalogue-date 2006-12-15 22:34:26 +0100
-catalogue-ctan /macros/latex/contrib/morehelp
-catalogue-license other
-
 name moresize
 category Package
 revision 7340
@@ -69566,7 +69551,7 @@ catalogue-license lppl
 
 name pdfcrop
 category Package
-revision 7371
+revision 7381
 shortdesc Crop PDF graphics.
 longdesc A Perl script that can either trim pages of any whitespace
 longdesc border, or trim them of a fixed border.
@@ -69582,105 +69567,105 @@ catalogue-license lppl
 
 name pdfcrop.alpha-linux
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for alpha-linux
 binfiles arch=alpha-linux size=3
  bin/alpha-linux/pdfcrop
 
 name pdfcrop.hppa-hpux
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for hppa-hpux
 binfiles arch=hppa-hpux size=3
  bin/hppa-hpux/pdfcrop
 
 name pdfcrop.i386-darwin
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for i386-darwin
 binfiles arch=i386-darwin size=3
  bin/i386-darwin/pdfcrop
 
 name pdfcrop.i386-freebsd
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for i386-freebsd
 binfiles arch=i386-freebsd size=3
  bin/i386-freebsd/pdfcrop
 
 name pdfcrop.i386-linux
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for i386-linux
 binfiles arch=i386-linux size=1
  bin/i386-linux/pdfcrop
 
 name pdfcrop.i386-openbsd
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for i386-openbsd
 binfiles arch=i386-openbsd size=3
  bin/i386-openbsd/pdfcrop
 
 name pdfcrop.i386-solaris
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for i386-solaris
 binfiles arch=i386-solaris size=3
  bin/i386-solaris/pdfcrop
 
 name pdfcrop.mips-irix
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for mips-irix
 binfiles arch=mips-irix size=3
  bin/mips-irix/pdfcrop
 
 name pdfcrop.powerpc-aix
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for powerpc-aix
 binfiles arch=powerpc-aix size=3
  bin/powerpc-aix/pdfcrop
 
 name pdfcrop.powerpc-darwin
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for powerpc-darwin
 binfiles arch=powerpc-darwin size=3
  bin/powerpc-darwin/pdfcrop
 
 name pdfcrop.powerpc-linux
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for powerpc-linux
 binfiles arch=powerpc-linux size=3
  bin/powerpc-linux/pdfcrop
 
 name pdfcrop.sparc-linux
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for sparc-linux
 binfiles arch=sparc-linux size=3
  bin/sparc-linux/pdfcrop
 
 name pdfcrop.sparc-solaris
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for sparc-solaris
 binfiles arch=sparc-solaris size=3
  bin/sparc-solaris/pdfcrop
 
 name pdfcrop.win32
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for win32
 binfiles arch=win32 size=2
  bin/win32/pdfcrop.exe
 
 name pdfcrop.x86_64-linux
 category Package
-revision 7371
+revision 7381
 shortdesc binary files of pdfcrop for x86_64-linux
 binfiles arch=x86_64-linux size=3
  bin/x86_64-linux/pdfcrop