Various tpm moves

what 		from		to
fpl		fontsextra	fontsrecommended
mathpazo	mathextra	fontsrecommended
charter		fontsextra	fontsrecommended
rsfs		fontsextra	fontsrecommended
prosper		latexrec	latexextra
HA-prosper	latexrec	latexextra
beamer		latexextra	latexrec
powerdot	latexextra	latexrec
jurabib		langgerman	bibtexextra
juramisc	latexextra	langgerman
jurarsp		latexextra	langgerman
juraabbrev	latexextra	langgerman
mhequ		latexextra	mathextra
ogonek		latexextra	langpolish
uhrzeit		latexextra	langgerman
IEEEconf	latexextra	publishers
aastex		latexextra	publishers
apa		latexextra	publishers
asaetr		latexextra	publishers
ascelike	latexextra	publishers
gatech-thesis	latexextra	publishers
imac		latexextra	publishers
jhep		latexextra	publishers
jpsj		latexextra	publishers
muthesis	latexextra	publishers
nature		latexextra	publishers
osa		latexextra	publishers
ptptex		latexextra	publishers
sae		latexextra	publishers
siggraph	latexextra	publishers
uaclasses	latexextra	publishers
ucthesis	latexextra	publishers
uiucthesis	latexextra	publishers
umich-thesis	latexextra	publishers
york-thesis	latexextra	publishers


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

9 files changed, 36 insertions, 36 deletions

diff --git a/Master/texmf/tpm/collection-bibtexextra.tpm b/Master/texmf/tpm/collection-bibtexextra.tpm
index bf394fc665f..861a29da407 100644
--- a/Master/texmf/tpm/collection-bibtexextra.tpm
+++ b/Master/texmf/tpm/collection-bibtexextra.tpm
@@ -32,6 +32,7 @@ Additional, extensive libraries of BibTeX styles and bibliographies.
       <TPM:Package name="harvmac"/>
       <TPM:Package name="inlinebib"/>
       <TPM:Package name="iopart-num"/>
+      <TPM:Package name="jurabib"/>
       <TPM:Package name="listbib"/>
       <TPM:Package name="multibib"/>
       <TPM:Package name="perception"/>
diff --git a/Master/texmf/tpm/collection-fontsextra.tpm b/Master/texmf/tpm/collection-fontsextra.tpm
index 25678b81447..4f44bb86f9b 100644
--- a/Master/texmf/tpm/collection-fontsextra.tpm
+++ b/Master/texmf/tpm/collection-fontsextra.tpm
@@ -44,7 +44,6 @@
       <TPM:Package name="braille"/>
       <TPM:Package name="brushscr"/>
       <TPM:Package name="calligra"/>
-      <TPM:Package name="charter"/>
       <TPM:Package name="cherokee"/>
       <TPM:Package name="cirth"/>
       <TPM:Package name="clarendo"/>
@@ -74,7 +73,6 @@
       <TPM:Package name="euxm"/>
       <TPM:Package name="feyn"/>
       <TPM:Package name="fourier"/>
-      <TPM:Package name="fpl"/>
       <TPM:Package name="frcursive"/>
       <TPM:Package name="futhark"/>
       <TPM:Package name="garamond"/>
@@ -126,7 +124,6 @@
       <TPM:Package name="phonetic"/>
       <TPM:Package name="psafm"/>
       <TPM:Package name="punk"/>
-      <TPM:Package name="rsfs"/>
       <TPM:Package name="sauter"/>
       <TPM:Package name="sauterfonts"/>
       <TPM:Package name="semaphor"/>
diff --git a/Master/texmf/tpm/collection-fontsrecommended.tpm b/Master/texmf/tpm/collection-fontsrecommended.tpm
index a065ebd733d..323f9200cf4 100644
--- a/Master/texmf/tpm/collection-fontsrecommended.tpm
+++ b/Master/texmf/tpm/collection-fontsrecommended.tpm
@@ -18,6 +18,7 @@
       <TPM:Package name="adobeuro"/>
       <TPM:Package name="avantgar"/>
       <TPM:Package name="bookman"/>
+      <TPM:Package name="charter"/>
       <TPM:Package name="cmextra"/>
       <TPM:Package name="courier"/>
       <TPM:Package name="euro"/>
@@ -25,13 +26,16 @@
       <TPM:Package name="eurofont"/>
       <TPM:Package name="eurosans"/>
       <TPM:Package name="eurosym"/>
+      <TPM:Package name="fpl"/>
       <TPM:Package name="helvetic"/>
       <TPM:Package name="marvosym"/>
