11 files changed, 12 insertions, 3 deletions
diff --git a/Master/texmf-dist/source/latex/prosper/AUTHORS b/Master/texmf-dist/doc/latex/prosper/AUTHORS
index f31926a1bee..f31926a1bee 100644
--- a/Master/texmf-dist/source/latex/prosper/AUTHORS
+++ b/Master/texmf-dist/doc/latex/prosper/AUTHORS
diff --git a/Master/texmf-dist/source/latex/prosper/ChangeLog b/Master/texmf-dist/doc/latex/prosper/ChangeLog
index 914c9c79d4c..914c9c79d4c 100644
--- a/Master/texmf-dist/source/latex/prosper/ChangeLog
+++ b/Master/texmf-dist/doc/latex/prosper/ChangeLog
diff --git a/Master/texmf-dist/source/latex/prosper/INSTALL b/Master/texmf-dist/doc/latex/prosper/INSTALL
index cecacf46444..cecacf46444 100644
--- a/Master/texmf-dist/source/latex/prosper/INSTALL
+++ b/Master/texmf-dist/doc/latex/prosper/INSTALL
diff --git a/Master/texmf-dist/source/latex/prosper/TODO b/Master/texmf-dist/doc/latex/prosper/TODO
index f4abe2be4a6..f4abe2be4a6 100644
--- a/Master/texmf-dist/source/latex/prosper/TODO
+++ b/Master/texmf-dist/doc/latex/prosper/TODO
diff --git a/Master/texmf-dist/source/latex/prosper/compilation.fig b/Master/texmf-dist/doc/latex/prosper/compilation.fig
index cacb6ff3ddc..cacb6ff3ddc 100644
--- a/Master/texmf-dist/source/latex/prosper/compilation.fig
+++ b/Master/texmf-dist/doc/latex/prosper/compilation.fig
diff --git a/Master/texmf-dist/source/latex/prosper/prosper-structure.fig b/Master/texmf-dist/doc/latex/prosper/prosper-structure.fig
index ce7ab546052..ce7ab546052 100644
--- a/Master/texmf-dist/source/latex/prosper/prosper-structure.fig
+++ b/Master/texmf-dist/doc/latex/prosper/prosper-structure.fig
diff --git a/Master/texmf-dist/source/latex/prosper/prosper.png b/Master/texmf-dist/doc/latex/prosper/prosper.png
index 43ff036041e..43ff036041e 100644
--- a/Master/texmf-dist/source/latex/prosper/prosper.png
+++ b/Master/texmf-dist/doc/latex/prosper/prosper.png
diff --git a/Master/texmf-dist/source/latex/prosper/prosper.ui b/Master/texmf-dist/doc/latex/prosper/prosper.ui
index e69de29bb2d..e69de29bb2d 100644
--- a/Master/texmf-dist/source/latex/prosper/prosper.ui
+++ b/Master/texmf-dist/doc/latex/prosper/prosper.ui
diff --git a/Master/texmf-dist/source/latex/prosper/seminar-bg2-lepennec.fix b/Master/texmf-dist/doc/latex/prosper/seminar-bg2-lepennec.fix
index b1371b8f269..b1371b8f269 100644
--- a/Master/texmf-dist/source/latex/prosper/seminar-bg2-lepennec.fix
+++ b/Master/texmf-dist/doc/latex/prosper/seminar-bg2-lepennec.fix
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 2264e0d0d38..ef71e97b627 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -252,7 +252,7 @@ my @TLP_working = qw(
     jura juraabbrev jurabib juramisc jurarsp js-misc jvlisting
   kantlipsum karnaugh kastrup kdgdocs kerkis kerntest
     keycommand keyreader keystroke keyval2e kix kixfont
-    knitting knittingpattern knuth knuth-local
+    knitting knittingpattern knuth knuth-lib knuth-local
     koma-moderncvclassic koma-script koma-script-examples koma-script-sfs
     kotex-oblivoir kotex-plain kotex-utf kotex-utils
     kpfonts ksfh_nat
@@ -373,7 +373,8 @@ my @TLP_working = qw(
     ppr-prv pracjourn preprint prerex present presentations presentations-en
     prettyref preview printlen proba probsoln procIAGssymp
     prodint productbox program
-    progress progressbar proposal properties protex protocol przechlewski-book
+    progress progressbar proposal properties
+    prosper protex protocol przechlewski-book
     psbao pseudocode psfrag psfrag-italian psfragx
     psgo psizzl pslatex psnfss pspicture
     pst-2dplot pst-3d pst-3dplot pst-abspos pst-am pst-asr pst-bar
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2b96f198e2f..4d7b442015c 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -782,7 +782,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'preview-latex',"die 'skipping, use preview'",
  'progkeys',	"die 'skipping, noinfo license, author unfindable'",
  'proofs',	"die 'skipping, nosell license'",
- 'prosper',     "&MAKEflatten",
  'ps2eps',	"die 'skipping, must go into sources'",
  'ps4pdf',	"die 'skipping, obsolete'",
  'psfig',	"die 'skipping, nosell license'",
@@ -1121,6 +1120,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'mp3d'			=> '&PREHOOK_mp3d',
  'numericplots',	=> '&PREHOOK_flatten1',
  'pictex'		=> '&PREHOOK_pictex',
+ 'prosper'		=> '&PREHOOK_prosper',
  'skb'			=> '&PREHOOK_flatten1',
  'suftesi'		=> '&PREHOOK_suftesi',
  'texdraw'		=> '&PREHOOK_texdraw',
@@ -4835,6 +4835,14 @@ sub PREHOOK_pictex {
   &SYSTEM ("$RM -rf addon/autoarea*");
 }
 
+sub PREHOOK_prosper {
+  print "PREHOOK_$package - handle image conflicts\n";
+  # some files different between img/ and contrib/img; prefer
+  # those in img.  Also flatten doc/doc-examples.
+  &SYSTEM ("$MV contrib/img/* .");
+  &SYSTEM ("$MV img/* doc/*/* doc/* designer/* contrib/*.* .");
+}
+
 sub PREHOOK_suftesi {
   print "PREHOOK_$package - move doc/latex subdirs\n";
   # not example/, then get logo.png clash