summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf16
-rw-r--r--Master/.mkisofsrc2
-rw-r--r--Master/release-texlive.txt2
-rw-r--r--Master/texmf-dist/web2c/texmfcnf.lua4
-rw-r--r--Master/tlpkg/README32
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm4
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm2
-rwxr-xr-xMaster/tlpkg/bin/check-files-by-format10
-rwxr-xr-xMaster/tlpkg/bin/check-wrapper-consistency4
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet4
-rw-r--r--Master/tlpkg/doc/releng.txt24
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc2
13 files changed, 61 insertions, 51 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 1d9d5e68925..e21803cac92 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-17 Karl Berry <karl@tug.org>
+
+ * texmf.cnf (TEXINPUTS.pdfx{latex,mex,tex}): this engine has
+ not existed for a long time. Remove.
+ (TEXINPUTS.luajittex): same as .luatex.
+
2014-04-09 Karl Berry <karl@tug.org>
* pathsearch.h: with deep regret, #include types.h before
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 84009f51a45..e30e50d21ca 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -4,8 +4,8 @@
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes -- and only your changes, not an
% entire copy! -- in ../../texmf.cnf. That is, if this file is
-% installed in /some/path/to/texlive/2013/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2013/texmf.cnf.
+% installed in /some/path/to/texlive/2014/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2014/texmf.cnf.
%
% What follows is a super-summary of what this .cnf file can
% contain. Please read the Kpathsea manual for more information.
@@ -76,10 +76,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2013/texmf-var
+TEXMFVAR = ~/.texlive2014/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2013/texmf-config
+TEXMFCONFIG = ~/.texlive2014/texmf-config
% List all the texmf trees. For an explanation of what they are, see the
% TeX Live manual.
@@ -189,15 +189,11 @@ TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}//
TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}//
-% pdfxTeX.
-TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}//
-
% LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
+TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}//
TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}//
% XeTeX.
diff --git a/Master/.mkisofsrc b/Master/.mkisofsrc
index 76232032064..721b52eb494 100644
--- a/Master/.mkisofsrc
+++ b/Master/.mkisofsrc
@@ -1,4 +1,4 @@
APPI=Complete TeX system
COPY=LICENSE.TL
PUBL=TeX Live <tex-live@tug.org>
-VOLI=TeXLive2013
+VOLI=TeXLive2014
diff --git a/Master/release-texlive.txt b/Master/release-texlive.txt
index b3db442294c..ebcb5735b52 100644
--- a/Master/release-texlive.txt
+++ b/Master/release-texlive.txt
@@ -1,4 +1,4 @@
-TeX Live (http://tug.org/texlive) version 2013
+TeX Live (http://tug.org/texlive) version 2014
This file is public domain. It is read by install-tl --version,
tlmgr --version, and texconfig conf, and a final line appended with
diff --git a/Master/texmf-dist/web2c/texmfcnf.lua b/Master/texmf-dist/web2c/texmfcnf.lua
index 1282c042cfe..2b78187a036 100644
--- a/Master/texmf-dist/web2c/texmfcnf.lua
+++ b/Master/texmf-dist/web2c/texmfcnf.lua
@@ -45,13 +45,13 @@ return {
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
TEXMFSYSVAR = "selfautoparent:texmf-var",
- TEXMFVAR = "home:.texlive2013/texmf-var",
+ TEXMFVAR = "home:.texlive2014/texmf-var",
-- We have only one cache path but there can be more. The first writable one
-- will be chosen but there can be more readable paths.
TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
- TEXMFCONFIG = "home:.texlive2013/texmf-config",
+ TEXMFCONFIG = "home:.texlive2014/texmf-config",
-- I don't like this texmf under home and texmf-home would make more
-- sense. One never knows what installers put under texmf anywhere and
diff --git a/Master/tlpkg/README b/Master/tlpkg/README
index aafec8ef98c..2fb99110f32 100644
--- a/Master/tlpkg/README
+++ b/Master/tlpkg/README
@@ -3,22 +3,24 @@ Originally written by Norbert Preining, 2007. Public domain.
This directory contains infrastructure for TeX Live.
texlive.tlpdb the database of installed packages, updated
- automatically in svn by karl@tug cron.
+ automatically in the source repo by karl@tug cron.
TeXLive/ the Perl library for TeX Live support; this is what the
infrastructure and installer use.
-archive/ old junk kept online for posterity.
-asymptote/ asymptote binary plus necessary libraries for windows
-bin/ maintenance scripts for TeX Live; nothing for installer or user.
-doc/ documentation of the infrastructure.
-dev/ patches and programs under development
-dviout/ the dvi previewer for windows which we ship
-installer/ the cross-platform Perl installer.
-libexec/ helpers for ctan2tl.
-tlgs/ the stripped-down Ghostscript for Windows which we ship.
-tlperl/ small Perl for TeX Live scripts, not installed for general use.
-tlpostcode/ scripts for configuration of some packages
-tlpsrc/ original source definitions for all packages in TeX Live.
-tlpsv/ the PostScript previewer for windows which we ship
-translations/ the Perl module used for translations, and all .po files
+archive/ old junk kept online for posterity.
+asymptote/ asymptote binary plus necessary libraries for Windows.
+backups/ where tlmgr backups are kept.
+bin/ stuff for TL developers; nothing for installer or user.
+dev/ Patches and programs under development or in limbo.
+doc/ Documentation of the infrastructure.
+dviout/ DVI previewer for Windows which we ship.
+installer/ cross-platform Perl installer support files.
+libexec/ helpers for ctan2tl, etc.
+texworks/ GUI front end for Windows which we ship.
+tlgs/ stripped-down Ghostscript for Windows which we ship.
+tlperl/ stripped-down Perl for Windows which we ship.
+tlpostcode/ scripts for configuration of some packages.
+tlpsrc/ original source definitions for all packages in TeX Live.
+tlpsv/ PostScript previewer for Windows which we ship.
+translations/ Perl module used for translations, and all .po files.
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index c8a8319bda2..88c3ad5af04 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007-2013 Norbert Preining
+# Copyright 2007-2014 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -54,7 +54,7 @@ BEGIN {
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
-$ReleaseYear = 2013;
+$ReleaseYear = 2014;
# users can upgrade from this year to the current year; maybe a spread
# of more than one year will be useful at some point, but not now.
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index a0b7be60298..0df6b7c9258 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2013 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2014 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index 150b8b21d31..20f78344126 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -15,7 +15,7 @@
# Formats that might be added:
# - afm with (afm2pl?)
#
-# Manuel P\'egouri\'e-Gonnard, 2010-2013. WTFPL v2.
+# Manuel P\'egouri\'e-Gonnard, 2010-2014. WTFPL v2.
BEGIN {
# $^W = 1;
@@ -43,12 +43,14 @@ my $exclude_otf = { '*base*' => 'texmf-dist/fonts/opentype',
# 1 means pdfinfo issues errors but still exits successfully
# 2 means pdfinfo exits non-zero
my $exclude_pdf = {
- # 14nov11 author cannot fix:
- 'texmf-dist/doc/fonts/frcursive/frcursive.pdf' => 1,
+ # author cannot fix:
+ 'texmf-dist/doc/fonts/frcursive/frcursive.pdf' => 1, # 14nov11
+ 'texmf-dist/doc/generic/pst-perspective/' => 1, # 17apr14
# 15dec12 derekn says will be fixed in next xpdf after 3.03:
# (causes seg fault now):
'texmf-dist/doc/latex/ocgx/demo-ocgx.pdf' => -1,
- 'texmf-dist/dvips/tetex/config.pdf' => -1, # not a PDF file
+ # not a PDF file:
+ 'texmf-dist/dvips/tetex/config.pdf' => -1,
};
# the value has no meaning here
diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index acb25c1617f..4c014ffeaaa 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -1,8 +1,6 @@
#!/usr/bin/env perl
# $Id$
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013 TeX Users Group.
-# This file is licensed under the GNU General Public License version 2
-# or any later version.
+# Public domain. Originally written 2008.
#
# Check that the same set of files are wrappers on w32 and symlinks on
# all others.
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 9f15db04524..91c80e7a485 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -1,5 +1,5 @@
#!/bin/sh -e
-# Copyright 2008-2013 Norbert Preining
+# Copyright 2008-2014 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -9,7 +9,7 @@ vc_id='$Id$'
unset CDPATH
unset LS_COLORS
-yyyy=2013
+yyyy=2014
chicken=false
critical=
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 63741347905..cdc142e9839 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -37,33 +37,39 @@ cp -ar ../tlnet /home/ftp/historic/systems/texlive/YYYY/tlnet-final
critical=--critical # push tlcritical
pretest=--pretest # update tlpretest, not tlnet (if not frozen)
net_frozen=false # update tlnet|tlpretest (per $pretest)
-
(tlcritical will remain getting updated daily, even though it doesn't
work with tlnet any more. That's ok.)
3. The next nightly build will update tlpretest, or run
force_rebuild=true cron.tl
+(but good to do the next steps first).
4. Basic updates for release year (to start pretest):
Master/.mkisofsrc
Master/release-texlive.txt
-Master/texmf-dist/web2c/texmf.cnf
-Master/texmf-dist/web2c/texmfcnf.lua
Master/tlpkg/TeXLive/TLConfig.pm
Master/tlpkg/bin/tl-update-tlnet
+Master/texmf-dist/web2c/texmfcnf.lua
+Master/texmf-dist/web2c/texmf.cnf # from Build/.../kpathsea
+(check other copyright years in *.pm, tlmgr*, install-tl)
+
+5. After committing, see if formats build, to check for config file problems.
+Then rm -rf ~/.texlive`date +%Y` # the new one
+Consider new xz and wget binaries.
+Then commit new binaries and rebuild tlpretest as above.
-5. When closer to release:
-in cron.tl, set images_frozen=false.
-in tl-update-images, ensure V= the new YYYY and target=/.../test
-update /home/ftp/texlive/Images/test/README
-after successful image build, email tldistro@tug.org for info/review.
+N. Later, when closer to release:
+- in cron.tl, set images_frozen=false.
+- in tl-update-images, ensure V= the new YYYY and target=/.../test
+- update /home/ftp/texlive/Images/test/README
+- after successful image build, email tldistro@tug.org for info/review.
Really test during pretest (really!):
.fmt's sharable across endian-different platforms (including luatex).
interactive mf '\drawdot (50,50); showit;'
-When finalizing sources (can be even before tlnet freeze for pretest)
+When finalizing sources (best before tlnet freeze for pretest)
version numbers and years and copyright years in:
top level version.ac
dvipdfmx: configure.ac ChangeLog
diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
index f3dc0753cf6..3b89ba251bd 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
@@ -45,4 +45,4 @@ depend opt_write18_restricted:1
# the day we want to freeze a release forever, set this to 1 and tlmgr
# will henceforth bail out saying that TLNNNN is frozen.
-depend opt_frozen:1
+depend opt_frozen:0