+      <TPM:Package name="mathpazo"/>
       <TPM:Package name="mathtime"/>
       <TPM:Package name="ncntrsbk"/>
       <TPM:Package name="palatino"/>
       <TPM:Package name="psnfssx"/>
       <TPM:Package name="pxfonts"/>
+      <TPM:Package name="rsfs"/>
       <TPM:Package name="symbol"/>
       <TPM:Package name="times"/>
       <TPM:Package name="timesnew"/>
diff --git a/Master/texmf/tpm/collection-langgerman.tpm b/Master/texmf/tpm/collection-langgerman.tpm
index 5f5d80e183b..b940cffac95 100644
--- a/Master/texmf/tpm/collection-langgerman.tpm
+++ b/Master/texmf/tpm/collection-langgerman.tpm
@@ -18,9 +18,12 @@
       <TPM:Package name="german"/>
       <TPM:Package name="germbib"/>
       <TPM:Package name="jura"/>
-      <TPM:Package name="jurabib"/>
+      <TPM:Package name="juraabbrev"/>
+      <TPM:Package name="juramisc"/>
+      <TPM:Package name="jurarsp"/>
       <TPM:Package name="mkind-german"/>
       <TPM:Package name="r-und-s"/>
+      <TPM:Package name="uhrzeit"/>
       <TPM:Package name="umlaute"/>
       <TPM:TLCore name="collection-basic"/>
       <TPM:TLCore name="hyphen-german"/>
diff --git a/Master/texmf/tpm/collection-langpolish.tpm b/Master/texmf/tpm/collection-langpolish.tpm
index b16b9e1970f..4194e1875eb 100644
--- a/Master/texmf/tpm/collection-langpolish.tpm
+++ b/Master/texmf/tpm/collection-langpolish.tpm
@@ -24,6 +24,7 @@ Pick this if you want Polish fonts and other packages
       <TPM:Package name="iwona"/>
       <TPM:Package name="mex"/>
       <TPM:Package name="mwcls"/>
+      <TPM:Package name="ogonek"/>
       <TPM:Package name="pl"/>
       <TPM:Package name="platex"/>
       <TPM:Package name="qfonts"/>
diff --git a/Master/texmf/tpm/collection-latexextra.tpm b/Master/texmf/tpm/collection-latexextra.tpm
index 3b1811d0f8e..e678ac29098 100644
--- a/Master/texmf/tpm/collection-latexextra.tpm
+++ b/Master/texmf/tpm/collection-latexextra.tpm
@@ -19,12 +19,11 @@ A large collection of add-on packages for LaTeX.
     <TPM:Requires>
       <TPM:Package name="ESIEEcv"/>
       <TPM:Package name="GuIT"/>
-      <TPM:Package name="IEEEconf"/>
+      <TPM:Package name="HA-prosper"/>
       <TPM:Package name="SIstyle"/>
       <TPM:Package name="SIunits"/>
       <TPM:Package name="Tabbing"/>
       <TPM:Package name="a0poster"/>
-      <TPM:Package name="aastex"/>
       <TPM:Package name="abstract"/>
       <TPM:Package name="achemso"/>
       <TPM:Package name="acronym"/>
@@ -38,18 +37,14 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="alnumsec"/>
       <TPM:Package name="altfont"/>
       <TPM:Package name="answers"/>
-      <TPM:Package name="apa"/>
       <TPM:Package name="appendix"/>
       <TPM:Package name="arcs"/>
       <TPM:Package name="arrayjob"/>
       <TPM:Package name="arydshln"/>
-      <TPM:Package name="asaetr"/>
-      <TPM:Package name="ascelike"/>
       <TPM:Package name="assignment"/>
       <TPM:Package name="attachfile"/>
       <TPM:Package name="authorindex"/>
       <TPM:Package name="autotab"/>
-      <TPM:Package name="beamer"/>
       <TPM:Package name="begriff"/>
       <TPM:Package name="beton"/>
       <TPM:Package name="bez123"/>
@@ -209,7 +204,6 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="fundus"/>
       <TPM:Package name="g-brief"/>
       <TPM:Package name="galois"/>
-      <TPM:Package name="gatech-thesis"/>
       <TPM:Package name="gauss"/>
       <TPM:Package name="genmpage"/>
       <TPM:Package name="geomsty"/>
@@ -233,7 +227,6 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="hyper"/>
       <TPM:Package name="hyperxmp"/>
       <TPM:Package name="hyphenat"/>
-      <TPM:Package name="imac"/>
       <TPM:Package name="interactiveworkbook"/>
       <TPM:Package name="invoice"/>
       <TPM:Package name="ipa"/>
