move lshort-bulgarian from texmf-doc to texmf-dist

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

5 files changed, 4 insertions, 67 deletions

diff --git a/Master/texmf-doc/doc/bulgarian/lshort-bulgarian/README b/Master/texmf-dist/doc/latex/lshort-bulgarian/README
index 2b9dab11beb..2b9dab11beb 100644
--- a/Master/texmf-doc/doc/bulgarian/lshort-bulgarian/README
+++ b/Master/texmf-dist/doc/latex/lshort-bulgarian/README
diff --git a/Master/texmf-doc/doc/bulgarian/lshort-bulgarian/lshort-bg.pdf b/Master/texmf-dist/doc/latex/lshort-bulgarian/lshort-bg.pdf
index 909d09d711c..909d09d711c 100644
--- a/Master/texmf-doc/doc/bulgarian/lshort-bulgarian/lshort-bg.pdf
+++ b/Master/texmf-dist/doc/latex/lshort-bulgarian/lshort-bg.pdf
diff --git a/Master/texmf-doc/doc/bulgarian/lshort-bulgarian/src/lshort-bg.src.zip b/Master/texmf-dist/doc/latex/lshort-bulgarian/src/lshort-bg.src.zip
index e277d156f78..e277d156f78 100644
--- a/Master/texmf-doc/doc/bulgarian/lshort-bulgarian/src/lshort-bg.src.zip
+++ b/Master/texmf-dist/doc/latex/lshort-bulgarian/src/lshort-bg.src.zip
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index e96172e898f..e99c1b06e39 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -614,45 +614,11 @@ $standardfoundry='public';
 
 
 %specialdest = (
- 'MemoirChapStyles',	'texmf-doc',
- 'Type1fonts',		'texmf-doc',
  'a2ping',		'texmf',
- 'amsldoc-it',		'texmf-doc',
- 'amsldoc-vn',		'texmf-doc',
- 'amsthdoc-it',		'texmf-doc',
- 'beamer-tut-pt',	'texmf-doc',
  'bin-cjkutils',	'texmf',
- 'catalogue',		'texmf-doc',
- 'comprehensive',	'texmf-doc',
- 'cursolatex',		'texmf-doc',
- 'dtxtut',		'texmf-doc',
  'elhyphen',		'texmf',
- 'epslatex-fr',		'texmf-doc',
- 'es-tex-faq',		'texmf-doc',
- 'free-math-font-survey', 'texmf-doc',
  'hyphenex',		'texmf-dist',
- 'knuth',		'texmf-doc',
- 'l2picfaq',		'texmf-doc',
- 'l2tabu-english',	'texmf-doc',
- 'lshort-bulgarian',	'texmf-doc',
- 'lshort-english',	'texmf-doc',
- 'lshort-finnish',	'texmf-doc',
- 'lshort-portuguese',	'texmf-doc',
- 'lshort-turkish',	'texmf-doc',
- 'lshort-vietnamese',	'texmf-doc',
- 'lshort-korean',	'texmf-doc',
- 'makingtexwork',	'texmf-doc',
- 'mathmode',		'texmf-doc',
  'mnhyphn',		'texmf',
- 'ntheorem-vn',		'texmf-doc',
- 'tamethebeast',	'texmf-doc',
- 'tds',			'texmf-doc',
- 'tex-refs',		'texmf-doc',
- 'visualfaq',		'texmf-doc',
- 'voss-de',		'texmf-doc',
- 'xypic-tut-pt',	'texmf-doc',
- 'wp-conv',		'texmf-doc',
- 'xetexref',		'texmf-doc',
 );
 $standarddest = "texmf-dist";
 
