From 2dd4277306d319bf7347cd426523934bcafb6def Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 28 Jun 2011 00:43:01 +0000
Subject: sync

git-svn-id: svn://tug.org/texlive/trunk@23155 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/TeXLive/TLUtils.pm |  4 ++--
 Master/tlpkg/bin/tl-update-asy  |  3 ++-
 Master/tlpkg/doc/releng.txt     |  7 +++++++
 Master/tlpkg/texlive.tlpdb      | 12 +++---------
 4 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'Master/tlpkg')

diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 79848ff5ed0..2a8399f1ea4 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1888,8 +1888,8 @@ sub add_link_dir_dir {
     my $ret = 1;
     for my $f (@files) {
       # skip certain dangerous entries that should never be linked somewhere
-      if ($f eq "man" || $f eq "lib") {
-        debug("not linking special entry $f into $to.\n");
+      if ($f eq "man") {
+        debug("not linking man into $to.\n");
         next;
       }
       unlink("$to/$f");
diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy
index 8120a841ea4..a6da99d5849 100755
--- a/Master/tlpkg/bin/tl-update-asy
+++ b/Master/tlpkg/bin/tl-update-asy
@@ -30,7 +30,8 @@ if false && $update_sources_from_ctan; then
   svn add `!!`
   
   # get list of files to remove:
-  diff -qr . /home/ftp/tex-archive/graphics/asymptote/ | egrep -v '\.svn|gc-'
+  diff -qr . /home/ftp/tex-archive/graphics/asymptote/ \
+  | egrep -v ' differ' | egrep -v '\.svn|gc-'
   svn rm ...
 
   # final check and commit:
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 07579ffa201..23f4ab62199 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -57,3 +57,10 @@ when closer to time:
 
 run tl-update-txi
 and tl-update-man (and check /tmp/so.rules against man1/Makefile)
+
+
+w32clientYYYY.zip on web pages.
+
+ after release
+texcollection/index.html
+store/index.html
diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index 386259e84d3..9f141a0aaef 100644
--- a/Master/tlpkg/texlive.tlpdb
+++ b/Master/tlpkg/texlive.tlpdb
@@ -103965,7 +103965,7 @@ docfiles size=151
  texmf-dist/doc/generic/pst-node/README details="Readme"
  texmf-dist/doc/generic/pst-node/more_docs/Makefile
  texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.bib
- texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.pdf details="Documentation of \psmatrix (German)" language="de"
+ texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.pdf details="Documentation of psmatrix (German)" language="de"
  texmf-dist/doc/generic/pst-node/more_docs/psmatrix-docDE.tex
  texmf-dist/doc/generic/pst-node/pst-node-doc.bib
  texmf-dist/doc/generic/pst-node/pst-node-doc.pdf details="Package documentation (English)" language="en"
@@ -126014,12 +126014,6 @@ longdesc install packages, and in the tlcritical repository.
 depend texlive.infra.ARCH
 postaction shortcut type=menu name="TeX Live Manager"              cmd=TEXDIR/bin/win32/tlmgr-gui.exe
 postaction shortcut type=menu name="TeX Live command-line"   cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-docfiles size=39
- texmf/doc/man/man1/tlmgr.1
- texmf/doc/man/man1/tlmgr.man1.pdf
- texmf/scripts/texlive/NEWS
- tlpkg/README
- tlpkg/installer/COPYING.MinGW-runtime.txt
 runfiles size=235
  LICENSE.CTAN
  LICENSE.TL
@@ -130936,8 +130930,8 @@ revision 23119
 shortdesc Internal Perl for Windows.
 longdesc TeX Live includes Perl for Windows, but it is intended only for
 longdesc internal use by TeX Live programs, and should not be used as a
-longdesc general system program.  Installing your own Perl for that.
-longdesc See http://perl.org.
+longdesc general system program.  Installing your own Perl for that. See
+longdesc http://perl.org.
 runfiles size=14502
  tlpkg/tlperl/README.TEXLIVE
  tlpkg/tlperl/bin/a2p.exe
-- 
cgit v1.2.3