@@ -242,11 +235,6 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="isodate"/>
       <TPM:Package name="isorot"/>
       <TPM:Package name="isotope"/>
-      <TPM:Package name="jhep"/>
-      <TPM:Package name="jpsj"/>
-      <TPM:Package name="juraabbrev"/>
-      <TPM:Package name="juramisc"/>
-      <TPM:Package name="jurarsp"/>
       <TPM:Package name="kalender"/>
       <TPM:Package name="karnaugh"/>
       <TPM:Package name="kastrup"/>
@@ -299,7 +287,6 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="metre"/>
       <TPM:Package name="mff"/>
       <TPM:Package name="mftinc"/>
-      <TPM:Package name="mhequ"/>
       <TPM:Package name="mhs"/>
       <TPM:Package name="microtype"/>
       <TPM:Package name="miller"/>
@@ -322,12 +309,10 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="multicap"/>
       <TPM:Package name="multirow"/>
       <TPM:Package name="multitoc"/>
-      <TPM:Package name="muthesis"/>
       <TPM:Package name="mwrite"/>
       <TPM:Package name="nag"/>
       <TPM:Package name="namespc"/>
       <TPM:Package name="nassflow"/>
-      <TPM:Package name="nature"/>
       <TPM:Package name="ncclatex"/>
       <TPM:Package name="ncctools"/>
       <TPM:Package name="newalg"/>
@@ -346,10 +331,8 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="numprint"/>
       <TPM:Package name="objectz"/>
       <TPM:Package name="octavo"/>
-      <TPM:Package name="ogonek"/>
       <TPM:Package name="oldstyle"/>
       <TPM:Package name="opcit"/>
-      <TPM:Package name="osa"/>
       <TPM:Package name="outline"/>
       <TPM:Package name="outliner"/>
       <TPM:Package name="overpic"/>
@@ -382,7 +365,6 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="polynom"/>
       <TPM:Package name="polytable"/>
       <TPM:Package name="postcards"/>
-      <TPM:Package name="powerdot"/>
       <TPM:Package name="ppr-prv"/>
       <TPM:Package name="prelim2e"/>
       <TPM:Package name="preprint"/>
@@ -392,12 +374,12 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="progkeys"/>
       <TPM:Package name="program"/>
       <TPM:Package name="progress"/>
+      <TPM:Package name="prosper"/>
       <TPM:Package name="proof"/>
       <TPM:Package name="proofs"/>
       <TPM:Package name="protocol"/>
       <TPM:Package name="pseudocode"/>
       <TPM:Package name="psfragx"/>
-      <TPM:Package name="ptptex"/>
       <TPM:Package name="qcm"/>
       <TPM:Package name="qobitree"/>
       <TPM:Package name="qsymbols"/>
@@ -423,7 +405,6 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="rplain"/>
       <TPM:Package name="rst"/>
       <TPM:Package name="rtkinenc"/>
-      <TPM:Package name="sae"/>
       <TPM:Package name="sauerj"/>
       <TPM:Package name="savefnmark"/>
       <TPM:Package name="savesym"/>
@@ -450,7 +431,6 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="showlabels"/>
       <TPM:Package name="sidecap"/>
       <TPM:Package name="sides"/>
-      <TPM:Package name="siggraph"/>
       <TPM:Package name="skaknew"/>
       <TPM:Package name="slantsc"/>
       <TPM:Package name="slashbox"/>
@@ -525,17 +505,11 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="tree-dvips"/>
       <TPM:Package name="trfsigns"/>
       <TPM:Package name="trsym"/>
-      <TPM:Package name="tugboat"/>
       <TPM:Package name="twoup"/>
       <TPM:Package name="type1cm"/>
       <TPM:Package name="typedref"/>
       <TPM:Package name="typogrid"/>
-      <TPM:Package name="uaclasses"/>
-      <TPM:Package name="ucthesis"/>
-      <TPM:Package name="uhrzeit"/>
-      <TPM:Package name="uiucthesis"/>
       <TPM:Package name="ulsy"/>
-      <TPM:Package name="umich-thesis"/>
       <TPM:Package name="umoline"/>
       <TPM:Package name="underlin"/>
       <TPM:Package name="undertilde"/>
@@ -564,7 +538,6 @@ A large collection of add-on packages for LaTeX.
       <TPM:Package name="xdoc"/>
       <TPM:Package name="xmpincl"/>
       <TPM:Package name="yafoot"/>
-      <TPM:Package name="york-thesis"/>
       <TPM:Package name="youngtab"/>
       <TPM:Package name="yplan"/>
       <TPM:Package name="zed-csp"/>
