-mepstopdf 2.11 (30sep09)

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

5 files changed, 9 insertions, 7 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 41221e80b74..6ce71dfdf89 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -92,7 +92,7 @@ my @WorkingTLP = qw(
           emptypage emulateapj emp encxvlna endfloat endheads
           engpron engrec enumitem envbig environ envlab
           epigrafica epigraph epiolmec eplain
-          epsdice epsf epsincl epslatex-fr epspdfconversion
+          epsdice epsf epsincl epslatex-fr epspdfconversion epstopdf
           eqexam eqlist eqparbox errata es-tex-faq
           ESIEEcv erdc esdiff esint esint-type1 eskd eskdx eso-pic esvect
           estcpmm
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 0184332cca6..2d6f0341470 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -213,7 +213,6 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'epix',	"die 'skipping, needs C++'",
  'eplain',	"&MAKEcopy",
  'epspdf',	"&MAKEflatten",
- 'epstopdf',	"die 'skipping, needs .pl vs. noext + man help, sorry'",
  'eqnarray',	"die 'skipping, nonfree'",
  'esindex',	"die 'skipping, use bezos instead'",
  'eskdx',	"&MAKEeskdx",
@@ -1430,7 +1429,7 @@ $standardxmt='\.xmt';
  'accfonts'		=> 'mkt1font|vpl2',
  'dviasm'		=> '\.py$',
  'epspdf'		=> '(epspdf(|\.help|boot|tk)|\.rb|makegray\.pro)$',
- 'epstopdf'		=> 'epstopdf',
+ 'epstopdf'		=> 'epstopdf\.pl',
  'fig4latex'		=> 'fig4latex',
  'findhyph'		=> 'findhyph$',
  'fragmaster'		=> 'fragmaster.pl',
@@ -1462,6 +1461,7 @@ $standardxmt='\.xmt';
 
 # packages which have man pages to install.  We assume section 1.
 %specialmans = (
+ 'epstopdf'		=> 'epstopdf.1',
  'findhyph'		=> 'findhyph.1',
  'pkfix-helper'		=> 'pkfix-helper.1',
  'purifyeps'		=> 'purifyeps.1',
@@ -1483,6 +1483,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'chemscheme'	=> "$standardclean|jawltxdoc.sty",	# temp file for doc
  'chemstyle'	=> "$standardclean|jawltxdoc.sty",	# temp file for doc
  'elvish'	=> '\.pk3',		# no pk files
+ 'epstopdf'	=> 'epstopdf\.pdf',	# we will generate
  'findhyph'	=> 'findhyph.pdf',	# we will generate from man ourselves
  'gentle'	=> 'gentle.ps.gz',	# pdf is enough
  'hyph-utf8'	=> 'README',
@@ -1525,7 +1526,8 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'piechartmp'	=> 'piechartmp.pdf',
  'pst-3dplot'	=> 'tb72voss3d.pdf',		# no source
  'ptptex'       => 'overcite.sty|cite.sty|wrapfig.sty', # duplicated
- 'stubs'	=> 'stubs.pdf',
+ 'rangen'	=> 'doc/rangen_man.pdf',		# no source
+ 'stubs'	=> 'stubs.pdf',			# no source
  'susy'		=> 'susy.pdf',			# no source
  'xskak'	=> 'xskak.pdf',			# no source
 );
diff --git a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
index ee295a4b373..9dbaefc904d 100644
--- a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
@@ -6,6 +6,7 @@ longdesc Manipulating OpenType, TrueType, PostScript Type 1, etc.
 depend collection-basic
 depend accfonts
 depend afm2pl
+depend epstopdf
 depend fontware
 depend lcdftypetools
 depend ps2pkm
diff --git a/Master/tlpkg/tlpsrc/epstopdf.tlpsrc b/Master/tlpkg/tlpsrc/epstopdf.tlpsrc
new file mode 100644
index 00000000000..231e8d80ce1
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/epstopdf.tlpsrc
@@ -0,0 +1,2 @@
+binpattern f bin/${ARCH}/epstopdf
+docpattern +f texmf/doc/man/man1/epstopdf.*
diff --git a/Master/tlpkg/tlpsrc/pdftools.tlpsrc b/Master/tlpkg/tlpsrc/pdftools.tlpsrc
index 54625634028..64f9563efda 100644
--- a/Master/tlpkg/tlpsrc/pdftools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftools.tlpsrc
@@ -1,7 +1,6 @@
 category TLCore
 shortdesc PDF-related utilities, including PostScript-to-PDF conversion
 binpattern f bin/${ARCH}/e2pall
-binpattern f bin/${ARCH}/epstopdf
 binpattern f bin/${ARCH}/pdfatfi
 binpattern f bin/${ARCH}/pdftosrc
 binpattern f bin/${ARCH}/ps4pdf
@@ -9,7 +8,5 @@ binpattern f bin/win32/pdfdde.exe
 binpattern f bin/${ARCH}/pdfclose
 binpattern f bin/${ARCH}/pdfopen
 docpattern f texmf/doc/man/man1/e2pall.*
-docpattern f texmf/doc/man/man1/epstopdf.*
 docpattern f texmf/doc/man/man1/pdftosrc.*
-runpattern f texmf/scripts/epstopdf/epstopdf.pl
 runpattern f texmf/scripts/tetex/e2pall.pl