[texlive-bin] 04/05: update patches
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch experimental
in repository texlive-bin.
commit 55cf6e10fc52bd723c11304e51f88a135836b701
Author: Norbert Preining <preining@debian.org>
Date: Wed May 24 11:49:48 2017 +0900
update patches
---
debian/patches/debian-builtin-searchpath | 41 +++++++++------------
debian/patches/fix-format-gcc-errors | 4 +-
debian/patches/fix-manpages | 63 +++++---------------------------
debian/patches/series | 29 ---------------
4 files changed, 28 insertions(+), 109 deletions(-)
diff --git a/debian/patches/debian-builtin-searchpath b/debian/patches/debian-builtin-searchpath
index 8f83fe0..3638a54 100644
--- a/debian/patches/debian-builtin-searchpath
+++ b/debian/patches/debian-builtin-searchpath
@@ -4,8 +4,8 @@
## DP: adjust built-in search paths for kpathsea library to Debian standard
@DPATCH@
- texk/kpathsea/texmf.cnf | 52 +++++++++++++-----------------------------------
- 1 file changed, 15 insertions(+), 37 deletions(-)
+ texk/kpathsea/texmf.cnf | 50 +++++++++++++-----------------------------------
+ 1 file changed, 14 insertions(+), 36 deletions(-)
--- texlive-bin.orig/texk/kpathsea/texmf.cnf
+++ texlive-bin/texk/kpathsea/texmf.cnf
@@ -41,41 +41,34 @@
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
--TEXMFVAR = ~/.texlive2016/texmf-var
+-TEXMFVAR = ~/.texlive2017/texmf-var
+TEXMFVAR = ~/.texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
--TEXMFCONFIG = ~/.texlive2016/texmf-config
+-TEXMFCONFIG = ~/.texlive2017/texmf-config
+TEXMFCONFIG = ~/.texmf-config
- % List all the texmf trees. For an explanation of what they are, see the
- % TeX Live manual.
-@@ -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.
--TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
-+TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDEBIAN,!!$TEXMFDIST}
+ % This is the value manipulated by tlmgr's auxtrees subcommand in the
+ % root texmf.cnf. Kpathsea warns about a literally empty string for a
+@@ -103,7 +106,7 @@
+ % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
+ % ever defined (the 99% common case), no extra elements will be added to
+ % the search paths. tlmgr takes care to end any value with a trailing comma.
+-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
++TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$TEXMFDIST}
% 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.
-@@ -102,13 +105,13 @@
+@@ -111,7 +114,7 @@
% 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.
--TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
-+TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDEBIAN,!!$TEXMFDIST}
+-TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
++TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$TEXMFDIST}
% The system trees. These are the trees that are shared by all users.
% If a tree appears in this list, the mktex* scripts will use
- % VARTEXFONTS for generated files, if the original tree isn't writable;
- % otherwise the current working directory is used.
--SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST
-+SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDEBIAN;$TEXMFDIST
-
- % 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
-@@ -119,7 +122,7 @@
+@@ -128,7 +131,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.
@@ -84,7 +77,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
-@@ -489,33 +492,8 @@
+@@ -503,33 +506,8 @@
% since we don't want to scatter ../'s throughout the value. Hence we
% explicitly list every directory. Arguably more understandable anyway.
%
diff --git a/debian/patches/fix-format-gcc-errors b/debian/patches/fix-format-gcc-errors
index cb96de7..061471f 100644
--- a/debian/patches/fix-format-gcc-errors
+++ b/debian/patches/fix-format-gcc-errors
@@ -23,7 +23,7 @@
}
--- texlive-bin.orig/utils/devnag/src/devnag.c
+++ texlive-bin/utils/devnag/src/devnag.c
-@@ -2408,7 +2408,7 @@
+@@ -2417,7 +2417,7 @@
void err_ill(const char *str) {
fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
str, linenumber);
@@ -56,7 +56,7 @@
}
--- texlive-bin.orig/texk/web2c/cwebdir/cweave.w
+++ texlive-bin/texk/web2c/cwebdir/cweave.w
-@@ -1784,7 +1784,7 @@
+@@ -1785,7 +1785,7 @@
print_cat(c) /* symbolic printout of a category */
eight_bits c;
{
diff --git a/debian/patches/fix-manpages b/debian/patches/fix-manpages
index ffc53a8..336bd3b 100644
--- a/debian/patches/fix-manpages
+++ b/debian/patches/fix-manpages
@@ -1,14 +1,9 @@
---
- texk/detex/detex-src/detex.man | 2
texk/mendexk/mendex.1 | 2
texk/web2c/man/mf.man | 26 +++++-----
- texk/web2c/man/ofm2opl.man | 2
- texk/web2c/man/opl2ofm.man | 2
- texk/web2c/man/ovf2ovp.man | 2
- texk/web2c/man/ovp2ovf.man | 2
texk/web2c/synctexdir/man5/synctex.5 | 6 +-
texk/xdvik/xdvi.1.in | 88 +++++++++++++++++------------------
- 9 files changed, 66 insertions(+), 66 deletions(-)
+ 4 files changed, 61 insertions(+), 61 deletions(-)
--- texlive-bin.orig/texk/web2c/man/mf.man
+++ texlive-bin/texk/web2c/man/mf.man
@@ -481,16 +476,16 @@
.SH FILES
--- texlive-bin.orig/texk/web2c/synctexdir/man5/synctex.5
+++ texlive-bin/texk/web2c/synctexdir/man5/synctex.5
-@@ -102,7 +102,7 @@
+@@ -103,7 +103,7 @@
.It
- .Li <Input Line>*
+ .Li (<Form(k)>|<Input Line>)*
.It
-.Li ...
+.Li \&...\&
.It
.Li <sheet(N)>
.It
-@@ -276,7 +276,7 @@
+@@ -316,7 +316,7 @@
Typically, one applies a dvi to pdf filter with offset options and magnification,
then he appends the same options to the synctex file, for example
.Bd -literal -offset indent
@@ -499,8 +494,8 @@
.Ed
.Bl -item -offset indent
.\"
-@@ -311,7 +311,7 @@
- The byte offset is an implicit anchor to navigate the synctex file from sheet to sheet.
+@@ -366,7 +366,7 @@
+ This document has been updated on Sat Apr 22 09:57:20 UTC 2017 to include \\pdfxform support.
.\" nroff -man synctex.5 | less
.\"groff -man -Tascii synctex.5 | less
-.\"To convert a man page to plain pre-formatted text (e.g for spell checking) use:
@@ -511,50 +506,10 @@
--- texlive-bin.orig/texk/mendexk/mendex.1
+++ texlive-bin/texk/mendexk/mendex.1
@@ -1,6 +1,6 @@
- .if t .ds TX "T\h'-.15m'\v'.2v'E\v'-.2v'\h'-.12m'X
- .if t .ds LX L\v'-.22m'a\v'.22m'T\h'-.1667m'\v'.22m'E\h'-.125m'\v'-.22m'X
+ .if t .ds TX T\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X
+ .if t .ds LX L\\h'-0.36m'\\v'-0.15v'\\s-2A\\s+2\\h'-0.15m'\\v'0.15v'T\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X
-.TH MENDEX L
+.TH MENDEX 1
- .SH 名称
- mendex \- 索引整形ツール
- .SH 使用法
---- texlive-bin.orig/texk/detex/detex-src/detex.man
-+++ texlive-bin/texk/detex/detex-src/detex.man
-@@ -1,4 +1,4 @@
--.TH DETEX 1L "12 August 1993" "Purdue University"
-+.TH DETEX 1 "12 August 1993" "Purdue University"
.SH NAME
- detex \- a filter to strip \fITeX\fP commands from a .tex file.
+ mendex \- Japanese index processor
.SH SYNOPSIS
---- texlive-bin.orig/texk/web2c/man/ofm2opl.man
-+++ texlive-bin/texk/web2c/man/ofm2opl.man
-@@ -1,4 +1,4 @@
--.TH OFM2OPL "14 April 2016" "Web2C @VERSION@"
-+.TH OFM2OPL 1 "14 April 2016" "Web2C @VERSION@"
- .PP
- .SH "NAME"
- ofm2opl \- convert Omega and TeX font-metric files to property-list files
---- texlive-bin.orig/texk/web2c/man/opl2ofm.man
-+++ texlive-bin/texk/web2c/man/opl2ofm.man
-@@ -1,4 +1,4 @@
--.TH OPL2OFM "16 June 2015" "Web2C @VERSION@"
-+.TH OPL2OFM 1 "16 June 2015" "Web2C @VERSION@"
- .PP
- .SH "NAME"
- opl2ofm \- convert Omega and TeX property-list files to font-metric files
---- texlive-bin.orig/texk/web2c/man/ovf2ovp.man
-+++ texlive-bin/texk/web2c/man/ovf2ovp.man
-@@ -1,4 +1,4 @@
--.TH OVF2OVP "14 April 2016" "Web2C @VERSION@"
-+.TH OVF2OVP 1 "14 April 2016" "Web2C @VERSION@"
- .PP
- .SH "NAME"
- ovf2ovp \- convert virtual font file and associated font metrics to property-list format
---- texlive-bin.orig/texk/web2c/man/ovp2ovf.man
-+++ texlive-bin/texk/web2c/man/ovp2ovf.man
-@@ -1,4 +1,4 @@
--.TH OVP2OVF "16 June 2015" "Web2C @VERSION@"
-+.TH OVP2OVF 1 "16 June 2015" "Web2C @VERSION@"
- .PP
- .SH "NAME"
- ovp2ovf \- convert a virtual property-list file into a virtual font file and its associated font metric file
diff --git a/debian/patches/series b/debian/patches/series
index c698cd3..b437d3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,32 +16,3 @@ fix-mktexlsr-bashims
disable-seetex-stdin-tests
upupstream-xdvi-desktop-file
#SDE-support-for-luatex
-upstream-svn41295-fix-ptex-checkbox
-upstream-svn41417-rename-sdetp
-upstream-svn41418-pdftex-match-fix
-upstream-svn41497-svn41498-fix-upmendex
-upstream-svn41713-fix-pdftex-non-int-stemv
-upstream-svn41762-ptex-savepos-improved
-upstream-svn41998-ptex-eptex-allow-only-8bit-catcode
-upstream-svn42040-ptex-add-ifmbox
-upstream-svn42041-eptex-fix
-upstream-svn42110-tex4ht-xetex-compatibility
-upstream-svn42167-mendex-fix
-#jtex-161020
-upstream-svn42380-euptex-initstarttime
-upstream-svn42381-eptex-initstarttime
-upstream-svn42383-invalid-epoch
-upstream-svn42391-invalid-epoch-dvipdfmx
-upstream-svn42489-svn42493-mendex-fix-access-violation
-upstream-svn42506-eptex-euptex-randsupport
-upstream-svn42692..42695,42703-dvips-emstring-init
-upstream-svn42711-texjp-contact
-upstream-svn42715-correct-email
-upstream-svn42720-more-texjp
-upstream-svn42723-moremore-texjp
-upstream-svn42784-upmendex-cyrillic
-upstream-svn42803-dvipdfmx-cid-font-info
-#update-mplibdir-luatex1
-#update-luatexdir-luatex1
-teckit-dont-build-sfconv
-upstream-svn43637-pdftex-dont-embed-unitialized-memory-png-alpha
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git
Reply to: