collection-mathscience: merge c-mathextra and c-science, since they are small

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

5 files changed, 74 insertions, 80 deletions

diff --git a/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
deleted file mode 100644
index 321a8759a8c..00000000000
--- a/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
+++ /dev/null
@@ -1,75 +0,0 @@
-category Collection
-shortdesc Mathematics packages
-#
-depend collection-fontsrecommended
-depend collection-latex
-#
-depend 12many
-depend amstex
-depend autobreak
-depend backnaur
-depend begriff
-depend binomexp
-depend boldtensors
-depend bosisio
-depend bropd
-depend calculation
-depend ccfonts
-depend commath
-depend concmath
-depend concrete
-depend conteq
-depend delim
-depend delimseasy
-depend diffcoeff
-depend drawmatrix
-depend ebproof
-depend econometrics
-depend eqnarray
-depend extarrows
-depend extpfeil
-depend faktor
-depend grundgesetze
-depend interval
-depend ionumbers
-depend isomath
-depend logicproof
-depend lpform
-depend lplfitch
-depend mathcomp
-depend mathpartir
-depend mattens
-depend mgltex
-depend mhequ
-depend multiobjective
-depend natded
-depend nath
-depend ot-tableau
-depend oubraces
-depend perfectcut
-depend prftree
-depend prooftrees
-depend proba
-depend rec-thy
-depend ribbonproofs
-depend rmathbr
-depend sesamanuel
-depend shuffle
-depend skmath
-depend spalign
-depend statex
-depend statex2
-depend stmaryrd
-depend subsupscripts
-depend susy
-depend syllogism
-depend sympytexpackage
-depend synproof
-depend tablor
-depend tensor
-depend tex-ewd
-depend thmbox
-depend turnstile
-depend venn
-depend yhmath
-depend ytableau
diff --git a/Master/tlpkg/tlpsrc/collection-science.tlpsrc b/Master/tlpkg/tlpsrc/collection-mathscience.tlpsrc
index add6dd56b25..fedf531065d 100644
--- a/Master/tlpkg/tlpsrc/collection-science.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-mathscience.tlpsrc
@@ -1,19 +1,31 @@
 category Collection
-shortdesc Natural and computer sciences
+shortdesc Mathematics and science packages
 #
+depend collection-fontsrecommended
 depend collection-latex
 #
+depend 12many
 depend SIstyle
 depend SIunits
 depend alg
 depend algorithm2e
 depend algorithmicx
 depend algorithms
+depend amstex
+depend autobreak
+depend backnaur
+depend begriff
+depend binomexp
 depend biocon
 depend bitpattern
 depend bohr
+depend boldtensors
+depend bosisio
 depend bpchem
+depend bropd
 depend bytefield
+depend calculation
+depend ccfonts
 depend chemarrow
 depend chemcompounds
 depend chemcono
@@ -26,55 +38,113 @@ depend chemschemex
 depend chemstyle
 depend clrscode
 depend clrscode3e
+depend commath
 depend complexity
 depend computational-complexity
+depend concmath
+depend concrete
+depend conteq
 depend cryptocode
+depend delim
+depend delimseasy
+depend diffcoeff
 depend digiconfigs
+depend drawmatrix
 depend drawstack
 depend dyntree
+depend ebproof
+depend econometrics
 depend eltex
 depend emf
 depend endiagram
 depend engtlc
+depend eqnarray
+depend extarrows
+depend extpfeil
+depend faktor
 depend fouridx
 depend functan
 depend galois
 depend gastex
 depend gene-logic
 depend ghsystem
+depend grundgesetze
 depend gu
 depend hep
 depend hepnames
 depend hepparticles
 depend hepthesis
 depend hepunits
+depend interval
+depend ionumbers
+depend isomath
 depend karnaugh
 depend karnaughmap
+depend logicproof
+depend lpform
+depend lplfitch
 depend lstbayes
+depend mathcomp
+depend mathpartir
 depend matlab-prettifier
+depend mattens
+depend mgltex
 depend mhchem
+depend mhequ
 depend miller
+depend multiobjective
 depend mychemistry
+depend natded
+depend nath
 depend nuc
 depend nucleardata
 depend objectz
+depend ot-tableau
+depend oubraces
+depend perfectcut
 depend physics
+depend prftree
+depend proba
+depend prooftrees
 depend pseudocode
 depend pygmentex
+depend rec-thy
 depend revquantum
+depend ribbonproofs
+depend rmathbr
 depend sasnrdisplay
 depend sciposter
 depend sclang-prettifier
+depend sesamanuel
 depend sfg
+depend shuffle
 depend simpler-wick
 depend simplewick
 depend siunitx
+depend skmath
+depend spalign
+depend statex
+depend statex2
 depend steinmetz
+depend stmaryrd
 depend struktex
 depend substances
+depend subsupscripts
+depend susy
+depend syllogism
+depend sympytexpackage
+depend synproof
 depend t-angles
+depend tablor
+depend tensor
+depend tex-ewd
 depend textopo
+depend thmbox
+depend turnstile
 depend ulqda
 depend unitsdef
+depend venn
 depend xymtex
+depend yhmath
 depend youngtab
+depend ytableau
diff --git a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
index 7fd46f13f22..f6274556356 100644
--- a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
@@ -37,7 +37,7 @@ depend collection-latex
 depend collection-latexextra
 depend collection-latexrecommended
 depend collection-luatex
-depend collection-mathextra
+depend collection-mathscience
 depend collection-metapost
 depend collection-music
 depend collection-omega
@@ -45,6 +45,5 @@ depend collection-pictures
 depend collection-plainextra
 depend collection-pstricks
 depend collection-publishers
-depend collection-science
 depend collection-texworks
 depend collection-xetex
diff --git a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
index 18b6da9b46b..035570c5074 100644
--- a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
@@ -21,7 +21,7 @@ depend collection-langspanish
 depend collection-latex
 depend collection-latexrecommended
 depend collection-luatex
-depend collection-mathextra
+depend collection-mathscience
 depend collection-metapost
 depend collection-plainextra
 depend collection-texworks
diff --git a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
index f1f1d65d88d..dc5554db5e3 100644
--- a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
@@ -59,7 +59,7 @@ depend collection-langportuguese
 depend collection-langspanish
 depend collection-latex
 depend collection-latexrecommended
-depend collection-mathextra
+depend collection-mathscience
 depend collection-metapost
 depend collection-omega
 depend collection-pictures