summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipsk/ChangeLog4
-rwxr-xr-xMaster/install-tl2
-rw-r--r--Master/texmf-dist/doc/latex/spanish/doc/spanish.pdf180
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl8
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm2
-rwxr-xr-xMaster/tlpkg/bin/check-wrapper-consistency2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-images25
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc10
8 files changed, 26 insertions, 207 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 4eeed943857..fb218112e3c 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,5 +1,9 @@
2010-05-25 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+ * config.ps: include cid-base.map.
+
+2010-05-25 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
* search.c: quote command in W32 case to allow path name
with spaces.
diff --git a/Master/install-tl b/Master/install-tl
index 8c802f1bdc6..5e639666a8e 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1675,7 +1675,7 @@ sub welcome_paths
$welcome .= <<"EOF";
- Add $::vars{'TEXDIR'}/texmf/doc/man to MANPATH.
+ Add $::vars{'TEXDIR'}/texmf/doc/man to MANPATH, if not dynamically determined.
Add $::vars{'TEXDIR'}/texmf/doc/info to INFOPATH.
EOF
diff --git a/Master/texmf-dist/doc/latex/spanish/doc/spanish.pdf b/Master/texmf-dist/doc/latex/spanish/doc/spanish.pdf
deleted file mode 100644
index 31b2d4b6c9b..00000000000
--- a/Master/texmf-dist/doc/latex/spanish/doc/spanish.pdf
+++ /dev/null
@@ -1,180 +0,0 @@
-%PDF-1.4
-%
-1 0 obj
-<< /S /GoTo /D (section.1) >>
-endobj
-4 0 obj
-(Uso de spanish para babel)
-endobj
-5 0 obj
-<< /S /GoTo /D (section.2) >>
-endobj
-8 0 obj
-(spanish como lengua principal)
-endobj
-9 0 obj
-<< /S /GoTo /D (subsection.2.1) >>
-endobj
-12 0 obj
-(Listas)
-endobj
-13 0 obj
-<< /S /GoTo /D (subsection.2.2) >>
-endobj
-16 0 obj
-(Contadores)
-endobj
-17 0 obj
-<< /S /GoTo /D (subsection.2.3) >>
-endobj
-20 0 obj
-(Otros)
-endobj
-21 0 obj
-<< /S /GoTo /D (section.3) >>
-endobj
-24 0 obj
-(Traducciones)
-endobj
-25 0 obj
-<< /S /GoTo /D (subsection.3.1) >>
-endobj
-28 0 obj
-(Nombres)
-endobj
-29 0 obj
-<< /S /GoTo /D (subsection.3.2) >>
-endobj
-32 0 obj
-(Fechas)
-endobj
-33 0 obj
-<< /S /GoTo /D (section.4) >>
-endobj
-36 0 obj
-(Abreviaciones \(shorthands\))
-endobj
-37 0 obj
-<< /S /GoTo /D (subsection.4.1) >>
-endobj
-40 0 obj
-(Coma decimal)
-endobj
-41 0 obj
-<< /S /GoTo /D (subsection.4.2) >>
-endobj
-44 0 obj
-(Divisi\363n de palabras)
-endobj
-45 0 obj
-<< /S /GoTo /D (subsection.4.3) >>
-endobj
-48 0 obj
-(Otros)
-endobj
-49 0 obj
-<< /S /GoTo /D (section.5) >>
-endobj
-52 0 obj
-(Funciones de texto y matem\341ticas)
-endobj
-53 0 obj
-<< /S /GoTo /D (subsection.5.1) >>
-endobj
-56 0 obj
-(Abreviaturas)
-endobj
-57 0 obj
-<< /S /GoTo /D (subsection.5.2) >>
-endobj
-60 0 obj
-(Espaciado)
-endobj
-61 0 obj
-<< /S /GoTo /D (subsection.5.3) >>
-endobj
-64 0 obj
-(Fuentes)
-endobj
-65 0 obj
-<< /S /GoTo /D (subsection.5.4) >>
-endobj
-68 0 obj
-(Entrecomillados)
-endobj
-69 0 obj
-<< /S /GoTo /D (subsection.5.5) >>
-endobj
-72 0 obj
-(Funciones matem\341ticas)
-endobj
-73 0 obj
-<< /S /GoTo /D (section.6) >>
-endobj
-76 0 obj
-(Opciones generales)
-endobj
-77 0 obj
-<< /S /GoTo /D (section.7) >>
-endobj
-80 0 obj
-(Selecci\363n)
-endobj
-81 0 obj
-<< /S /GoTo /D (section.8) >>
-endobj
-84 0 obj
-(Adaptaci\363n)
-endobj
-85 0 obj
-<< /S /GoTo /D (subsection.8.1) >>
-endobj
-88 0 obj
-(Opciones por pa\355ses)
-endobj
-89 0 obj
-<< /S /GoTo /D (subsection.8.2) >>
-endobj
-92 0 obj
-(Configuraci\363n)
-endobj
-93 0 obj
-<< /S /GoTo /D (subsection.8.3) >>
-endobj
-96 0 obj
-(Pasar opciones desde un paquete o clase)
-endobj
-97 0 obj
-<< /S /GoTo /D (subsection.8.4) >>
-endobj
-100 0 obj
-(Otros cambios)
-endobj
-101 0 obj
-<< /S /GoTo /D (section.9) >>
-endobj
-104 0 obj
-(Plain TeX)
-endobj
-105 0 obj
-<< /S /GoTo /D (section.10) >>
-endobj
-108 0 obj
-(Compatibilidad con versiones anteriores)
-endobj
-109 0 obj
-<< /S /GoTo /D (section*.3) >>
-endobj
-112 0 obj
-(Referencias)
-endobj
-113 0 obj
-<< /S /GoTo /D [114 0 R /Fit ] >>
-endobj
-137 0 obj <<
-/Length 1593
-/Filter /FlateDecode
->>
-stream
-xZYo6~УD4oQS-ImQ *tluر}GA vIZr838p ~fqrzɈduDD瑔Q%2CYgLYrW9~_Q)%('ӯu
-?L"4#+}HbRy6@"Nk0$c!L HJL!BN(oKyߘ(xvHJc[r0bQ >-̋X \ No newline at end of file
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 4ffb20675bc..4f04e60a344 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
# $Id$
#
-# Copyright 2008, 2009 Norbert Preining
+# Copyright 2008, 2009, 2010 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -554,10 +554,10 @@ sub handle_execute_actions
# addLuaMap handling
# if defined simply run the magic script
{
- if (defined($::execute_actions{'enable'}{'luamaps'}{'run'}) ||
- defined($::execute_actions{'disable'}{'luamaps'}{'run'})) {
+ if (defined($::execute_actions{'enable'}{'luamaps'}{'run'})
+ || defined($::execute_actions{'disable'}{'luamaps'}{'run'})) {
# check for the existence, the PATH should be set up already
- if (which("mkluatexfontdb-sys")) {
+ if (TeXLive::TLUtils::which("mkluatexfontdb-sys")) {
$errors += do_cmd_and_check("mkluatexfontdb-sys");
} else {
log("tlmgr addLuaMap handling: mkluatexfontdb-sys not found, not running it.\n");
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index a3b394f8fb6..f3b271ee81f 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -126,7 +126,7 @@ our %TLPDBConfigs = (
our %TLPDBOptions = (
"autobackup" =>
- [ "n:-1..", 0, "autobackup",
+ [ "n:-1..", 1, "autobackup",
"Number of backups to keep" ],
"backupdir" =>
[ "p", "", "backupdir",
diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index 989016f3ced..82154eb4880 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -97,7 +97,7 @@ sub check_w32
for my $k (sort keys %uw) {
my $target = $uw{$k};
next if $target =~ /bibexport/; # shell script
- # next if $target =~ /context/; # will have its own stubs
+ next if $target =~ /context/; # does it its own way
next if $target =~ /dviout/; # gui stub
next if $target =~ /listings-ext/; # shell script
next if $target =~ /man/; # no symlink
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 369d8fc26a4..daac83db526 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -100,29 +100,28 @@ MAKEINST ()
cd $imgdir || exit 1
rm doc.html tlpkg/texlive.tlpdb.xz
- #mkisofs $common_mkisofs_options -o $iso .
-false # xxdebug
+ mkisofs $common_mkisofs_options -o $iso .
rm -rf $imgdir
# also make compressed version, helps people downloading test images.
# this takes two hours or so, so write to a temp file and then rename.
- xz -9 -v <$live_iso >$live_iso.xz.part
- mv $live_iso.xz.part $live_iso.xz
+ xz -9 -v <$iso >$iso.xz.part
+ mv $iso.xz.part $iso.xz
# make checksums
# and symlinks with short names (potentially used in /etc/fstab).
for ext in "" .xz; do
rm -f $prefix.iso$ext $prefix.iso$ext.md5 $prefix.iso$ext.sha256
- (cd $target && md5sum `basename $live_iso$ext`) >$live_iso$ext.md5
- (cd $target && sha256sum `basename $live_iso$ext`) >$live_iso$ext.sha256
+ (cd $target && md5sum `basename $iso$ext`) >$iso$ext.md5
+ (cd $target && sha256sum `basename $iso$ext`) >$iso$ext.sha256
- ln -s `basename $live_iso$ext` $prefix.iso$ext
- ln -s `basename $live_iso`$ext.md5 $prefix.iso$ext.md5
- ln -s `basename $live_iso`$ext.sha256 $prefix.iso$ext.sha256
+ ln -s `basename $iso$ext` $prefix.iso$ext
+ ln -s `basename $iso`$ext.md5 $prefix.iso$ext.md5
+ ln -s `basename $iso`$ext.sha256 $prefix.iso$ext.sha256
- ls -l $live_iso$ext
+ ls -l $iso$ext
done
}
@@ -156,7 +155,6 @@ do_tar ()
MAKETAR ()
{
-false # xxdebug
# remove old tarballs and checksums.
rm -f $target/$NAME-*.tar.*
@@ -178,13 +176,12 @@ false # xxdebug
# main program.
# Add our exact version to the release file.
-#printf "\ntexlive-$D\n" >>$master/release-texlive.txt
+printf "\ntexlive-$D\n" >>$master/release-texlive.txt
$makeinst && MAKEINST
$maketar && MAKETAR
-#$makelive && MAKELIVE
# Undo the version.
-#svn revert $master/release-texlive.txt
+svn revert $master/release-texlive.txt
exit 0
diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
index 0d1bacb8113..280c443fd4e 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
@@ -9,11 +9,9 @@ longdesc 2. on an installed system it serves as a configuration file.
longdesc We have to remember these settings for additional package
longdesc installation, removal, etc.
longdesc
-longdesc In the tlpsrc itself only those options are saved that are used *ONLY*
-longdesc at installation time, currently opt_paper, opt_path, opt_frozen,
-longdesc and opt_write18_restricted.
-longdesc These will longdesc be saved in the local tlpdb and will not be
-longdesc accessible by tlmgr.
+longdesc In this tlpsrc, the only options listed are those that are used
+longdesc *ONLY* at installation time. These are saved in the local
+longdesc tlpdb and will not be accessible by tlmgr.
longdesc
longdesc All other options are set from TLConfig::TLPDBOptions to the
longdesc default values specified there.
@@ -36,7 +34,7 @@ longdesc installer to use the present directory itself. For example,
longdesc the DVD can be mounted anywhere and we want the installer to work.
longdesc
longdesc Concerning the 00* names:
-longdesc All packages starting with 00texlive are considered virtual packages
+longdesc All packages starting with 00texlive are ``virtual packages'',
longdesc in the sense that no containers are generated and these packages
longdesc are never split into .src and .doc sub-packages in the tlpdb.