remove texcatalogue-texlive, texcatalogue-miktex from the texlive.tlpdb,

reformat texcatalogue-date
fix the "wide chars" warning


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

3 files changed, 15 insertions, 7 deletions

diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index b8e81eaf11a..0c16484e7d9 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -478,6 +478,12 @@ sub update_from_catalogue {
   my $tlcname = defined($self->catalogue) ? $self->catalogue : $self->name;
   if (defined($tlc->entries->{$tlcname})) {
     my $entry = $tlc->entries->{$tlcname};
+    if (defined($entry->entry->{'date'})) {
+      my $foo = $entry->entry->{'date'};
+      $foo =~ s/^.Date: //;
+      $foo =~ s/ \(.*\) \$$//;
+      $self->cataloguedata->{'date'} = $foo;
+    }
     if (defined($entry->license)) {
       $self->cataloguedata->{'license'} = $entry->license;
     }
@@ -487,12 +493,12 @@ sub update_from_catalogue {
     if (defined($entry->ctan)) {
       $self->cataloguedata->{'ctan'} = $entry->ctan;
     }
-    if (defined($entry->texlive)) {
-      $self->cataloguedata->{'texlive'} = $entry->texlive;
-    }
-    if (defined($entry->miktex)) {
-      $self->cataloguedata->{'miktex'} = $entry->miktex;
-    }
+    #if (defined($entry->texlive)) {
+    # $self->cataloguedata->{'texlive'} = $entry->texlive;
+    #}
+    #if (defined($entry->miktex)) {
+    #  $self->cataloguedata->{'miktex'} = $entry->miktex;
+    #}
     if (defined($entry->caption)) {
       $self->{'shortdesc'} = $entry->caption;
     }
diff --git a/Master/tlpkg/TeXLive/TeXCatalogue.pm b/Master/tlpkg/TeXLive/TeXCatalogue.pm
index 4fc64058d88..f94672181ec 100644
--- a/Master/tlpkg/TeXLive/TeXCatalogue.pm
+++ b/Master/tlpkg/TeXLive/TeXCatalogue.pm
@@ -167,7 +167,7 @@ sub initialize {
   chdir($self->{'location'} . "/entries") || die ("Cannot chdir to TeX Catalogue entries: $!");
   # parse all the files
   foreach (glob("?/*.xml")) {
-    open(my $io,"<$_") or die "Cannot read $_: $!";
+    open(my $io,"<:utf8", "$_") or die "Cannot read $_: $!";
     my $tce = TeXLive::TeXCatalogue::Entry->new( 'ioref' => $io );
     close($io);
     $self->{'entries'}{$tce->name} = $tce;
diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb
index b43e567b5db..3f31923bf0e 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpdb
+++ b/Master/tlpkg/bin/tlpsrc2tlpdb
@@ -50,6 +50,7 @@ sub main
     warn "$0: -c /Cat/a/logue not given, continuing without it.\n";
   } else {
     require TeXLive::TeXCatalogue;  # not at compile time, for now anyway.
+    warn "$0: reading TeX Catalogue tree $opt_catalogue ...\n";
     $tlc = TeXLive::TeXCatalogue->new( "location" => $opt_catalogue );
   }
 
@@ -95,6 +96,7 @@ sub main
     local *TLPDB;
     our $TLPDB = ">$opt_master/texlive.tlpdb";
     open (TLPDB) || die "open($TLPDB) failed: $!";
+    binmode TLPDB, ":utf8";
     $tldb->writeout (*TLPDB);
     warn "$0: wrote $src_count packages $TLPDB.\n";
   } else {