summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-28 16:35:28 +0000
committerKarl Berry <karl@freefriends.org>2011-05-28 16:35:28 +0000
commitc96567a73dfa159f9672fa2819ce0b3cd198d764 (patch)
tree8208e2b54d9976a754f5901876d6d3d84bd02cc9
parentceb3dc5ad4e1cb33d6acfc37b57c7e29bd49e10d (diff)
2011
git-svn-id: svn://tug.org/texlive/trunk@22642 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/release-texlive.txt2
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm6
-rw-r--r--Master/tlpkg/TeXLive/trans.pl4
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.config.tlpsrc13
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc2
5 files changed, 15 insertions, 12 deletions
diff --git a/Master/release-texlive.txt b/Master/release-texlive.txt
index 684cafa3cf9..64c5b94c7a6 100644
--- a/Master/release-texlive.txt
+++ b/Master/release-texlive.txt
@@ -1,4 +1,4 @@
-TeX Live (http://tug.org/texlive) version 2010
+TeX Live (http://tug.org/texlive) version 2011
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/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index f13ebbd94a2..7447431b9ec 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -1,6 +1,6 @@
# $Id$
-# TeXLive::TLConfig.pm - module exporting configuration stuff
-# Copyright 2007, 2008, 2009, 2010 Norbert Preining
+# TeXLive::TLConfig.pm - module exporting configuration values
+# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -53,7 +53,7 @@ BEGIN {
# the year of our release, will be used in the location of the
# network packages, and in menu names, and probably many other places
-$ReleaseYear = 2010;
+$ReleaseYear = 2011;
# Meta Categories do not ship files, but call only for other packages
our @MetaCategories = qw/Collection Scheme/;
diff --git a/Master/tlpkg/TeXLive/trans.pl b/Master/tlpkg/TeXLive/trans.pl
index 6de1acfc756..c110b72922b 100644
--- a/Master/tlpkg/TeXLive/trans.pl
+++ b/Master/tlpkg/TeXLive/trans.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
-# $Id: trans.pl 14198 2009-07-09 11:39:06Z preining $
-# Copyright 2009, 2010 Norbert Preining
+# $Id$
+# Copyright 2009, 2010, 2011 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
diff --git a/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc
index 6a93411728f..c01b787bcaf 100644
--- a/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.config.tlpsrc
@@ -1,12 +1,15 @@
category TLCore
shortdesc TeX Live network archive option settings
-longdesc This package contains configuration options for the TeX Live archive
-longdesc If container_split_{doc,src}_files occurs in the depend lines the
+longdesc This package contains configuration options for the TeX Live archive.
+longdesc
+longdesc If container_split_{doc,src}_files/1 are dependencies, the
longdesc {doc,src} files are split into separate containers (.tar.xz)
longdesc during container build time. Note that this has NO effect on the
-longdesc appearance within the texlive.tlpdb. It is only on container level.
-longdesc The container_format/XXXXX specifies the format, currently allowed
-longdesc is only "xz", which generates .tar.xz files. zip can be supported.
+longdesc appearance within texlive.tlpdb. It is only on the container level.
+longdesc
+longdesc The container_format/WHATEVER specifies the format, currently "xz"
+longdesc the only supported value (generating .tar.xz files).
+longdesc
longdesc release/NNNN specifies the release number as used in the installer.
longdesc
longdesc These values are taken from TeXLive::TLConfig::TLPDBConfigs hash
diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
index ef7fa077165..f44e6b64587 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
@@ -44,4 +44,4 @@ depend opt_write18_restricted:1
# if we want to make a dist frozen uncomment that and tlmgr will bail out
# telling that TLNNNN is frozen
-depend opt_frozen:1
+depend opt_frozen:0