2 files changed, 99 insertions, 82 deletions

diff --git a/Master/tlpkg/texlive.pkgver b/Master/tlpkg/texlive.pkgver
index 2e10725afc4..444a5ded6e0 100644
--- a/Master/tlpkg/texlive.pkgver
+++ b/Master/tlpkg/texlive.pkgver
@@ -1,6 +1,6 @@
 00texlive.config 6235
 00texlive.core 6599
-00texlive.installer 6889
+00texlive.installer 6933
 12many 4479
 ANUfinalexam 5380
 AkkTeX 5484
@@ -1227,22 +1227,22 @@ bin-texconfig.sparc-linux 6663
 bin-texconfig.sparc-solaris 6663
 bin-texconfig.win32 6663
 bin-texconfig.x86_64-linux 6663
-bin-texcount 6451
-bin-texcount.alpha-linux 6451
-bin-texcount.hppa-hpux 6451
-bin-texcount.i386-darwin 6451
-bin-texcount.i386-freebsd 6451
-bin-texcount.i386-linux 6451
-bin-texcount.i386-openbsd 6451
-bin-texcount.i386-solaris 6451
-bin-texcount.mips-irix 6451
-bin-texcount.powerpc-aix 6451
-bin-texcount.powerpc-darwin 6451
-bin-texcount.powerpc-linux 6451
-bin-texcount.sparc-linux 6451
-bin-texcount.sparc-solaris 6451
-bin-texcount.win32 6451
-bin-texcount.x86_64-linux 6451
+bin-texcount 6936
+bin-texcount.alpha-linux 6936
+bin-texcount.hppa-hpux 6936
+bin-texcount.i386-darwin 6936
+bin-texcount.i386-freebsd 6936
+bin-texcount.i386-linux 6936
+bin-texcount.i386-openbsd 6936
+bin-texcount.i386-solaris 6936
+bin-texcount.mips-irix 6936
+bin-texcount.powerpc-aix 6936
+bin-texcount.powerpc-darwin 6936
+bin-texcount.powerpc-linux 6936
+bin-texcount.sparc-linux 6936
+bin-texcount.sparc-solaris 6936
+bin-texcount.win32 6936
+bin-texcount.x86_64-linux 6936
 bin-texdoc 6894
 bin-texdoc.alpha-linux 6894
 bin-texdoc.hppa-hpux 6894
@@ -1405,22 +1405,22 @@ bin-web.sparc-linux 5403
 bin-web.sparc-solaris 5403
 bin-web.win32 5403
 bin-web.x86_64-linux 5403
-bin-winutils 5759
-bin-winutils.alpha-linux 5759
-bin-winutils.hppa-hpux 5759
-bin-winutils.i386-darwin 5759
-bin-winutils.i386-freebsd 5759
-bin-winutils.i386-linux 5759
-bin-winutils.i386-openbsd 5759
-bin-winutils.i386-solaris 5759
-bin-winutils.mips-irix 5759
-bin-winutils.powerpc-aix 5759
-bin-winutils.powerpc-darwin 5759
-bin-winutils.powerpc-linux 5759
-bin-winutils.sparc-linux 5759
-bin-winutils.sparc-solaris 5759
-bin-winutils.win32 5759
-bin-winutils.x86_64-linux 5759
+bin-winutils 6939
+bin-winutils.alpha-linux 6939
+bin-winutils.hppa-hpux 6939
+bin-winutils.i386-darwin 6939
+bin-winutils.i386-freebsd 6939
+bin-winutils.i386-linux 6939
+bin-winutils.i386-openbsd 6939
+bin-winutils.i386-solaris 6939
+bin-winutils.mips-irix 6939
+bin-winutils.powerpc-aix 6939
+bin-winutils.powerpc-darwin 6939
+bin-winutils.powerpc-linux 6939
+bin-winutils.sparc-linux 6939
+bin-winutils.sparc-solaris 6939
+bin-winutils.win32 6939
+bin-winutils.x86_64-linux 6939
 bin-wordcount 5228
 bin-wordcount.alpha-linux 5228
 bin-wordcount.hppa-hpux 5228
