[SCM] Debian packaging of texlive-bin) branch, master, updated. debian/2012.20130315.29398-1-4-g3eb6444
The following commit has been merged in the master branch:
commit 3eb644478797557966c594f2b0d1fde411e5a2dd
Author: Norbert Preining <preining@debian.org>
Date: Thu May 9 17:23:30 2013 +0900
update patches to current sources
diff --git a/debian/patches/60_unneeded_linking b/debian/patches/60_unneeded_linking
index 373b131..1124f37 100644
--- a/debian/patches/60_unneeded_linking
+++ b/debian/patches/60_unneeded_linking
@@ -25,5 +25,5 @@
+xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt
+xdvi_x_libs += $(x_xpm_libs) -lX11 $(x_extra_libs)
- common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs)
+ common_ldadd = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(xdvi_x_libs)
diff --git a/debian/patches/61_path_max.diff b/debian/patches/61_path_max.diff
index 1b7d83e..15fe294 100644
--- a/debian/patches/61_path_max.diff
+++ b/debian/patches/61_path_max.diff
@@ -1,5 +1,9 @@
---- a/texk/ptexenc/ptexenc.c
-+++ b/texk/ptexenc/ptexenc.c
+---
+ texk/ptexenc/ptexenc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- texlive-bin.orig/texk/ptexenc/ptexenc.c
++++ texlive-bin/texk/ptexenc/ptexenc.c
@@ -7,6 +7,7 @@
#include <kpathsea/variable.h>
#include <kpathsea/readable.h>
diff --git a/debian/patches/debian-builtin-searchpath b/debian/patches/debian-builtin-searchpath
index de0a245..fd17923 100644
--- a/debian/patches/debian-builtin-searchpath
+++ b/debian/patches/debian-builtin-searchpath
@@ -4,27 +4,25 @@
## DP: adjust built-in search paths for kpathsea library to Debian standard
@DPATCH@
- texk/kpathsea/texmf.cnf | 38 +++++++++++++++-----------------------
- 1 file changed, 15 insertions(+), 23 deletions(-)
+ texk/kpathsea/texmf.cnf | 52 +++++++++++++-----------------------------------
+ 1 file changed, 15 insertions(+), 37 deletions(-)
-Index: texlive-bin-2012.20120530/texk/kpathsea/texmf.cnf
-===================================================================
---- texlive-bin-2012.20120530.orig/texk/kpathsea/texmf.cnf 2012-05-13 08:34:52.951624000 +0900
-+++ texlive-bin-2012.20120530/texk/kpathsea/texmf.cnf 2012-05-30 09:57:42.685015402 +0900
-@@ -55,19 +55,22 @@
+--- texlive-bin.orig/texk/kpathsea/texmf.cnf
++++ texlive-bin/texk/kpathsea/texmf.cnf
+@@ -54,20 +54,23 @@
+ TEXMFROOT = $SELFAUTOPARENT
- % The tree containing runtime files related to the specific
- % distribution and version.
--TEXMFMAIN = $TEXMFROOT/texmf
-+TEXMFMAIN = /usr/share/texlive/texmf
-
- % The main tree of packages, distribution-agnostic:
+ % The main tree of distributed packages and programs:
-TEXMFDIST = $TEXMFROOT/texmf-dist
+TEXMFDIST = /usr/share/texlive/texmf-dist
-+
+
+ % We used to have a separate /texmf tree with some core programs and files.
+ % Keep the variable name.
+ TEXMFMAIN = $TEXMFDIST
+
+% The Debian search tree
+TEXMFDEBIAN = /usr/share/texmf
-
++
% Local additions to the distribution trees.
-TEXMFLOCAL = $TEXMFROOT/../texmf-local
+TEXMFLOCAL = /usr/local/share/texmf
@@ -43,38 +41,41 @@ Index: texlive-bin-2012.20120530/texk/kpathsea/texmf.cnf
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
--TEXMFVAR = ~/.texlive2012/texmf-var
+-TEXMFVAR = ~/.texlive2013/texmf-var
+TEXMFVAR = ~/.texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
--TEXMFCONFIG = ~/.texlive2012/texmf-config
+-TEXMFCONFIG = ~/.texlive2013/texmf-config
+TEXMFCONFIG = ~/.texmf-config
- % List all the texmf trees.
- %
-@@ -94,7 +97,7 @@
- % versions should take precedence over those -- 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,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-+TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+ % List all the texmf trees. For an explanation of what they are, see the
+ % TeX Live manual.
+@@ -91,7 +94,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}
% 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,18 +105,18 @@
+@@ -99,13 +102,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.
--TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-+TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
++TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$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;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
-+SYSTEXMF = $TEXMFSYSVAR;$TEXMFDEBIAN;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
+-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
+@@ -116,7 +119,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.
@@ -83,23 +84,39 @@ Index: texlive-bin-2012.20120530/texk/kpathsea/texmf.cnf
% 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
-@@ -481,18 +484,7 @@
- % explicitly list every directory. Arguably more understandable this
- % way anyway.
+@@ -485,33 +488,8 @@
+ % since we don't want to scatter ../'s throughout the value. Hence we
+ % explicitly list every directory. Arguably more understandable anyway.
%
-TEXMFCNF = {\
-$SELFAUTOLOC,\
--$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
--$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
+-$SELFAUTOLOC/share/texmf-local/web2c,\
+-$SELFAUTOLOC/share/texmf-dist/web2c,\
+-$SELFAUTOLOC/share/texmf/web2c,\
+-$SELFAUTOLOC/texmf-local/web2c,\
+-$SELFAUTOLOC/texmf-dist/web2c,\
+-$SELFAUTOLOC/texmf/web2c,\
+-\
-$SELFAUTODIR,\
--$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
--$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\
+-$SELFAUTODIR/share/texmf-local/web2c,\
+-$SELFAUTODIR/share/texmf-dist/web2c,\
+-$SELFAUTODIR/share/texmf/web2c,\
+-$SELFAUTODIR/texmf-local/web2c,\
+-$SELFAUTODIR/texmf-dist/web2c,\
+-$SELFAUTODIR/texmf/web2c,\
+-\
-$SELFAUTOPARENT/../texmf-local/web2c,\
-$SELFAUTOPARENT,\
--$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\
--$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\
+-\
+-$SELFAUTOPARENT/share/texmf-local/web2c,\
+-$SELFAUTOPARENT/share/texmf-dist/web2c,\
+-$SELFAUTOPARENT/share/texmf/web2c,\
+-$SELFAUTOPARENT/texmf-local/web2c,\
+-$SELFAUTOPARENT/texmf-dist/web2c,\
+-$SELFAUTOPARENT/texmf/web2c\
-}
-+TEXMFCNF = /etc/texmf/web2c;/usr/share/texlive/texmf/web2c;/usr/share/texlive/texmf-dist/web2c;/usr/local/share/texmf/web2c
++TEXMFCNF = /etc/texmf/web2c;/usr/local/share/texmf/web2c;/usr/share/texlive/texmf-dist/web2c
++
%
% For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
diff --git a/debian/patches/debian-no-linked-scripts b/debian/patches/debian-no-linked-scripts
index 7a54a82..33aa022 100644
--- a/debian/patches/debian-no-linked-scripts
+++ b/debian/patches/debian-no-linked-scripts
@@ -1,16 +1,15 @@
---
- texk/texlive/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ texk/texlive/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- texlive-bin.orig/texk/texlive/Makefile.am
+++ texlive-bin/texk/texlive/Makefile.am
-@@ -5,7 +5,8 @@
+@@ -5,7 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
--SUBDIRS = tl_scripts context linked_scripts
-+#SUBDIRS = tl_scripts context linked_scripts
-+SUBDIRS =
+-SUBDIRS = tl_scripts linked_scripts
++#SUBDIRS = tl_scripts linked_scripts
## Windows wrapper sources.
##
diff --git a/debian/patches/pmpost-20121106-tl12 b/debian/patches/pmpost-20121106-tl12
index e59e9ca..fbbdd2d 100644
--- a/debian/patches/pmpost-20121106-tl12
+++ b/debian/patches/pmpost-20121106-tl12
@@ -13,7 +13,7 @@
--- texlive-bin.orig/texk/kpathsea/texmf.cnf
+++ texlive-bin/texk/kpathsea/texmf.cnf
-@@ -619,6 +619,7 @@
+@@ -624,6 +624,7 @@
% Used by makempx to run TeX. We use "etex" because MetaPost is
% expecting DVI, and not "tex" because we want first line parsing.
TEX = etex
@@ -37,15 +37,15 @@
+++ texlive-bin/texk/web2c/ac/web2c.ac
@@ -41,6 +41,7 @@
[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng]],
- [[luatex], [yes], [], [luaTeX], [poppler libpng zziplib]],
- [[mp], [yes], [], [MetaPost],[libpng]],
-+[[pmp], [yes], [], [pMetaPost],[libpng]],
+ [[luatex], [yes], [], [luaTeX], [poppler cairo libpng zziplib]],
+ [[mp], [yes], [], [MetaPost],[cairo libpng]],
++[[pmp], [yes], [], [pMetaPost],[cairo libpng]],
[[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 icu teckit graphite2 harfbuzz]],
])[]dnl
m4_foreach([Kpse_Prog], [kpse_tex_progs],
--- texlive-bin.orig/texk/web2c/configure.ac
+++ texlive-bin/texk/web2c/configure.ac
-@@ -198,6 +198,7 @@
+@@ -202,6 +202,7 @@
[KPSE_MFWIN_DEFINE(Kpse_Win)])])[]dnl
AM_CONDITIONAL([MP], [test "x$enable_mp" != xno])
diff --git a/debian/patches/pmpost-svg-20120119-tl11.diff b/debian/patches/pmpost-svg-20120119-tl11.diff
index 06abdf8..7c80331 100644
--- a/debian/patches/pmpost-svg-20120119-tl11.diff
+++ b/debian/patches/pmpost-svg-20120119-tl11.diff
@@ -3,10 +3,8 @@
texk/web2c/pmplibdir/psvgout.ch | 66 ++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 2 deletions(-)
-Index: texlive-bin-2011.20120427/texk/web2c/pmplibdir/am/pmpost.am
-===================================================================
---- texlive-bin-2011.20120427.orig/texk/web2c/pmplibdir/am/pmpost.am 2012-04-27 11:37:53.850649466 +0900
-+++ texlive-bin-2011.20120427/texk/web2c/pmplibdir/am/pmpost.am 2012-04-27 11:39:09.086958336 +0900
+--- texlive-bin.orig/texk/web2c/pmplibdir/am/pmpost.am
++++ texlive-bin/texk/web2c/pmplibdir/am/pmpost.am
@@ -55,10 +55,10 @@
@$(pmp_ctangle_sh) pmpxout pdvitomp.ch
@@ -20,10 +18,8 @@ Index: texlive-bin-2011.20120427/texk/web2c/pmplibdir/am/pmpost.am
$(pmpmath_c_h): pmpmath-tangle
@$(pmp_ctangle_sh) pmpmath
pmpmath-tangle: ctangle$(EXEEXT) mplibdir/mpmath.w tangle-sh
-Index: texlive-bin-2011.20120427/texk/web2c/pmplibdir/psvgout.ch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-bin-2011.20120427/texk/web2c/pmplibdir/psvgout.ch 2012-04-27 11:39:09.086958336 +0900
+--- /dev/null
++++ texlive-bin/texk/web2c/pmplibdir/psvgout.ch
@@ -0,0 +1,66 @@
+@x
+#include <stdio.h>
diff --git a/debian/patches/series b/debian/patches/series
index 6eb464c..4fcb240 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@ debian-no-linked-scripts
61_path_max.diff
pmpost-20121106-tl12
pmpost-svg-20120119-tl11.diff
-xdvi-upupstream-fixes
+#xdvi-upupstream-fixes
--
Debian packaging of texlive-bin)
Reply to: