dvdcoll.tds.zip is ok now

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

27 files changed, 2 insertions, 2 deletions

diff --git a/Master/texmf-dist/tex/latex/dvdcoll/UKenglish.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/UKenglish.dcl
index c6167419559..c6167419559 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/UKenglish.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/UKenglish.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/USenglish.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/USenglish.dcl
index 79b32175ab6..79b32175ab6 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/USenglish.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/USenglish.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/acadian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/acadian.dcl
index c65c32249a9..c65c32249a9 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/acadian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/acadian.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/american.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/american.dcl
index 7d1b138a083..7d1b138a083 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/american.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/american.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/australian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/australian.dcl
index 8d4bb8abc66..8d4bb8abc66 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/australian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/australian.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/austrian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/austrian.dcl
index 5c387bbb755..5c387bbb755 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/austrian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/austrian.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/brazil.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/brazil.dcl
index d714540be4a..d714540be4a 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/brazil.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/brazil.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/brazilian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/brazilian.dcl
index 0ed58403144..0ed58403144 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/brazilian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/brazilian.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/british.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/british.dcl
index 53a6f13e923..53a6f13e923 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/british.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/british.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/canadian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/canadian.dcl
index f2aaa45d80f..f2aaa45d80f 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/canadian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/canadian.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/canadien.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/canadien.dcl
index 0458fe0cd62..0458fe0cd62 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/canadien.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/canadien.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/english.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/english.dcl
index d6134050ea5..d6134050ea5 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/english.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/english.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/francais.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/francais.dcl
index a50c82636f9..a50c82636f9 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/francais.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/francais.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/french.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/french.dcl
index 78ccd6690cf..78ccd6690cf 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/french.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/french.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/frenchb.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/frenchb.dcl
index 8dcab989ecf..8dcab989ecf 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/frenchb.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/frenchb.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/german.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/german.dcl
index 9644171a344..9644171a344 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/german.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/german.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/germanb.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/germanb.dcl
index e28279219de..e28279219de 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/germanb.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/germanb.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/italian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/italian.dcl
index 636e1cf179b..636e1cf179b 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/italian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/italian.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/naustrian.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/naustrian.dcl
index fcd218dafda..fcd218dafda 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/naustrian.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/naustrian.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/newzealand.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/newzealand.dcl
index 43de5958142..43de5958142 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/newzealand.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/newzealand.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/ngerman.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/ngerman.dcl
index 60b66e6973c..60b66e6973c 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/ngerman.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/ngerman.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/polish.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/polish.dcl
index 73504d2fc30..73504d2fc30 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/polish.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/polish.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/portuges.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/portuges.dcl
index b43c6b30012..b43c6b30012 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/portuges.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/portuges.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/portuguese.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/portuguese.dcl
index ee4436ece19..ee4436ece19 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/portuguese.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/portuguese.dcl
diff --git a/Master/texmf-dist/tex/latex/dvdcoll/spanish.dcl b/Master/texmf-dist/tex/latex/dvdcoll/dcl/spanish.dcl
index df247622f31..df247622f31 100644
--- a/Master/texmf-dist/tex/latex/dvdcoll/spanish.dcl
+++ b/Master/texmf-dist/tex/latex/dvdcoll/dcl/spanish.dcl
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 82385b4a81b..5b33714154f 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -136,7 +136,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'dropping',	"die 'skipping, nosell license'",
  'dtk',		"&MAKEflatten",
  'dtxtut',	"&setup",  # straight copy
- 'dvdcoll',	"&MAKEflatten",
+ 'dvdcoll',	"&MAKEunzip",
  'easy',	"&MAKEeasy",
  'ebib',	"die 'skipping, as it is Emacs'",
  'ebong',	"&MAKEebong",
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 11c8025e5ac..c532a543b08 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -179,7 +179,7 @@ sub catalogue_find_ctan_path
   # if the package claims to have tds-ready .zip file, use it.
   # except when it's erroneous.
   my $tds_path = "$CTAN/install/$ctan_loc.tds.zip";
-  if (-s $tds_path && $pkgname !~ /^(dvdcoll|lcyw)$/) {
+  if (-s $tds_path && $pkgname !~ /^(lcyw)$/) {
     return &copy_to_tmpdir ($pkgname, $tds_path);
   }