merge the various bin-*.win32.tlpsrc (but tlperl, tlgs, tlpsv) into

bin-winutils, and remove the old ones and remove it from collecton-wintools


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

7 files changed, 31 insertions, 40 deletions

diff --git a/Master/tlpkg/tlpsrc/bin-chktex.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-chktex.win32.tlpsrc
deleted file mode 100644
index f84801cc730..00000000000
--- a/Master/tlpkg/tlpsrc/bin-chktex.win32.tlpsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-name bin-chktex.win32
-category TLCore
-runpattern f texmf/chktex/*
-docpattern f texmf/doc/chktex/*
-binpattern f bin/win32/chktex.exe
diff --git a/Master/tlpkg/tlpsrc/bin-gzip.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-gzip.win32.tlpsrc
deleted file mode 100644
index 88c11361ed3..00000000000
--- a/Master/tlpkg/tlpsrc/bin-gzip.win32.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-name bin-gzip.win32
-category TLCore
-docpattern f texmf/doc/gzip/*
-docpattern f texmf/doc/info/gzip.info
-docpattern f texmf/doc/man/man1/gzip.1
-docpattern f texmf/doc/man/man1/gzip.1.html
-binpattern f bin/win32/gunzip.exe
-binpattern f bin/win32/gzip.exe
diff --git a/Master/tlpkg/tlpsrc/bin-jpeg2ps.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-jpeg2ps.win32.tlpsrc
deleted file mode 100644
index 7d2e2adc381..00000000000
--- a/Master/tlpkg/tlpsrc/bin-jpeg2ps.win32.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-name bin-jpeg2ps.win32
-category TLCore
-docpattern f texmf/doc/jpeg2ps/*
-binpattern f bin/win32/jpeg2ps.exe
diff --git a/Master/tlpkg/tlpsrc/bin-tifftools.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-tifftools.win32.tlpsrc
deleted file mode 100644
index 9b038e512cf..00000000000
--- a/Master/tlpkg/tlpsrc/bin-tifftools.win32.tlpsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-name bin-tifftools.win32
-category TLCore
-binpattern f bin/win32/tiff2png.exe
diff --git a/Master/tlpkg/tlpsrc/bin-winutils.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-winutils.win32.tlpsrc
index 091c3de4289..4a8e1442519 100644
--- a/Master/tlpkg/tlpsrc/bin-winutils.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-winutils.win32.tlpsrc
@@ -1,5 +1,6 @@
 name bin-winutils.win32
 category TLCore
+# original bin-winutils
 binpattern f bin/win32/aftopl.exe
 binpattern f bin/win32/bmeps.exe
 binpattern f bin/win32/cjpeg.exe
@@ -15,3 +16,33 @@ binpattern f bin/win32/tounix.exe
 binpattern f bin/win32/type1afm.exe
 binpattern f bin/win32/unzip.exe
 binpattern f bin/win32/wget.exe
+# from bin-chktex.win32
+runpattern f texmf/chktex/*
+docpattern f texmf/doc/chktex/*
+binpattern f bin/win32/chktex.exe
+# from bin-gzip.win32
+docpattern f texmf/doc/gzip/*
+docpattern f texmf/doc/info/gzip.info
+docpattern f texmf/doc/man/man1/gzip.1
+docpattern f texmf/doc/man/man1/gzip.1.html
+binpattern f bin/win32/gunzip.exe
+binpattern f bin/win32/gzip.exe
+# from bin-jpeg2ps.win32
+docpattern f texmf/doc/jpeg2ps/*
+binpattern f bin/win32/jpeg2ps.exe
+# from bin-tifftools.win32
+binpattern f bin/win32/tiff2png.exe
+# from bin-xpdf.win32
+docpattern f texmf/doc/man/man1/pdfimages.1
+docpattern f texmf/doc/man/man1/pdfimages.1.html
+docpattern f texmf/doc/man/man1/pdfinfo.1
+docpattern f texmf/doc/man/man1/pdfinfo.1.html
+docpattern f texmf/doc/man/man1/pdftops.1
+docpattern f texmf/doc/man/man1/pdftops.1.html
+docpattern f texmf/doc/man/man1/pdftotext.1
+docpattern f texmf/doc/man/man1/pdftotext.1.html
+binpattern f bin/win32/pdffonts.exe
+binpattern f bin/win32/pdfimages.exe
+binpattern f bin/win32/pdfinfo.exe
+binpattern f bin/win32/pdftops.exe
+binpattern f bin/win32/pdftotext.exe
diff --git a/Master/tlpkg/tlpsrc/bin-xpdf.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-xpdf.win32.tlpsrc
deleted file mode 100644
index 2f50af27cf7..00000000000
--- a/Master/tlpkg/tlpsrc/bin-xpdf.win32.tlpsrc
+++ /dev/null
@@ -1,15 +0,0 @@
-name bin-xpdf.win32
-category TLCore
-docpattern f texmf/doc/man/man1/pdfimages.1
-docpattern f texmf/doc/man/man1/pdfimages.1.html
-docpattern f texmf/doc/man/man1/pdfinfo.1
-docpattern f texmf/doc/man/man1/pdfinfo.1.html
-docpattern f texmf/doc/man/man1/pdftops.1
-docpattern f texmf/doc/man/man1/pdftops.1.html
-docpattern f texmf/doc/man/man1/pdftotext.1
-docpattern f texmf/doc/man/man1/pdftotext.1.html
-binpattern f bin/win32/pdffonts.exe
-binpattern f bin/win32/pdfimages.exe
-binpattern f bin/win32/pdfinfo.exe
-binpattern f bin/win32/pdftops.exe
-binpattern f bin/win32/pdftotext.exe
diff --git a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
index 90347adc01d..577e7ed1b13 100644
--- a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
@@ -3,9 +3,4 @@ category Collection
 shortdesc Windows support programs
 longdesc Utilities for Windows, since they are not readily available there:
 longdesc gzip, chktex, jpeg2ps, unzip, wget, xpdf.
-depend bin-chktex.win32
-depend bin-gzip.win32
-depend bin-jpeg2ps.win32
-depend bin-tifftools.win32
 depend bin-winutils.win32
-depend bin-xpdf.win32