sync

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

1 files changed, 37 insertions, 21 deletions

diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 885d199244e..6297ce979df 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -144,18 +144,19 @@ mkdir $hx/$this
 cd /home/ftp/texlive/Images
 cp README.html $hx/$prev/
 mv *.iso* *.torrent* $hx/$prev/
-mv test/*.iso* .
+mv test/texlive2*.iso* .
 mv test/texlive*.tar.xz* $hx/$this/  # tar version only in historic
-update README and test/README (touch them even if no text changes)
+update README (touch even if no real changes needed)
+   and test/README (pretest over)
 
 - mactex (from tlpretest)
 hm=/home/ftp/historic/systems/mactex
 mkdir $hm/$prev
 cd ~ftp/tex/mactex
-mv mactex2*.pkg* basic* $hm/$prev
-cp $hm/$prev/README .
+mv mactex*.pkg* basic* $hm/$prev
 mv ~ftp/texlive/tlpretest/mactex* .
- 
+ln -s mactex-20*.pkg MacTeX.pkg 
+
 - rest of tlnet
 cd /home/ftp/texlive/tlnet
 mkdir $hx/$prev/tlnet
@@ -163,9 +164,20 @@ cd /home/ftp/texlive/tlnet
 diff -qr . $hx/$prev/tlnet-final # should already be there from before, so:
 rm -rf [a-z]*
 mv ../tlpretest/[a-z]* .
-update README and ../tlpretest/README (touch even if no text changes)
-
+update README (touch even if no real changes needed)
+   and ../tlpretest/README (pretest over)
+
+- update on CTAN to avoid copying everything back again:
+cy=/home/ftp/tex-archive/systems
+fx=/home/ftp/tex
+cp -a ... $cy/texlive/Images/
+cp -a ... $cy/texlive/Source/
+cp -a ... $cy/texlive/tlnet/
+cp -a $fx/mactex/* $cy/mac/mactex/
+cp -a $fx/protext/dist/* $cy/windows/protext/ # probably already done
 cd /home/httpd/html/texlive
+
+- TL web pages:
 mkdir $hx/$prev/web
 cp *.html !$  # remove tugstyle.css ref from bugs.html
 
@@ -177,14 +189,14 @@ perl install-tl # do full install to default location.
 rm /usr/local/texlive-rel; ln -s texlive/$this /usr/local/texlive-rel
 newsrc=!$/source
 mkdir $newsrc
-cp source/texlive-*.tar.xz source/w32tex-src.tar.xz $newsrc
+cp source/{install-tl,texlive,w32tex}*.tar.?z $newsrc
 mount /home/ftp/texlive/Contents/live
 cd && umount /mnt/tl
 
 update historic/systems with final proTeXt, when ready.
   https://bscw.fernuni-hagen.de
   ftp://ftp.fernuni-hagen.de/pub/windows/win32/ProTeXt/
-update ~www/texlive web pages (search for $prev):
+update ~www/texlive web pages (search for $prev and $prev-1):
   acquire* - general
   bugs.html - general, also case of $prevprev at bottom
   doc.html - platform list, translation list
@@ -195,17 +207,17 @@ check for new Texinfo manuals to link to html versions:
 further web updates below.
 
 - announcements:
-Dick Koch @ updating MacTeX.
+Dick @ updating MacTeX.
 Martin @ torrents.
 CTAN @ ISO update, re-enabling tlnet mirroring.
-Siep @ w32client.html, Norbert @ debian.html.
-pretest mirror admins @ done till next year (~www/texlive/mirmon/tl*.txt).
+Siep @ w32client.html, Norbert @ debian,updmap-kanji.html.
 
 - make tag + branch:
-svn copy -r 34252 -m'texlive-2014.0 tag based on r34252' \
-  svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-2014.0
-svn copy -r 34252 -m'branch2014 branch based on r34252' \
-  svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/branch2014
+(determine revision number from svn log, in case commits were mistakenly made)
+svn copy -r 37491 -m'texlive-2015.0 tag based on r37491' \
+  svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-2015.0
+svn copy -r 37491 -m'branch2015 branch based on r37491' \
+  svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/branch2015
 
   It's the same command, just different destinations.
   http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.branchmerge
@@ -227,6 +239,7 @@ svn co file:///home/svn/texlive/branches/branch2015/Build/source . >&out
 - update ~karl/bin/cron.tl, and reenable when feel ready.
 critical=
 pretest=
+images_froze=true
 net_frozen=false
 all_frozen=false
 
@@ -236,27 +249,30 @@ hy=/home/ftp/historic/systems/texcollection
 mkdir -p $hy/$this/packaging
 #
 # copy files from DVD:
+mount /mnt/tc
 cd /mnt/tc
 cp -R [A-T]* index* setup /home/ftp/historic/systems/texcollection/$this
 #
 # copy ctan snapshot for TUG members:
-nice -19 tar cf ~www/members/ctan14-20140604.tar ctan
+rm -i ~www/members/ctan14-*.tar # assuming it's linked!
+nice -19 tar cf ~www/members/ctan15-20140531.tar ctan
 chmod a=r ~www/members/ctan*.tar  # and edit members/index.html
 mkdir /home/ftp/historic/systems/ctancd/$this
 ln ~www/members/ctan*.tar !$  # or maybe later?
 #
 umount /mnt/tc
 #
+cd $hy/$this/packaging
 # copy in files from texcollection svn, then:
-pdftoppm -gray -r 222 texcoll-cover.pdf >temp.pnm
-# edit temp.pnm to be just the cover.
-pnmcrop temp.pnm | pnmtopng >~www/texcollection/texcollection$this.png
+pdftoppm -gray -r 222 texcoll-cover.pdf temp
+# edit temp*.pgm to be just the cover.
+pnmcrop temp*.pgm | pnmtopng >~www/texcollection/texcollection$this.png
 cp texcoll-cover.pdf ~www/texcollection/texcollection$this.pdf
 #
 ~www/texcollection/index.html
-
 ~www/store/index.html
 /home/httpd/cgi-bin/tug-common.pl
 ~www/forms/current/memberapp.html 
+#
 ~www/rss/tug.xml
 ~www/index.html