@@ -1558,8 +1524,7 @@ for (@ARGV) {
   $insrunner = $specialinsrunner{$package} || $standardinsrunner;
 
   $whichformat = $specialfmt{$package} || $standardfmt;
-  $whichdocformat = $specialdocfmt{$package}
-                || ($DEST_TREE eq "texmf-doc" ? "english" : $standarddocfmt);
+  $whichdocformat = $specialdocfmt{$package} || $standarddocfmt;
 
   print "pkg=$package (fmt=$whichformat docfmt=$whichdocformat) -> $DEST\n";
   if (exists $special{$package}) {
@@ -1603,10 +1568,6 @@ sub set_dir_defaults
   } elsif ($ctan_dir =~ m!/macros/generic/!) {
     $standarddocfmt = $standardsourcefmt = $standardfmt = "generic";
     $guess = "$standarddocfmt for fmt/docfmt/srcfmt";
-
-  } elsif ($ctan_dir =~ m!/(info|help)/!) {
-    $standarddest = "texmf-doc";
-    $guess = "$standarddest for dest";
   }
 
   print "\t guessed $guess (based on $ctan_dir)\n" if $guess;
@@ -1837,10 +1798,9 @@ sub dodvi
 {
   # packages which are doc themselves rarely rebuild cleanly,
   # and aren't worth it.
-  return if $DEST_TREE eq "texmf-doc";
   $dvipatt = $specialdvi{$package} || $standarddvi;
   unless ( "$dvipatt" eq "$standarddvi" ) {
-    warn "$0: Building doc: shouldn't need do to that. Please check.";
+    warn "$0: Building doc: shouldn't need to do that. Please check.";
     &rundvi ($dvipatt);
   }
 }
@@ -1886,7 +1846,6 @@ sub domp {
 # BibTeX bibliography files:
 sub dobib
 {
-  return if ! $specialbib{$package} && $DEST_TREE eq "texmf-doc";
   $bibpatt = $specialbib{$package} || $standardbib;
   &install("$DEST/bibtex/bib/$package", $bibpatt);
 }
@@ -2823,28 +2782,6 @@ sub MAKEelhyphen {
  print "YOU-MUST-DO! $package: add to texmf/tpm/collection-langgreek.tpm\n";
 }
 
-sub MAKECatalogue {
-# this simply copies source files
-   $DEST="$TDS/catalogue/texmf-doc";
-   chdir($packagedir) || die ("ERROR: cannot open directory");
-  &runjob("mkdir -p $DEST/doc/english/catalogue");
-  &runjob("$CP -r * $DEST/doc/english/catalogue");
-  chdir("$DEST/doc/html/catalogue/entries") || die ("ERROR cannot chdir $DEST/doc/english/catalogue/entries");
-  &buildfilelist;
-   foreach $File (grep(/.html$/,@filenames)) { 
-    print "process $File\n";
-    open FOO,">$File.new";
-    open BAR,"$File";
-    while (<BAR>) {
-      s|\.\./\.\./\.\.|http://theory.uwinnipeg.ca/scripts/CTAN|g;
-      print FOO ;
-   }
-    close FOO;
-    close BAR;
-    &SYSTEM("$MV $File.new $File");
-  }
- }
-
 sub MAKEFAQen
 {
   &donormal ();
@@ -2856,7 +2793,7 @@ sub MAKElshort
 {
   print "MAKElshort $package\n";
   (my $lang = $package) =~ s,.*-,,;  # lshort-english -> english
-  my $destdir = "$DEST/doc/$lang/$package";
+  my $destdir = "$DEST/doc/latex/$package";
   &SYSTEM ("mkdir -p $destdir");
   &SYSTEM ("$CP -r $packagedir/* $destdir");
   # keep only pdf's to save space.
diff --git a/Master/tlpkg/tlpsrc/lshort-bulgarian.tlpsrc b/Master/tlpkg/tlpsrc/lshort-bulgarian.tlpsrc
index 708fa7cee5e..6863484cc62 100644
--- a/Master/tlpkg/tlpsrc/lshort-bulgarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lshort-bulgarian.tlpsrc
@@ -1,2 +1,2 @@
 name lshort-bulgarian
-category Documentation
+category Package