diff --git a/Master/texmf/tpm/collection-latexrecommended.tpm b/Master/texmf/tpm/collection-latexrecommended.tpm
index 71367922f03..71bd6900b95 100644
--- a/Master/texmf/tpm/collection-latexrecommended.tpm
+++ b/Master/texmf/tpm/collection-latexrecommended.tpm
@@ -17,8 +17,8 @@ A collection of recommended add-on packages for LaTeX which have widespread use
     </TPM:Build>
     <TPM:RunFiles size="2435">texmf/tpm/collection-latexrecommended.tpm</TPM:RunFiles>
     <TPM:Requires>
-      <TPM:Package name="HA-prosper"/>
       <TPM:Package name="anysize"/>
+      <TPM:Package name="beamer"/>
       <TPM:Package name="booktabs"/>
       <TPM:Package name="caption"/>
       <TPM:Package name="cite"/>
@@ -43,7 +43,7 @@ A collection of recommended add-on packages for LaTeX which have widespread use
       <TPM:Package name="memoir"/>
       <TPM:Package name="ntgclass"/>
       <TPM:Package name="oberdiek"/>
-      <TPM:Package name="prosper"/>
+      <TPM:Package name="powerdot"/>
       <TPM:Package name="ps4pdf"/>
       <TPM:Package name="psfrag"/>
       <TPM:Package name="rcs"/>
diff --git a/Master/texmf/tpm/collection-mathextra.tpm b/Master/texmf/tpm/collection-mathextra.tpm
index ac17928ecfd..14fffdb5743 100644
--- a/Master/texmf/tpm/collection-mathextra.tpm
+++ b/Master/texmf/tpm/collection-mathextra.tpm
@@ -26,8 +26,8 @@
       <TPM:Package name="extarrows"/>
       <TPM:Package name="hvmath"/>
       <TPM:Package name="mathcomp"/>
-      <TPM:Package name="mathpazo"/>
       <TPM:Package name="mh"/>
+      <TPM:Package name="mhequ"/>
       <TPM:Package name="nath"/>
       <TPM:Package name="stmaryrd"/>
       <TPM:Package name="tensor"/>
diff --git a/Master/texmf/tpm/collection-publishers.tpm b/Master/texmf/tpm/collection-publishers.tpm
index 6a1ddeebad8..c2f39e28259 100644
--- a/Master/texmf/tpm/collection-publishers.tpm
+++ b/Master/texmf/tpm/collection-publishers.tpm
@@ -15,24 +15,45 @@
     </TPM:Build>
     <TPM:RunFiles size="1625">texmf/tpm/collection-publishers.tpm</TPM:RunFiles>
     <TPM:Requires>
+      <TPM:Package name="IEEEconf"/>
       <TPM:Package name="IEEEtran"/>
+      <TPM:Package name="aastex"/>
       <TPM:Package name="acmconf"/>
       <TPM:Package name="acmtrans"/>
       <TPM:Package name="aguplus"/>
       <TPM:Package name="aiaa"/>
+      <TPM:Package name="apa"/>
+      <TPM:Package name="asaetr"/>
+      <TPM:Package name="ascelike"/>
       <TPM:Package name="chem-journal"/>
       <TPM:Package name="elsevier"/>
+      <TPM:Package name="gatech-thesis"/>
       <TPM:Package name="ieeepes"/>
       <TPM:Package name="ifacmtg"/>
+      <TPM:Package name="imac"/>
+      <TPM:Package name="jhep"/>
+      <TPM:Package name="jpsj"/>
       <TPM:Package name="kluwer"/>
       <TPM:Package name="mentis"/>
       <TPM:Package name="mnras"/>
+      <TPM:Package name="muthesis"/>
+      <TPM:Package name="nature"/>
       <TPM:Package name="nrc"/>
+      <TPM:Package name="osa"/>
+      <TPM:Package name="ptptex"/>
       <TPM:Package name="procIAGssymp"/>
       <TPM:Package name="revtex"/>
+      <TPM:Package name="sae"/>
       <TPM:Package name="siam"/>
+      <TPM:Package name="siggraph"/>
       <TPM:Package name="spie"/>
+      <TPM:Package name="tugboat"/>
+      <TPM:Package name="uaclasses"/>
+      <TPM:Package name="ucthesis"/>
+      <TPM:Package name="uiucthesis"/>
+      <TPM:Package name="umich-thesis"/>
       <TPM:Package name="uwthesis"/>
+      <TPM:Package name="york-thesis"/>
       <TPM:TLCore name="collection-latex"/>
     </TPM:Requires>
     <TPM:Provides>TLCore/collection-publishers</TPM:Provides>