summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-01-12 00:05:23 +0000
committerKarl Berry <karl@freefriends.org>2013-01-12 00:05:23 +0000
commit35f9e4707234c3f5c452382ad5b0fce7ee226b2c (patch)
treefdc725b26b1991d87deb33ea2f1f33f3ad25d41d /Master
parent5637ff5e782e48a900434b08e93b1251633ab3d6 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@28806 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/bibtex/bib/beebe/tugboat.bib14
-rw-r--r--Master/texmf-dist/tex/texinfo/texinfo.tex5
-rwxr-xr-xMaster/tlpkg/bin/check-files-by-format2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-auto3
-rw-r--r--Master/tlpkg/dev/srclist.txt4
5 files changed, 15 insertions, 13 deletions
diff --git a/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib b/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib
index c59d207efd8..da5b1b1bedf 100644
--- a/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib
+++ b/Master/texmf-dist/bibtex/bib/beebe/tugboat.bib
@@ -2,9 +2,9 @@
%%% ====================================================================
%%% BibTeX-file{
%%% author = "Nelson H. F. Beebe",
-%%% version = "1.40",
-%%% date = "15 December 2012",
-%%% time = "09:28:31 MST",
+%%% version = "1.41",
+%%% date = "28 December 2012",
+%%% time = "07:50:33 MST",
%%% filename = "tugboat.bib",
%%% address = "University of Utah
%%% Department of Mathematics, 110 LCB
@@ -14,7 +14,7 @@
%%% telephone = "+1 801 581 5254",
%%% FAX = "+1 801 581 4148",
%%% URL = "http://www.math.utah.edu/~beebe",
-%%% checksum = "20460 46550 158739 1604169",
+%%% checksum = "22664 46550 158739 1604169",
%%% email = "beebe at math.utah.edu, beebe at acm.org,
%%% beebe at computer.org (Internet)",
%%% codetable = "ISO/ASCII",
@@ -26,7 +26,7 @@
%%% TUGboat (ISSN 0896-3207, LCCN Z253.4.T47T83),
%%% the Communications of the TeX Users Group.
%%%
-%%% At version 1.40, the year coverage looked
+%%% At version 1.41, the year coverage looked
%%% like this:
%%%
%%% 1980 ( 11) 1991 ( 190) 2002 ( 71)
@@ -46088,8 +46088,8 @@
}
@Article{editors:TB32-2-132,
- author = "\TeX\ Collection editors",
- title = "{{\TeX}} {Collection} 2011 {\DVD}",
+ author = "{\TeX\ Collection editors}",
+ title = "{{\TeX{}} Collection 2011 \DVD}",
journal = j-TUGboat,
volume = "32",
number = "2",
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index b5f31415771..bd18a117401 100644
--- a/Master/texmf-dist/tex/texinfo/texinfo.tex
+++ b/Master/texmf-dist/tex/texinfo/texinfo.tex
@@ -7,7 +7,7 @@
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -24,7 +24,8 @@
%
% As a special exception, when this file is read by TeX when processing
% a Texinfo source document, you may use the result without
-% restriction. (This has been our intent since Texinfo was invented.)
+% restriction. This Exception is an additional permission under section 7
+% of the GNU General Public License, version 3 ("GPLv3").
%
% Please try the latest version of texinfo.tex before submitting bug
% reports; you can get the latest version from:
diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index cd602cf3c62..acd9651df49 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -99,7 +99,7 @@ my $exclude_pfb = { '*base*' => 'texmf-dist/fonts/type1',
'public/itrans/' => 1,
'public/kerkis/' => 1,
'public/kpfonts/' => 1,
- 'public/libertine-legacy/' => 1,
+ 'public/libertine/' => 1, # 5jan13 maintainer declines to fix triviality
'public/linearA/' => 1,
'public/lm/' => 1,
'public/lxfonts/' => 1,
diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index 978cea82ef0..22e2dffb252 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -131,7 +131,8 @@ fi # !config_scripts_only
#
config_masterdir=/home/ftp/dist/build-aux
#
-for gnuconf in config.guess config.sub depcomp install-sh texinfo.tex; do
+for gnuconf in config.guess config.sub depcomp install-sh ltmain.sh \
+ missing texinfo.tex ylwrap; do
master_conffile=$config_masterdir/$gnuconf
local_conffile=../Build/source/build-aux/$gnuconf
#
diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt
index e36dcdbfa79..a8d883be3cd 100644
--- a/Master/tlpkg/dev/srclist.txt
+++ b/Master/tlpkg/dev/srclist.txt
@@ -40,8 +40,8 @@ Build/source/texk/texlive/w32_wrapper/runscript.tlu Master/bin/win32/runscript.t
# the automake path is unfortunate, but automake provides no
# version-independent access.
/usr/local/gnu/share/libtool/config/ltmain.sh Build/source/build-aux/ltmain.sh
-/usr/local/gnu/share/automake-1.12/missing Build/source/build-aux/missing
-/usr/local/gnu/share/automake-1.12/ylwrap Build/source/build-aux/ylwrap
+/usr/local/gnu/share/automake-1.13/missing Build/source/build-aux/missing
+/usr/local/gnu/share/automake-1.13/ylwrap Build/source/build-aux/ylwrap
#
##todo: linked_scripts
##