[texlive-nonbin] 02/03: update patches of texlive-base
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch experimental
in repository texlive-nonbin.
commit 0bd5030d6394ab433b5105e50a4dc6522ee56d61
Author: Norbert Preining <preining@debian.org>
Date: Sat Apr 16 15:08:32 2016 +0900
update patches of texlive-base
---
texlive-base/debian/patches/debian-texmfcnf.lua | 21 ++++--------
texlive-base/debian/patches/debian-tlmgr-usermode | 30 +++++++++++-------
.../patches/dvipdfmx-config-paper-factorization | 12 +++----
.../patches/dvips-config-paper-factorization | 12 +++----
.../patches/pdftex-config-paper-factorization | 37 ++--------------------
texlive-base/debian/patches/series | 3 +-
texlive-base/debian/patches/texmf.cnf-debian | 35 +++++++-------------
.../debian/patches/xdvi-config-paper-factorization | 12 +++----
8 files changed, 57 insertions(+), 105 deletions(-)
diff --git a/texlive-base/debian/patches/debian-texmfcnf.lua b/texlive-base/debian/patches/debian-texmfcnf.lua
index adf02be..ca5b276 100644
--- a/texlive-base/debian/patches/debian-texmfcnf.lua
+++ b/texlive-base/debian/patches/debian-texmfcnf.lua
@@ -1,10 +1,10 @@
Adjust the texmfcnf.lua file to realities in Debian
---
- texmf-dist/web2c/texmfcnf.lua | 30 ++++++++++++++----------------
- 1 file changed, 14 insertions(+), 16 deletions(-)
+ texmf-dist/web2c/texmfcnf.lua | 26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
---- texlive-base-2015.20150524.orig/texmf-dist/web2c/texmfcnf.lua
-+++ texlive-base-2015.20150524/texmf-dist/web2c/texmfcnf.lua
+--- texlive-base-2016.20160416.orig/texmf-dist/web2c/texmfcnf.lua
++++ texlive-base-2016.20160416/texmf-dist/web2c/texmfcnf.lua
@@ -3,17 +3,15 @@
-- ConTeXt needs a properly expanded TEXMFLOCAL, so here is a
-- bit of lua code to make that happen
@@ -25,24 +25,15 @@ Adjust the texmfcnf.lua file to realities in Debian
content = {
-@@ -44,14 +42,14 @@
+@@ -44,7 +42,7 @@
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
- TEXMFSYSVAR = "selfautoparent:texmf-var",
-- TEXMFVAR = "home:.texlive2015/texmf-var",
+ TEXMFSYSVAR = "/var/lib/texmf",
-+ TEXMFVAR = "home:.texmf-var",
+ TEXMFVAR = "home:.texlive2016/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:.texlive2015/texmf-config",
-+ TEXMFCONFIG = "home:.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
@@ -61,13 +59,13 @@
-- By using prefixes we don't get expanded paths in the cache __path__
-- entry. This makes the tex root relocatable.
diff --git a/texlive-base/debian/patches/debian-tlmgr-usermode b/texlive-base/debian/patches/debian-tlmgr-usermode
index 7e47cf5..bd075c7 100644
--- a/texlive-base/debian/patches/debian-tlmgr-usermode
+++ b/texlive-base/debian/patches/debian-tlmgr-usermode
@@ -1,10 +1,10 @@
---
texmf-dist/doc/man/man1/tlmgr.1 | 2 +
- texmf-dist/scripts/texlive/tlmgr.pl | 43 ++++--------------------------------
- 2 files changed, 7 insertions(+), 38 deletions(-)
+ texmf-dist/scripts/texlive/tlmgr.pl | 50 +++---------------------------------
+ 2 files changed, 7 insertions(+), 45 deletions(-)
---- texlive-base-2015.20150809.orig/texmf-dist/scripts/texlive/tlmgr.pl
-+++ texlive-base-2015.20150809/texmf-dist/scripts/texlive/tlmgr.pl
+--- texlive-base-2016.20160416.orig/texmf-dist/scripts/texlive/tlmgr.pl
++++ texlive-base-2016.20160416/texmf-dist/scripts/texlive/tlmgr.pl
@@ -20,7 +20,7 @@
$tlmgrrevision .= " ($datrev)";
@@ -14,7 +14,7 @@
our $loadmediasrcerror;
our $packagelogfile;
our $packagelogged;
-@@ -38,44 +38,8 @@
+@@ -38,50 +38,7 @@
BEGIN {
$^W = 1;
@@ -54,13 +54,19 @@
- # if not in bootstrapping mode => kpsewhich exists, so use it to get $Master
- chomp($Master = `kpsewhich -var-value=SELFAUTOPARENT`);
- }
-+ $Master = "/usr/share/texlive";
- $::installerdir = $Master;
-
- #
+- # if we have no directory in which to find our modules,
+- # no point in going on.
+- if (! $Master) {
+- die ("Could not determine directory of tlmgr executable, "
+- . "maybe shared library woes?\nCheck for error messages above");
+- }
+-
++ $Master = "/usr/share/texlive";
+ $::installerdir = $Master; # for config.guess et al., see TLUtils.pm
+
# make Perl find our packages first:
- unshift (@INC, "$Master/tlpkg");
-@@ -378,6 +342,9 @@
+@@ -370,6 +327,9 @@
GetOptions(\%opts, keys(%optarg)) or pod2usage(2);
@@ -70,8 +76,8 @@
$::debug_translation = 0;
$::debug_translation = 1 if $opts{"debug-translation"};
---- texlive-base-2015.20150809.orig/texmf-dist/doc/man/man1/tlmgr.1
-+++ texlive-base-2015.20150809/texmf-dist/doc/man/man1/tlmgr.1
+--- texlive-base-2016.20160416.orig/texmf-dist/doc/man/man1/tlmgr.1
++++ texlive-base-2016.20160416/texmf-dist/doc/man/man1/tlmgr.1
@@ -154,6 +154,8 @@
<http://tug.org/texlive/tlmgr.html>, along with procedures for updating
\&\f(CW\*(C`tlmgr\*(C'\fR itself and information about test versions.
diff --git a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
index d8143b8..7843383 100644
--- a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
+++ b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
@@ -5,7 +5,7 @@
3 files changed, 14 insertions(+), 8 deletions(-)
--- /dev/null
-+++ texlive-base-2015.20151116/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
++++ texlive-base-2016.20160416/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
@@ -0,0 +1,11 @@
+%% PDF Document Settings
+%%
@@ -18,8 +18,8 @@
+
+p a4
+
---- texlive-base-2015.20151116.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
-+++ texlive-base-2015.20151116/texmf-dist/dvipdfmx/dvipdfmx.cfg
+--- texlive-base-2016.20160416.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
++++ texlive-base-2016.20160416/texmf-dist/dvipdfmx/dvipdfmx.cfg
@@ -29,14 +29,8 @@
%% PDF Document Settings
@@ -37,9 +37,9 @@
%% Annotation Box Margin:
%%
---- texlive-base-2015.20151116.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2015.20151116/tlpkg/texlive.tlpdb
-@@ -70031,6 +70031,7 @@
+--- texlive-base-2016.20160416.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2016.20160416/tlpkg/texlive.tlpdb
+@@ -71796,6 +71796,7 @@
texmf-dist/doc/man/man1/xdvipdfmx.man1.pdf
runfiles size=42
texmf-dist/dvipdfmx/dvipdfmx.cfg
diff --git a/texlive-base/debian/patches/dvips-config-paper-factorization b/texlive-base/debian/patches/dvips-config-paper-factorization
index 735ce03..3f82f01 100644
--- a/texlive-base/debian/patches/dvips-config-paper-factorization
+++ b/texlive-base/debian/patches/dvips-config-paper-factorization
@@ -5,7 +5,7 @@
3 files changed, 532 insertions(+), 518 deletions(-)
--- /dev/null
-+++ texlive-base-2015.20151116/texmf-dist/dvips/config/config-paper.ps
++++ texlive-base-2016.20160416/texmf-dist/dvips/config/config-paper.ps
@@ -0,0 +1,524 @@
+%
+% config-paper.ps
@@ -531,8 +531,8 @@
+@+ if
+@+ %%EndPaperSize
+
---- texlive-base-2015.20151116.orig/texmf-dist/dvips/config/config.ps
-+++ texlive-base-2015.20151116/texmf-dist/dvips/config/config.ps
+--- texlive-base-2016.20160416.orig/texmf-dist/dvips/config/config.ps
++++ texlive-base-2016.20160416/texmf-dist/dvips/config/config.ps
@@ -67,524 +67,13 @@
%
% emacs-page
@@ -1065,9 +1065,9 @@
% use -t unknown with a \special{papersize=...} for a nonstandard page size.
@ unknown 0in 0in
---- texlive-base-2015.20151116.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2015.20151116/tlpkg/texlive.tlpdb
-@@ -70777,6 +70777,7 @@
+--- texlive-base-2016.20160416.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2016.20160416/tlpkg/texlive.tlpdb
+@@ -72481,6 +72481,7 @@
texmf-dist/dvips/config/config.mirrorprint
texmf-dist/dvips/config/config.ot2
texmf-dist/dvips/config/config.ps
diff --git a/texlive-base/debian/patches/pdftex-config-paper-factorization b/texlive-base/debian/patches/pdftex-config-paper-factorization
index b0b083b..d436e54 100644
--- a/texlive-base/debian/patches/pdftex-config-paper-factorization
+++ b/texlive-base/debian/patches/pdftex-config-paper-factorization
@@ -1,11 +1,9 @@
---
texmf-dist/tex/generic/config/pdftexconfig-paper.tex | 13 +++++++++++++
- texmf-dist/tex/generic/config/pdftexconfig.tex | 12 ++----------
- tlpkg/texlive.tlpdb | 1 +
- 3 files changed, 16 insertions(+), 10 deletions(-)
+ 1 file changed, 13 insertions(+)
--- /dev/null
-+++ texlive-base-2015.20151116/texmf-dist/tex/generic/config/pdftexconfig-paper.tex
++++ texlive-base-2016.20160416/texmf-dist/tex/generic/config/pdftexconfig-paper.tex
@@ -0,0 +1,13 @@
+% paper size settings, included from pdftexconfig.tex for pdftex
+%
@@ -20,34 +18,3 @@
+\ifx\pdfpageheight\undefined\else \pdfpageheight=297 true mm \fi
+\ifx\pageheight\undefined\else \pageheight=297 true mm \fi
+\endinput
---- texlive-base-2015.20151116.orig/texmf-dist/tex/generic/config/pdftexconfig.tex
-+++ texlive-base-2015.20151116/texmf-dist/tex/generic/config/pdftexconfig.tex
-@@ -3,16 +3,8 @@
- % Thomas Esser, 2004. public domain.
- \pdfoutput=1
- %
--% In 2015, a new luatex replaced \pdfpage{width,height} with just
--% \page{width,height}, and it might be prefixed with \luatex. So set
--% any that may be defined.
--\ifx\luatexpagewidth\undefined\else \luatexpagewidth=210 true mm \fi
--\ifx\pdfpagewidth\undefined\else \pdfpagewidth=210 true mm \fi
--\ifx\pagewidth\undefined\else \pagewidth=210 true mm \fi
--%
--\ifx\luatexpageheight\undefined\else \luatexpageheight=297 true mm \fi
--\ifx\pdfpageheight\undefined\else \pdfpageheight=297 true mm \fi
--\ifx\pageheight\undefined\else \pageheight=297 true mm \fi
-+% pdftex paper settings are in pdftexconfig-paper.tex
-+\input pdftexconfig-paper.tex
- %
- % Other settings.
- \pdfcompresslevel=9
---- texlive-base-2015.20151116.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2015.20151116/tlpkg/texlive.tlpdb
-@@ -160593,6 +160593,7 @@
- texmf-dist/scripts/simpdftex/simpdftex
- texmf-dist/tex/generic/config/pdftex-dvi.tex
- texmf-dist/tex/generic/config/pdftexconfig.tex
-+ texmf-dist/tex/generic/config/pdftexconfig-paper.tex
- texmf-dist/tex/generic/pdftex/glyphtounicode.tex
- texmf-dist/tex/generic/pdftex/pdfcolor.tex
- catalogue-date 2015-08-03 05:43:12 +0200
diff --git a/texlive-base/debian/patches/series b/texlive-base/debian/patches/series
index 016aeeb..f93d9ed 100644
--- a/texlive-base/debian/patches/series
+++ b/texlive-base/debian/patches/series
@@ -12,7 +12,8 @@ fix-scripts
# debian internal stuff
dvips-config-paper-factorization
dvipdfmx-config-paper-factorization
-pdftex-config-paper-factorization
+# is done by copying pdftexconfig.tex to /etc/texmf...
+#pdftex-config-paper-factorization
xdvi-config-paper-factorization
# debian internal, location of modules is different
debian_updmap-search-path
diff --git a/texlive-base/debian/patches/texmf.cnf-debian b/texlive-base/debian/patches/texmf.cnf-debian
index 9c1a3c3..dd6051b 100644
--- a/texlive-base/debian/patches/texmf.cnf-debian
+++ b/texlive-base/debian/patches/texmf.cnf-debian
@@ -1,10 +1,10 @@
---
- texmf-dist/web2c/texmf.cnf | 53 ++++++++++++---------------------------------
- 1 file changed, 15 insertions(+), 38 deletions(-)
+ texmf-dist/web2c/texmf.cnf | 49 +++++++++++----------------------------------
+ 1 file changed, 13 insertions(+), 36 deletions(-)
---- texlive-base-2015.20150524.orig/texmf-dist/web2c/texmf.cnf
-+++ texlive-base-2015.20150524/texmf-dist/web2c/texmf.cnf
-@@ -51,7 +51,7 @@
+--- texlive-base-2016.20160416.orig/texmf-dist/web2c/texmf.cnf
++++ texlive-base-2016.20160416/texmf-dist/web2c/texmf.cnf
+@@ -54,7 +54,7 @@
% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
% Kpathsea sets SELFAUTOLOC (the directory with the binary),
% SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
@@ -13,7 +13,7 @@
% The main tree of distributed packages and programs:
TEXMFDIST = $TEXMFROOT/texmf-dist
-@@ -60,14 +60,17 @@
+@@ -63,14 +63,17 @@
% Keep the variable name.
TEXMFMAIN = $TEXMFDIST
@@ -34,20 +34,7 @@
% Per-user texmf tree(s) -- organized per the TDS, as usual. To define
% more than one per-user tree, set this to a list of directories in
-@@ -76,10 +79,10 @@
- TEXMFHOME = ~/texmf
-
- % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
--TEXMFVAR = ~/.texlive2015/texmf-var
-+TEXMFVAR = ~/.texmf-var
-
- % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
--TEXMFCONFIG = ~/.texlive2015/texmf-config
-+TEXMFCONFIG = ~/.texmf-config
-
- % List all the texmf trees. For an explanation of what they are, see the
- % TeX Live manual.
-@@ -91,7 +94,7 @@
+@@ -94,7 +97,7 @@
% should take precedence over distribution files -- although it is
% generally a source of confusion to have different versions of a
% package installed, whatever the trees, so try to avoid it.
@@ -56,7 +43,7 @@
% Where to look for ls-R files. There need not be an ls-R in the
% directories in this path, but if there is one, Kpathsea will use it.
-@@ -99,13 +102,13 @@
+@@ -102,13 +105,13 @@
% does not create ls-R files in the non-!! elements -- because if an
% ls-R is present, it will be used, and the disk will not be searched.
% This is arguably a bug in kpathsea.
@@ -72,7 +59,7 @@
% First writable tree here is used by Lua(La)TeX for the font cache.
% LuaLaTeX uses the value here, while ConTeXt uses the same variable but
-@@ -116,7 +119,7 @@
+@@ -119,7 +122,7 @@
% Where generated fonts may be written. This tree is used when the sources
% were found in a system tree and either that tree wasn't writable, or the
% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
@@ -81,7 +68,7 @@
% On some systems, there will be a system tree which contains all the font
% files that may be created as well as the formats. For example
-@@ -330,7 +333,7 @@
+@@ -333,7 +336,7 @@
% OSFONTDIR is to provide a convenient hook for allowing TeX to find
% fonts installed on the system (outside of TeX). An empty default
% value would add "//" to the search paths, so we give it a dummy value.
@@ -90,7 +77,7 @@
% PostScript Type 1 outline fonts.
T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
-@@ -486,33 +489,7 @@
+@@ -489,33 +492,7 @@
% since we don't want to scatter ../'s throughout the value. Hence we
% explicitly list every directory. Arguably more understandable anyway.
%
diff --git a/texlive-base/debian/patches/xdvi-config-paper-factorization b/texlive-base/debian/patches/xdvi-config-paper-factorization
index 8557d1b..9f67a5e 100644
--- a/texlive-base/debian/patches/xdvi-config-paper-factorization
+++ b/texlive-base/debian/patches/xdvi-config-paper-factorization
@@ -4,8 +4,8 @@
tlpkg/texlive.tlpdb | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
---- texlive-base-2015.20151116.orig/texmf-dist/xdvi/XDvi
-+++ texlive-base-2015.20151116/texmf-dist/xdvi/XDvi
+--- texlive-base-2016.20160416.orig/texmf-dist/xdvi/XDvi
++++ texlive-base-2016.20160416/texmf-dist/xdvi/XDvi
@@ -21,7 +21,17 @@
!!! and greater flexibility for shrink values. Generating MF fonts shouldn't be an
!!! issue when using T1lib.
@@ -26,12 +26,12 @@
!!! This should be the best choice for modern displays with large color depth.
*thorough: true
--- /dev/null
-+++ texlive-base-2015.20151116/texmf-dist/xdvi/XDvi-paper
++++ texlive-base-2016.20160416/texmf-dist/xdvi/XDvi-paper
@@ -0,0 +1 @@
+*paper: a4
---- texlive-base-2015.20151116.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2015.20151116/tlpkg/texlive.tlpdb
-@@ -234009,6 +234009,7 @@
+--- texlive-base-2016.20160416.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2016.20160416/tlpkg/texlive.tlpdb
+@@ -240413,6 +240413,7 @@
runfiles size=9
texmf-dist/dvips/xdvi/config.xdvi
texmf-dist/xdvi/XDvi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: