[SCM] Debian packaging of texlive-bin) branch, master, updated. upstream/2012.20120628-10-g2acf873
The following commit has been merged in the master branch:
commit 8ba1656f4adea3556098ce1a65d9cc62a5d446fb
Author: Norbert Preining <preining@debian.org>
Date: Wed Nov 7 13:35:45 2012 +0900
update patches to current source, disable some
diff --git a/debian/patches/50_fmtutil_deb b/debian/patches/50_fmtutil_deb
index e2321f4..fb057e6 100644
--- a/debian/patches/50_fmtutil_deb
+++ b/debian/patches/50_fmtutil_deb
@@ -1,18 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_fmtutil_deb.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: debianize fmtutil, updmap etc, taken from tetex
-
-@DPATCH@
- texk/tetex/fmtutil | 28 +++++++++-------------------
- texk/tetex/fmtutil.man | 7 +++++--
+---
+ texk/texlive/linked_scripts/tetex/fmtutil.1 | 7 ++++--
+ texk/texlive/linked_scripts/tetex/fmtutil.sh | 28 ++++++++-------------------
2 files changed, 14 insertions(+), 21 deletions(-)
-Index: texlive-bin-2011.20120427/texk/tetex/fmtutil.man
-===================================================================
---- texlive-bin-2011.20120427.orig/texk/tetex/fmtutil.man 2012-04-27 11:31:33.599071967 +0900
-+++ texlive-bin-2011.20120427/texk/tetex/fmtutil.man 2012-04-27 11:31:40.747069403 +0900
+--- texlive-bin.orig/texk/texlive/linked_scripts/tetex/fmtutil.1
++++ texlive-bin/texk/texlive/linked_scripts/tetex/fmtutil.1
@@ -45,7 +45,7 @@
no-op in TeX Live
.TP
@@ -35,10 +27,8 @@ Index: texlive-bin-2011.20120427/texk/tetex/fmtutil.man
.SH "BUGS"
None known, but report any bugs found to <tex-k@tug.org> (mailing list).
.SH "AUTHOR"
-Index: texlive-bin-2011.20120427/texk/tetex/fmtutil
-===================================================================
---- texlive-bin-2011.20120427.orig/texk/tetex/fmtutil 2012-04-27 11:31:33.599071967 +0900
-+++ texlive-bin-2011.20120427/texk/tetex/fmtutil 2012-04-27 11:31:40.747069403 +0900
+--- texlive-bin.orig/texk/texlive/linked_scripts/tetex/fmtutil.sh
++++ texlive-bin/texk/texlive/linked_scripts/tetex/fmtutil.sh
@@ -542,9 +542,11 @@
grep -v '^ *#' "$cnf_file" | sed 's@^ *@@; s@ *$@@' | grep . | sort
cleanup $? ;;
diff --git a/debian/patches/51_fmtutil_keep_failedlog b/debian/patches/51_fmtutil_keep_failedlog
index 70b6239..b9d05c4 100644
--- a/debian/patches/51_fmtutil_keep_failedlog
+++ b/debian/patches/51_fmtutil_keep_failedlog
@@ -1,11 +1,9 @@
---
- texk/tetex/fmtutil | 4 +++-
+ texk/texlive/linked_scripts/tetex/fmtutil.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-Index: texlive-bin-2011.20120427/texk/tetex/fmtutil
-===================================================================
---- texlive-bin-2011.20120427.orig/texk/tetex/fmtutil 2012-04-27 11:31:40.747069403 +0900
-+++ texlive-bin-2011.20120427/texk/tetex/fmtutil 2012-04-27 11:31:48.051066459 +0900
+--- texlive-bin.orig/texk/texlive/linked_scripts/tetex/fmtutil.sh
++++ texlive-bin/texk/texlive/linked_scripts/tetex/fmtutil.sh
@@ -763,7 +763,6 @@
log_warning "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
diff --git a/debian/patches/55_texconfig_stuff b/debian/patches/55_texconfig_stuff
index 487930b..ae62182 100644
--- a/debian/patches/55_texconfig_stuff
+++ b/debian/patches/55_texconfig_stuff
@@ -3,14 +3,12 @@
- remove code that texconfig formats is not longer supported and refer to tlmgr
we rely on fmtutil being debianized and let texconfig work as before.
--
- texk/tetex/texconfig | 52 ++++++++++++-----------------------------------
- texk/tetex/texconfig.man | 28 ++++++++++++++++++++++++-
- 2 files changed, 41 insertions(+), 39 deletions(-)
+ texk/texlive/linked_scripts/tetex/texconfig.1 | 28 ++++++
+ texk/texlive/linked_scripts/tetex/texconfig.sh | 110 +++++++------------------
+ 2 files changed, 60 insertions(+), 78 deletions(-)
-Index: texlive-bin-2012.20120516/texk/tetex/texconfig
-===================================================================
---- texlive-bin-2012.20120516.orig/texk/tetex/texconfig 2012-05-25 21:16:45.000000000 +0200
-+++ texlive-bin-2012.20120516/texk/tetex/texconfig 2012-05-25 21:58:53.000000000 +0200
+--- texlive-bin.orig/texk/texlive/linked_scripts/tetex/texconfig.sh
++++ texlive-bin/texk/texlive/linked_scripts/tetex/texconfig.sh
@@ -52,6 +52,7 @@
FMT=fmt
test ! -x /bin/fmt && test ! -f /usr/bin/fmt &&
@@ -256,10 +254,8 @@ Index: texlive-bin-2012.20120516/texk/tetex/texconfig
case $3 in
a1|a1r|a2|a2r|a3|a3r|a4|a4r|a5|a5r|a6|a6r|a7|a7r|b1|b1r|b2|b2r|b3|b3r|b4|b4r|b5|b5r|b6|b6r|b7|b7r|c1|c1r|c2|c2r|c3|c3r|c4|c4r|c5|c5r|c6|c6r|c7|c7r|foolscap|legal|us|usr)
fmgrConfigReplace XDvi paper: "*paper: $3"
-Index: texlive-bin-2012.20120516/texk/tetex/texconfig.man
-===================================================================
---- texlive-bin-2012.20120516.orig/texk/tetex/texconfig.man 2012-05-25 21:16:45.000000000 +0200
-+++ texlive-bin-2012.20120516/texk/tetex/texconfig.man 2012-05-25 21:20:58.000000000 +0200
+--- texlive-bin.orig/texk/texlive/linked_scripts/tetex/texconfig.1
++++ texlive-bin/texk/texlive/linked_scripts/tetex/texconfig.1
@@ -46,6 +46,20 @@
.IR TEXMFSYSCONFIG .
(You may need to be root to do this.)
diff --git a/debian/patches/patch-update-updmap-manpage b/debian/patches/patch-update-updmap-manpage
index d1daf59..bfd2a40 100644
--- a/debian/patches/patch-update-updmap-manpage
+++ b/debian/patches/patch-update-updmap-manpage
@@ -1,100 +1,48 @@
---
- texk/tetex/updmap.man | 57 ++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 44 insertions(+), 13 deletions(-)
+ texk/texlive/linked_scripts/tetex/updmap.1 | 25 +++++++++++++------------
+ 1 file changed, 13 insertions(+), 12 deletions(-)
-Index: texlive-bin-2012.20120623/texk/tetex/updmap.man
-===================================================================
---- texlive-bin-2012.20120623.orig/texk/tetex/updmap.man 2012-06-02 02:41:15.680507000 +0900
-+++ texlive-bin-2012.20120623/texk/tetex/updmap.man 2012-06-23 12:32:15.641131579 +0900
-@@ -1,4 +1,4 @@
--.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.9.
-+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.10.
- .TH UPDMAP "1" "June 2012" "TeX Live" "User Commands"
- .SH NAME
- updmap \- manage TeX font maps, per-user
-@@ -11,7 +11,7 @@
- .B updmap-sys
- [\fIOPTION\fR] ... [\fICOMMAND\fR]
- .SH DESCRIPTION
--updmap (TeX Live, multi) version $Id: updmap.pl 26778 2012\-06\-01 17:36:30Z karl $
-+updmap (TeX Live, multi) version $Id: updmap.pl 26891 2012\-06\-10 22:41:49Z karl $
- .PP
- Update the default font map files used by pdftex, dvips, and dvipdfm(x),
- and optionally pxdvi, as determined by all configuration files updmap.cfg
-@@ -168,14 +168,45 @@
+--- texlive-bin.orig/texk/texlive/linked_scripts/tetex/updmap.1
++++ texlive-bin/texk/texlive/linked_scripts/tetex/updmap.1
+@@ -178,28 +178,29 @@
+ mentioned in all the updmap.cfg files are merged.
.IP
- If \fB\-\-cnffile\fR is specified on the command line (possibly multiple
- times), its value(s) are used. Otherwise, updmap reads all the
--updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg',
--in the order returned by kpsewhich. If multiple updmap.cfg files are
--found, all the maps mentioned in all the updmap.cfg files are merged.
--.IP
--There is one exception to keep upgradability from earlier versions of
--TeX Live: if a file TEXMFLOCAL/web2c/updmap\-local.cfg exists (formerly
--used by tlmgr to merge local fonts), then the file
--TEXMFLOCAL/web2c/updmap.cfg is ignored (if it exists) and the
-+updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg', in the
-+order returned by kpsewhich, with one exception: an updmap.cfg found
-+in TEXMFLOCAL is given higher priority than the updmap.cfg in
-+TEXMFMAIN, to ensure that local adjustments by administrators take
-+precedence over what is shipped in TeX Live.
-+.IP
-+In any case, if multiple updmap.cfg files are found, all the maps
-+mentioned in all the updmap.cfg files are merged.
-+.IP
-+Thus, if updmap.cfg files are present in all trees, and the default
+ Thus, if updmap.cfg files are present in all trees, and the default
+-layout is used as shipped with TeX Live, the following files are
+layout is used as shipped with TeX Live on Debian, the following files are
-+read, in the given order.
-+.nf
-+.IP
-+For updmap\-sys:
+ read, in the given order.
+ .nf
+ .IP
+ For updmap\-sys:
+-TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg
+-TEXMFSYSVAR $TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg
+-TEXMFLOCAL $TEXLIVE/texmf\-local/web2c/updmap.cfg
+-TEXMFMAIN $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+-TEXMFDIST $TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg
+TEXMFSYSCONFIG /etc/texmf/web2c/updmap.cfg
-+TEXMFSYSVAR /var/lib/texmf/web2c/updmap.cfg
++TEXMFSYSVAR var/lib/texmf/web2c/updmap.cfg
+TEXMFLOCAL /usr/local/share/texmf\-local/web2c/updmap.cfg
-+TEXMFDEBIAN /usr/share/texmf/web2c/updmap.cfg
++TEXMFDEBIAN usr/share/texmf/web2c/updmap.cfg
+TEXMFMAIN /usr/share/texlive/texmf/web2c/updmap.cfg
+TEXMFDIST /usr/share/texlive/texmf\-dist/web2c/updmap.cfg
-+.IP
-+For updmap:
-+TEXMFCONFIG $HOME/.texmf\-config/web2c/updmap.cfg
-+TEXMFVAR $HOME/.texmf\-var/web2c/updmap.cfg
-+TEXMFHOME $HOME/texmf/web2c/updmap.cfg
+ .IP
+ For updmap:
+ TEXMFCONFIG $HOME/.texliveYYYY/texmf\-config/web2c/updmap.cfg
+ TEXMFVAR $HOME/.texliveYYYY/texmf\-var/web2c/updmap.cfg
+ TEXMFHOME $HOME/texmf/web2c/updmap.cfg
+-TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg
+-TEXMFSYSVAR $TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg
+-TEXMFLOCAL $TEXLIVE/texmf\-local/web2c/updmap.cfg
+-TEXMFMAIN $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+-TEXMFDIST $TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg
+TEXMFSYSCONFIG /etc/texmf/web2c/updmap.cfg
-+TEXMFSYSVAR /var/lib/texmf/web2c/updmap.cfg
++TEXMFSYSVAR var/lib/texmf/web2c/updmap.cfg
+TEXMFLOCAL /usr/local/share/texmf\-local/web2c/updmap.cfg
-+TEXMFDEBIAN /usr/share/texmf/web2c/updmap.cfg
++TEXMFDEBIAN usr/share/texmf/web2c/updmap.cfg
+TEXMFMAIN /usr/share/texlive/texmf/web2c/updmap.cfg
+TEXMFDIST /usr/share/texlive/texmf\-dist/web2c/updmap.cfg
-+.IP
-+.fi
-+.IP
-+There is another exception to keep upgradability from earlier versions
-+of TeX Live: if a file TEXMFLOCAL/web2c/updmap\-local.cfg exists
-+(formerly used by tlmgr to merge local fonts), then the file
-+TEXMFLOCAL/web2c/updmap.cfg is ignored (if it exists) and that
- updmap\-local.cfg is used instead. In this case, updmap recognizes the
- previous syntax for disabling map files in updmap\-local.cfg (this
- syntax is different from what is used now).
-@@ -188,7 +219,7 @@
- \fB\-\-setoption\fR, \fB\-\-enable\fR or \fB\-\-disable\fR. If the config files are taken
- from kpsewhich output, then the algorithm is more complex:
- .IP
--1) If $TEXMFHOME/web2c/updmap.cfg or $TEXMFCONFIG/web2c/updmap.cfg
-+1) If $TEXMFCONFIG/web2c/updmap.cfg or $TEXMFHOME/web2c/updmap.cfg
- appears in the list of used files, then the one listed first by
- kpsewhich \fB\-\-all\fR (equivalently, the one returned by kpsewhich
- updmap.cfg), is used.
-@@ -196,11 +227,11 @@
- 2) If neither of the above two are present and changes are made, a
- new config file is created in $TEXMFCONFIG/web2c/updmap.cfg.
- .IP
--Multiple definitions of a font:
-+Resolving multiple definitions of a font:
.IP
- If a font is defined in more than one map file, then the definition
- coming from the first\-listed updmap.cfg is used. If a font is
--defined multiple times in the same map file, one is chosen
-+defined multiple times within the same map file, one is chosen
- arbitrarily. In both cases a warning is issued.
+-(where YYYY is the TeX Live release version).
+ .fi
.IP
- Disabling maps:
+ There is another exception to keep upgradability from earlier versions
diff --git a/debian/patches/pmpost-20120415-tl11.diff b/debian/patches/pmpost-20121106-tl12
similarity index 92%
copy from debian/patches/pmpost-20120415-tl11.diff
copy to debian/patches/pmpost-20121106-tl12
index ca17396..5bdd813 100644
--- a/debian/patches/pmpost-20120415-tl11.diff
+++ b/debian/patches/pmpost-20121106-tl12
@@ -8,13 +8,11 @@
texk/web2c/pmplibdir/jmp.ch | 283 +++++++++++++++++++++
texk/web2c/pmplibdir/jmppsw.ch | 76 +++++
texk/web2c/pmplibdir/pdvitomp.ch | 494 ++++++++++++++++++++++++++++++++++++++
- texk/web2c/pmplibdir/pmpost.ch | 233 +++++++++++++++++
- 10 files changed, 1284 insertions(+)
+ texk/web2c/pmplibdir/pmpost.ch | 234 ++++++++++++++++++
+ 10 files changed, 1285 insertions(+)
-Index: texlive-bin-2012.20120623/texk/kpathsea/texmf.cnf
-===================================================================
---- texlive-bin-2012.20120623.orig/texk/kpathsea/texmf.cnf 2012-06-23 12:19:11.120478535 +0900
-+++ texlive-bin-2012.20120623/texk/kpathsea/texmf.cnf 2012-06-23 12:19:15.696482385 +0900
+--- texlive-bin.orig/texk/kpathsea/texmf.cnf
++++ texlive-bin/texk/kpathsea/texmf.cnf
@@ -619,6 +619,7 @@
% Used by makempx to run TeX. We use "etex" because MetaPost is
% expecting DVI, and not "tex" because we want first line parsing.
@@ -23,11 +21,9 @@ Index: texlive-bin-2012.20120623/texk/kpathsea/texmf.cnf
% These variables specify the external program called for the
% interactive `e' option. %d is replaced by the line number and %s by
-Index: texlive-bin-2012.20120623/texk/web2c/Makefile.am
-===================================================================
---- texlive-bin-2012.20120623.orig/texk/web2c/Makefile.am 2011-10-05 00:41:38.370251000 +0900
-+++ texlive-bin-2012.20120623/texk/web2c/Makefile.am 2012-06-23 12:19:15.696482385 +0900
-@@ -161,6 +161,9 @@
+--- texlive-bin.orig/texk/web2c/Makefile.am
++++ texlive-bin/texk/web2c/Makefile.am
+@@ -159,6 +159,9 @@
## MetaPost
include $(srcdir)/mplibdir/am/mplib.am
@@ -37,10 +33,8 @@ Index: texlive-bin-2012.20120623/texk/web2c/Makefile.am
## libmplib, used by MetaPost and luaTeX
include $(srcdir)/mplibdir/am/libmplib.am
-Index: texlive-bin-2012.20120623/texk/web2c/ac/web2c.ac
-===================================================================
---- texlive-bin-2012.20120623.orig/texk/web2c/ac/web2c.ac 2011-08-14 23:23:26.366247000 +0900
-+++ texlive-bin-2012.20120623/texk/web2c/ac/web2c.ac 2012-06-23 12:19:15.696482385 +0900
+--- texlive-bin.orig/texk/web2c/ac/web2c.ac
++++ texlive-bin/texk/web2c/ac/web2c.ac
@@ -75,6 +75,11 @@
AS_HELP_STRING([--disable-mp],
[do not build METAPOST],
@@ -53,10 +47,8 @@ Index: texlive-bin-2012.20120623/texk/web2c/ac/web2c.ac
## configure options for WEB programs
AC_ARG_ENABLE([web-progs],
AS_HELP_STRING([--disable-web-progs],
-Index: texlive-bin-2012.20120623/texk/web2c/configure.ac
-===================================================================
---- texlive-bin-2012.20120623.orig/texk/web2c/configure.ac 2012-05-10 20:10:01.264474000 +0900
-+++ texlive-bin-2012.20120623/texk/web2c/configure.ac 2012-06-23 12:19:15.696482385 +0900
+--- texlive-bin.orig/texk/web2c/configure.ac
++++ texlive-bin/texk/web2c/configure.ac
@@ -195,6 +195,7 @@
[KPSE_MFWIN_DEFINE(Kpse_Win)])])[]dnl
@@ -65,10 +57,8 @@ Index: texlive-bin-2012.20120623/texk/web2c/configure.ac
AM_CONDITIONAL([WEB], [test "x$enable_web_progs" != xno])
-Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/am/pmpost.am
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-bin-2012.20120623/texk/web2c/pmplibdir/am/pmpost.am 2012-06-23 12:19:15.696482385 +0900
+--- /dev/null
++++ texlive-bin/texk/web2c/pmplibdir/am/pmpost.am
@@ -0,0 +1,78 @@
+## texk/web2c/pmplibdir/am/pmpost.am: Makefile fragment for MetaPost.
+##
@@ -148,10 +138,8 @@ Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/am/pmpost.am
+
+DISTCLEANFILES += $(nodist_pmpost_SOURCES)
+
-Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/jfm.ch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-bin-2012.20120623/texk/web2c/pmplibdir/jfm.ch 2012-06-23 12:19:15.696482385 +0900
+--- /dev/null
++++ texlive-bin/texk/web2c/pmplibdir/jfm.ch
@@ -0,0 +1,110 @@
+@x
+#include <w2c/config.h>
@@ -263,10 +251,8 @@ Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/jfm.ch
+mp->tfm_infile = (mp->open_file)(mp, mp->name_of_file, "r",mp_filetype_metrics);
+#endif
+@z
-Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/jmp.ch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-bin-2012.20120623/texk/web2c/pmplibdir/jmp.ch 2012-06-23 12:19:15.696482385 +0900
+--- /dev/null
++++ texlive-bin/texk/web2c/pmplibdir/jmp.ch
@@ -0,0 +1,283 @@
+% jMetaPost change file for MetaPost
+%
@@ -551,10 +537,8 @@ Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/jmp.ch
+}
+@* Debugging.
+@z
-Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/jmppsw.ch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-bin-2012.20120623/texk/web2c/pmplibdir/jmppsw.ch 2012-06-23 12:19:15.696482385 +0900
+--- /dev/null
++++ texlive-bin/texk/web2c/pmplibdir/jmppsw.ch
@@ -0,0 +1,76 @@
+%
+%
@@ -632,10 +616,8 @@ Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/jmppsw.ch
+ mp_ps_string_out(mp, gr_text_p(p),gr_text_l(p));
+ mp_ps_name_out(mp, mp->font_name[gr_font_n(p)],false);
+@z
-Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/pdvitomp.ch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-bin-2012.20120623/texk/web2c/pmplibdir/pdvitomp.ch 2012-06-23 12:19:15.696482385 +0900
+--- /dev/null
++++ texlive-bin/texk/web2c/pmplibdir/pdvitomp.ch
@@ -0,0 +1,494 @@
+@x
+#include "pmpxout.h"
@@ -1131,11 +1113,9 @@ Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/pdvitomp.ch
+ mpx->print_col++;
+}
+@z
-Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/pmpost.ch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-bin-2012.20120623/texk/web2c/pmplibdir/pmpost.ch 2012-06-23 12:19:15.696482385 +0900
-@@ -0,0 +1,233 @@
+--- /dev/null
++++ texlive-bin/texk/web2c/pmplibdir/pmpost.ch
+@@ -0,0 +1,234 @@
+@x
+#include <pmpxout.h>
+@y
@@ -1360,6 +1340,7 @@ Index: texlive-bin-2012.20120623/texk/web2c/pmplibdir/pmpost.ch
+ if (!strcmp(base, "dvitomp") || !strcasecmp(base, "dvitomp.exe"))
+@y
+ kanjioption[0] = '\0';
++ enable_UPTEX (false);
+ set_enc_string(NULL, "default");
+ if (!strcmp(base, "pdvitomp") || !strcasecmp(base, "pdvitomp.exe"))
+@z
diff --git a/debian/patches/series b/debian/patches/series
index d1af4b4..fd0edf5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,16 +15,16 @@ debian-no-linked-scripts
#build-wovp2ovf
60_unneeded_linking
61_path_max.diff
-pmpost-20120415-tl11.diff
+pmpost-20121106-tl12
pmpost-svg-20120119-tl11.diff
#xdvi-zoom-with-eps-figures.patch
-patch-dvi2tty -p0
+#upstream included#patch-dvi2tty -p0
#upstream included# patch-icu -p0
-patch-lacheck -p0
+#upstream included#patch-lacheck -p0
#upstream included# patch-pdftex -p0
patch-update-updmap-manpage
xdvi-upupstream-fixes
#upstream included# upstream-fix-ini-synctex-segfault
#upstream included# fix-pipe-in-out-regression
-upstream-fix-ptex-scanning
-cweave-fix-too-short-names
+#upstream included# upstream-fix-ptex-scanning
+#upstream included# cweave-fix-too-short-names
diff --git a/debian/patches/set-e-fmtutil b/debian/patches/set-e-fmtutil
index 68cea44..1363932 100644
--- a/debian/patches/set-e-fmtutil
+++ b/debian/patches/set-e-fmtutil
@@ -1,11 +1,9 @@
---
- texk/tetex/fmtutil | 7 +++++--
+ texk/texlive/linked_scripts/tetex/fmtutil.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
-Index: texlive-bin-2012.20120530/texk/tetex/fmtutil
-===================================================================
---- texlive-bin-2012.20120530.orig/texk/tetex/fmtutil 2012-05-30 10:54:55.000000000 +0900
-+++ texlive-bin-2012.20120530/texk/tetex/fmtutil 2012-05-30 11:00:06.369603296 +0900
+--- texlive-bin.orig/texk/texlive/linked_scripts/tetex/fmtutil.sh
++++ texlive-bin/texk/texlive/linked_scripts/tetex/fmtutil.sh
@@ -3,6 +3,9 @@
# Public domain. Originally written by Thomas Esser.
# Run with --help for usage.
--
Debian packaging of texlive-bin)
Reply to: