29 files changed, 10 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/HA-prosper/HA-prosper.pdf b/Master/texmf-dist/doc/latex/ha-prosper/HA-prosper.pdf
index d863fff5b2b..d863fff5b2b 100644
--- a/Master/texmf-dist/doc/latex/HA-prosper/HA-prosper.pdf
+++ b/Master/texmf-dist/doc/latex/ha-prosper/HA-prosper.pdf
diff --git a/Master/texmf-dist/doc/latex/HA-prosper/HAPBigtest.tex b/Master/texmf-dist/doc/latex/ha-prosper/HAPBigtest.tex
index 360b89b64e3..360b89b64e3 100644
--- a/Master/texmf-dist/doc/latex/HA-prosper/HAPBigtest.tex
+++ b/Master/texmf-dist/doc/latex/ha-prosper/HAPBigtest.tex
diff --git a/Master/texmf-dist/doc/latex/HA-prosper/HAPDualslide.tex b/Master/texmf-dist/doc/latex/ha-prosper/HAPDualslide.tex
index 70f6163306d..70f6163306d 100644
--- a/Master/texmf-dist/doc/latex/HA-prosper/HAPDualslide.tex
+++ b/Master/texmf-dist/doc/latex/ha-prosper/HAPDualslide.tex
diff --git a/Master/texmf-dist/doc/latex/HA-prosper/HAPIntroduction.tex b/Master/texmf-dist/doc/latex/ha-prosper/HAPIntroduction.tex
index bc550265a7a..bc550265a7a 100644
--- a/Master/texmf-dist/doc/latex/HA-prosper/HAPIntroduction.tex
+++ b/Master/texmf-dist/doc/latex/ha-prosper/HAPIntroduction.tex
diff --git a/Master/texmf-dist/doc/latex/HA-prosper/README b/Master/texmf-dist/doc/latex/ha-prosper/README
index d0bc0c7a2b7..d0bc0c7a2b7 100644
--- a/Master/texmf-dist/doc/latex/HA-prosper/README
+++ b/Master/texmf-dist/doc/latex/ha-prosper/README
diff --git a/Master/texmf-dist/source/latex/HA-prosper/HA-prosper.def b/Master/texmf-dist/source/latex/ha-prosper/HA-prosper.def
index 92e17c93544..92e17c93544 100644
--- a/Master/texmf-dist/source/latex/HA-prosper/HA-prosper.def
+++ b/Master/texmf-dist/source/latex/ha-prosper/HA-prosper.def
diff --git a/Master/texmf-dist/source/latex/HA-prosper/HA-prosper.dtx b/Master/texmf-dist/source/latex/ha-prosper/HA-prosper.dtx
index 61ffb880fc5..61ffb880fc5 100644
--- a/Master/texmf-dist/source/latex/HA-prosper/HA-prosper.dtx
+++ b/Master/texmf-dist/source/latex/ha-prosper/HA-prosper.dtx
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/HA-prosper.cfg b/Master/texmf-dist/tex/latex/ha-prosper/HA-prosper.cfg
index 55908f75642..55908f75642 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/HA-prosper.cfg
+++ b/Master/texmf-dist/tex/latex/ha-prosper/HA-prosper.cfg
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/HA-prosper.sty b/Master/texmf-dist/tex/latex/ha-prosper/HA-prosper.sty
index 087c8704291..087c8704291 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/HA-prosper.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/HA-prosper.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Aggie/AMLogo.eps b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Aggie/AMLogo.eps
index 1d32dfc4786..1d32dfc4786 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Aggie/AMLogo.eps
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Aggie/AMLogo.eps
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Aggie/HAPAggie.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Aggie/HAPAggie.sty
index 1ed1c7922da..1ed1c7922da 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Aggie/HAPAggie.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Aggie/HAPAggie.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Aggie/files.txt b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Aggie/files.txt
index 6d184ad103f..6d184ad103f 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Aggie/files.txt
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Aggie/files.txt
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Capsules/HAPcapsules.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Capsules/HAPcapsules.sty
index fb0cd8e4f4b..fb0cd8e4f4b 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Capsules/HAPcapsules.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Capsules/HAPcapsules.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Ciment/HAPciment.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Ciment/HAPciment.sty
index 96dc3a3c2fe..96dc3a3c2fe 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Ciment/HAPciment.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Ciment/HAPciment.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Fyma/HAPFyma.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Fyma/HAPFyma.sty
index ef8e20357a1..ef8e20357a1 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Fyma/HAPFyma.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Fyma/HAPFyma.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/HA/HAPHA.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/HA/HAPHA.sty
index 7be406d6877..7be406d6877 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/HA/HAPHA.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/HA/HAPHA.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/HA/flower.ps b/Master/texmf-dist/tex/latex/ha-prosper/Styles/HA/flower.ps
index 71683ca5cd9..71683ca5cd9 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/HA/flower.ps
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/HA/flower.ps
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Lakar/HAPLakar.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Lakar/HAPLakar.sty
index 32204e9211f..32204e9211f 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Lakar/HAPLakar.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Lakar/HAPLakar.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Simple/HAPsimple.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Simple/HAPsimple.sty
index cfd63706d44..cfd63706d44 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Simple/HAPsimple.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Simple/HAPsimple.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/HAPTCS.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/HAPTCS.sty
index c06f8d6dc7a..c06f8d6dc7a 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/HAPTCS.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/HAPTCS.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/HAPTCSTealBlue.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/HAPTCSTealBlue.sty
index 4c5c370f1de..4c5c370f1de 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/HAPTCSTealBlue.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/HAPTCSTealBlue.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/HAPTCSgrad.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/HAPTCSgrad.sty
index 2b08f3de362..2b08f3de362 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/HAPTCSgrad.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/HAPTCSgrad.sty
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/TCSgradlogo.ps b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/TCSgradlogo.ps
index ed2093af37f..ed2093af37f 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/TCSgradlogo.ps
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/TCSgradlogo.ps
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/TCSlogo.ps b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/TCSlogo.ps
index 355020d6a70..355020d6a70 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/TCS/TCSlogo.ps
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/TCS/TCSlogo.ps
diff --git a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Tycja/HAPTycja.sty b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Tycja/HAPTycja.sty
index c2174743deb..c2174743deb 100644
--- a/Master/texmf-dist/tex/latex/HA-prosper/Styles/Tycja/HAPTycja.sty
+++ b/Master/texmf-dist/tex/latex/ha-prosper/Styles/Tycja/HAPTycja.sty
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index a82874a407e..65abc85a4b0 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -20,7 +20,7 @@ our %OPT;
 
 my @TLP_working = qw(
   12many 2up
-  HA-prosper IEEEconf IEEEtran
+  IEEEconf IEEEtran
     SIstyle SIunits Tabbing Type1fonts
   a0poster a2ping a4wide a5comb
     aaai-named aalok aastex abbr abc abnt abntex2 abraces abstract abstyles
@@ -374,7 +374,7 @@ my @TLP_working = qw(
     grid grid-system gridpapers gridset gridslides grotesq grundgesetze
     gs1 gsemthesis gtl gtrlib-largetrees gtrcrd
     gu gudea guitar guitarchordschemes guitartabs guitlogo gzt
-  h2020proposal hackthefootline hacm hagenberg-thesis halloweenmath
+  h2020proposal ha-prosper hackthefootline hacm hagenberg-thesis halloweenmath
     handin handout hands hang hanging hanoi
     happy4th har2nat haranoaji haranoaji-extra
     hardwrap harmony harnon-cv harpoon
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 8ed05876955..a21c3a49bee 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -63,7 +63,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'FiXme',       "die 'skipping, use fixme'",
  'GS1',         "die 'skipping, use gs1'",
  'GuIT',        "die 'skipping, use guitlogo'",
- 'HA-prosper',  '&MAKEhaprosper',
+ 'HA-prosper',  "die 'skipping, use ha-prosper'",
  'IEEEtran',    "&MAKEIEEEtran",
  'LaTeX-FAQ-francaise',	"die 'skipping, use faq-fr'",
  'LingTrees',   "die 'skipping, requires python'",
@@ -601,7 +601,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'guitbeamer',  "die 'skipping, nonfree'",
  'gurps',	"die 'skipping, Steve Jackson Games restrictions -> nonfree'",
  'gutenberg',	"die 'skipping, user group pdfs'",
- 'ha-prosper',  "die 'skipping, use HA-prosper'",
+ 'ha-prosper',  '&MAKEhaprosper',
  'hacm',        "&MAKEflatten",
  'harvardkyoto',"die 'skipping, use xetex-devanagari'",
  'he-le-na',    "die 'skipping, nonfree (shareware) license'",
@@ -5619,13 +5619,13 @@ sub MAKEmathpazo {
 }
 
 sub MAKEhaprosper {
+ print "\t SPECIAL copying HA-prosper\n";
  &setup ("nocopytodoc"); # create dirs but that's all
- chdir("$packagedir");
+ &xchdir("$packagedir");
  &SYSTEM("mkdir -p $DEST");
- print "\t SPECIAL copying HA-prosper\n";
- &SYSTEM("$CP -r README Doc/* $DEST/doc/latex/HA-prosper");
- &SYSTEM("$CP -r Run/* $DEST/tex/latex/HA-prosper");
- &SYSTEM("$CP -r Source/* $DEST/source/latex/HA-prosper");
+ &SYSTEM("$CP -r README Doc/* $DEST/doc/latex/$package");
+ &SYSTEM("$CP -r Run/* $DEST/tex/latex/$package");
+ &SYSTEM("$CP -r Source/* $DEST/source/latex/$package");
 }
 
 sub MAKEpclnfss {
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 766cc816fad..b861154e44f 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -6,7 +6,6 @@ depend collection-latexrecommended
 depend collection-pictures
 #
 depend 2up
-depend HA-prosper
 depend Tabbing
 depend a0poster
 depend a4wide
@@ -588,6 +587,7 @@ depend gridset
 depend gridslides
 depend gs1
 depend guitlogo
+depend ha-prosper
 depend hackthefootline
 depend halloweenmath
 depend handin
diff --git a/Master/tlpkg/tlpsrc/HA-prosper.tlpsrc b/Master/tlpkg/tlpsrc/ha-prosper.tlpsrc
index e69de29bb2d..e69de29bb2d 100644
--- a/Master/tlpkg/tlpsrc/HA-prosper.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ha-prosper.tlpsrc