merge collection-fontbin into collection-fontutils, remove c-fontbin,

update all schemes to contain only fontutils if one of the two have
been used before


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

8 files changed, 19 insertions, 25 deletions

diff --git a/Master/tlpkg/tlpsrc/collection-fontbin.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontbin.tlpsrc
deleted file mode 100644
index 3cd8e44ba2e..00000000000
--- a/Master/tlpkg/tlpsrc/collection-fontbin.tlpsrc
+++ /dev/null
@@ -1,13 +0,0 @@
-name collection-fontbin
-category Collection
-shortdesc TeX font-related programs
-longdesc Programs for conversion between font formats, testing fonts,
-longdesc virtual fonts, .gf and .pk manipulation, mft, fontinst, etc.
-depend accfonts
-depend fontinst
-depend fontools
-depend mft
-depend afm2pl
-depend bin-fontware
-depend bin-ps2pkm
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
index 3f6e4515625..3553d37c2e3 100644
--- a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
@@ -1,11 +1,21 @@
 name collection-fontutils
 category Collection
-shortdesc Extra font utilities
-longdesc Manipulating OpenType, TrueType, PostScript Type 1, etc., files.
-depend dvipsconfig
-depend getafm
+shortdesc TeX and Outline font utilities
+longdesc Programs for conversion between font formats, testing fonts,
+longdesc virtual fonts, .gf and .pk manipulation, mft, fontinst, etc.
+longdesc Manipulating OpenType, TrueType, PostScript Type 1, etc.
+depend collection-basic
+depend accfonts
+depend afm2pl
+depend bin-fontware
 depend bin-lcdftypetools
+depend bin-ps2pkm
 depend bin-pstools
 depend bin-psutils
+depend dvipsconfig
+depend fontinst
+depend fontools
+depend getafm
+depend mft
 depend t1utils
 depend ttfutils
diff --git a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
index a5cc63308b6..4f30ef70e59 100644
--- a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
@@ -30,7 +30,6 @@ depend collection-documentation-thai
 depend collection-documentation-turkish
 depend collection-documentation-ukrainian
 depend collection-documentation-vietnamese
-depend collection-fontbin
 depend collection-fontsextra
 depend collection-fontsrecommended
 depend collection-formatsextra
diff --git a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
index 25db11d7e17..63e234d3db4 100644
--- a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
@@ -33,12 +33,11 @@ depend texdoc
 depend collection-basic
 depend collection-context
 depend collection-documentation-polish
-depend collection-fontbin
+depend collection-fontutils
 depend collection-fontsrecommended
 depend collection-genericrecommended
 depend collection-langpolish
 depend collection-latex
 depend collection-latexrecommended
 depend collection-metapost
-depend collection-fontutils
 depend collection-xetex
diff --git a/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc
index d689e6c9c57..934066f43f5 100644
--- a/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gutenberg.tlpsrc
@@ -10,7 +10,7 @@ depend collection-binextra
 depend collection-context
 depend collection-documentation-english
 depend collection-documentation-french
-depend collection-fontbin
+depend collection-fontutils
 depend collection-fontsextra
 depend collection-fontsrecommended
 depend collection-genericextra
@@ -26,5 +26,4 @@ depend collection-metapost
 depend collection-pictures
 depend collection-plainextra
 depend collection-pstricks
-depend collection-fontutils
 depend collection-texinfo
diff --git a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
index 5abc19681a0..73ea8938266 100644
--- a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
@@ -8,7 +8,7 @@ depend collection-basic
 depend collection-binextra
 depend collection-context
 depend collection-documentation-english
-depend collection-fontbin
+depend collection-fontutils
 depend collection-fontsrecommended
 depend collection-langczechslovak
 depend collection-langdutch
diff --git a/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc b/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc
index 84b44e176a8..e265aebcbfc 100644
--- a/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-omega.tlpsrc
@@ -6,7 +6,7 @@ longdesc relatives on multilingual scripts.
 depend collection-basic
 depend collection-binextra
 depend collection-documentation-english
-depend collection-fontbin
+depend collection-fontutils
 depend collection-fontsrecommended
 depend collection-langafrican
 depend collection-langarmenian
diff --git a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
index 693c3944300..086a72c0ab5 100644
--- a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
@@ -50,7 +50,7 @@ depend tex-refs
 depend collection-basic
 depend collection-context
 depend collection-documentation-base
-depend collection-fontbin
+depend collection-fontutils
 depend collection-fontsrecommended
 depend collection-genericrecommended
 depend collection-langcjk