@@ -1603,8 +1603,8 @@ codepage 4479
 collection-basic 6913
 collection-basicbin 6896
 collection-bibtexextra 6147
-collection-binextra 6834
-collection-context 6913
+collection-binextra 6937
+collection-context 6938
 collection-documentation-base 6912
 collection-documentation-bulgarian 5228
 collection-documentation-chinese 5228
@@ -2494,7 +2494,7 @@ plnfss 4479
 plweb 4479
 pmgraph 4479
 poemscol 4675
-polski 5828
+polski 6935
 polyglot 4479
 polynom 4479
 polynomial 4479
@@ -2627,7 +2627,7 @@ scale 4479
 scalebar 4479
 schedule 4479
 scheme-basic 5228
-scheme-context 5228
+scheme-context 6938
 scheme-full 6905
 scheme-gust 5983
 scheme-gutenberg 5228
@@ -2759,6 +2759,7 @@ tex-refs 4479
 tex-virtual-academy-pl 4479
 tex4ht 5974
 texbytopic 5126
+texcount 6936
 texdraw 4479
 texilikecover 4479
 texinfo 6883
diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index d36a87ff1e5..30f2df97a61 100644
--- a/Master/tlpkg/texlive.tlpdb
+++ b/Master/tlpkg/texlive.tlpdb
@@ -35,7 +35,7 @@ runfiles size=92
 
 name 00texlive.installer
 category TLCore
-revision 6889
+revision 6933
 runfiles size=87
  config.guess
  install-tl.html
@@ -20367,84 +20367,84 @@ binfiles arch=x86_64-linux size=11
 
 name bin-texcount
 category TLCore
-revision 6451
+revision 6936
 depend bin-texcount.ARCH
 
 name bin-texcount.alpha-linux
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for alpha-linux
 
 name bin-texcount.hppa-hpux
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for hppa-hpux
 
 name bin-texcount.i386-darwin
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for i386-darwin
 
 name bin-texcount.i386-freebsd
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for i386-freebsd
 
 name bin-texcount.i386-linux
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for i386-linux
-binfiles arch=i386-linux size=6
+binfiles arch=i386-linux size=1
  bin/i386-linux/texcount
 
 name bin-texcount.i386-openbsd
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for i386-openbsd
 
 name bin-texcount.i386-solaris
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for i386-solaris
 
 name bin-texcount.mips-irix
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for mips-irix
 
 name bin-texcount.powerpc-aix
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for powerpc-aix
 
 name bin-texcount.powerpc-darwin
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for powerpc-darwin
 
 name bin-texcount.powerpc-linux
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for powerpc-linux
 
 name bin-texcount.sparc-linux
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for sparc-linux
 
 name bin-texcount.sparc-solaris
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for sparc-solaris
 
 name bin-texcount.win32
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for win32
 
 name bin-texcount.x86_64-linux
 category TLCore
-revision 6451
+revision 6936
 shortdesc binary files of bin-texcount for x86_64-linux
 
 name bin-texdoc
@@ -23518,86 +23518,94 @@ binfiles arch=x86_64-linux size=55
 
 name bin-winutils
 category TLCore
-revision 5759
+revision 6939
 depend bin-winutils.ARCH
 
 name bin-winutils.alpha-linux
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for alpha-linux
 
 name bin-winutils.hppa-hpux
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for hppa-hpux
 
 name bin-winutils.i386-darwin
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for i386-darwin
 
 name bin-winutils.i386-freebsd
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for i386-freebsd
 
 name bin-winutils.i386-linux
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for i386-linux
 
 name bin-winutils.i386-openbsd
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for i386-openbsd
 
 name bin-winutils.i386-solaris
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for i386-solaris
 
 name bin-winutils.mips-irix
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for mips-irix
 
 name bin-winutils.powerpc-aix
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for powerpc-aix
 
 name bin-winutils.powerpc-darwin
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for powerpc-darwin
 
 name bin-winutils.powerpc-linux
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for powerpc-linux
 
 name bin-winutils.sparc-linux
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for sparc-linux
 
 name bin-winutils.sparc-solaris
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for sparc-solaris
 
 name bin-winutils.win32
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for win32
-binfiles arch=win32 size=573
+binfiles arch=win32 size=581
  bin/win32/aftopl.exe
  bin/win32/bmeps.exe
  bin/win32/cjpeg.exe
  bin/win32/djpeg.exe
+ bin/win32/eps2eps.texlua
  bin/win32/jbig2.exe
  bin/win32/mkbitmap.exe
  bin/win32/nkf.exe
+ bin/win32/pdf2dsc.texlua
+ bin/win32/pdfopt.texlua
+ bin/win32/ps2ascii.texlua
+ bin/win32/ps2pdf.texlua
+ bin/win32/ps2pdf12.texlua
+ bin/win32/ps2pdf13.texlua
+ bin/win32/ps2pdf14.texlua
  bin/win32/sam2p.exe
  bin/win32/texview.exe
  bin/win32/todos.exe
@@ -23609,7 +23617,7 @@ binfiles arch=win32 size=573
 
 name bin-winutils.x86_64-linux
 category TLCore
-revision 5759
+revision 6939
 shortdesc binary files of bin-winutils for x86_64-linux
 
 name bin-wordcount
@@ -30611,7 +30619,7 @@ depend collection-latex
 
 name collection-binextra
 category Collection
-revision 6834
+revision 6937
 shortdesc TeX auxiliary programs
 longdesc Various useful, but non-essential, support programs. Includes
 longdesc programs and macros for DVI file manipulation, literate
@@ -30639,7 +30647,6 @@ depend bin-texdoc
 depend bin-texware
 depend bin-tie
 depend bin-tpic2pdftex
-depend bin-vpe
 depend bin-web
 depend cweb
 depend hyphenex
@@ -30647,12 +30654,11 @@ depend mkind-english
 
 name collection-context
 category Collection
-revision 6913
+revision 6938
 shortdesc ConTeXt format
 longdesc Hans Hagen's powerful ConTeXt system, http://pragma-ade.com.
 depend context
 depend jmn
-depend lm
 depend lmextra
 depend bin-context
 depend collection-basic
@@ -71103,7 +71109,7 @@ catalogue-license lppl
 
 name polski
 category Package
-revision 5828
+revision 6935
 shortdesc Typeset Polish documents with LaTeX and Polish fonts.
 longdesc Tools to typeset documents in Polish using LaTeX2e with Polish
 longdesc fonts (the so-called PL fonts), EC fonts or CM fonts. (This
@@ -71145,8 +71151,8 @@ runfiles size=24
  texmf-dist/tex/latex/polski/plprefix.sty
  texmf-dist/tex/latex/polski/polski.sty
  texmf-dist/tex/latex/polski/qxenc.def
-catalogue-version 1.3.2
-catalogue-date 2008-01-01 12:15:57 +0100
+catalogue-version 1.3.3
+catalogue-date 2008-03-10 21:45:44 +0100
 catalogue-ctan /macros/latex/contrib/polski
 catalogue-license lppl
 
@@ -75381,10 +75387,10 @@ depend collection-latex
 
 name scheme-context
 category Scheme
-revision 5228
+revision 6938
 shortdesc TeX Live scheme for ConTeXt
-longdesc This is the ConTeXt TeX Live scheme: it is a small set of files
-longdesc sufficient to typeset ConTeXt documents in PostScript or PDF.
+longdesc This is the TeX Live scheme for installing ConTeXt.
+depend lm
 depend collection-context
 depend collection-metapost
 depend collection-xetex
@@ -83847,6 +83853,16 @@ docfiles size=559
  texmf-doc/doc/english/texbytopic/tables.tex
  texmf-doc/doc/english/texbytopic/tex.bib
 
+name texcount
+category Package
+revision 6936
+docfiles size=42
+ texmf-dist/doc/support/texcount/README
+ texmf-dist/doc/support/texcount/TeXcount.pdf
+ texmf-dist/doc/support/texcount/TeXcount.tex
+runfiles size=7
+ texmf-dist/scripts/texcount/TeXcount.pl
+
 name texdraw
 category Package
 revision 4479