[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2012.20130111-1-12-gae331a4
The following commit has been merged in the master branch:
commit ae331a43fabe872f3462c3054752161ef98b5f7b
Author: Norbert Preining <preining@debian.org>
Date: Thu May 9 16:42:02 2013 +0900
adapting patches for texmf -> texmf-dist merge
diff --git a/all/debian/create-linked-scripts b/all/debian/create-linked-scripts
index 399d77b..3fc2f5f 100644
--- a/all/debian/create-linked-scripts
+++ b/all/debian/create-linked-scripts
@@ -12,10 +12,6 @@ mbn () {
}
for i in $texmf_scripts ; do
- echo "linkedscript;texmf/scripts/$i;$(mbn $i)"
-done
-
-for i in $texmf_dist_scripts ; do
echo "linkedscript;texmf-dist/scripts/$i;$(mbn $i)"
done
diff --git a/all/debian/scripts.lst b/all/debian/scripts.lst
index 049f498..e180f0a 100644
--- a/all/debian/scripts.lst
+++ b/all/debian/scripts.lst
@@ -1,14 +1,4 @@
texmf_scripts='
-texlive/rungs.tlu
-texlive/tlmgr.pl
-tetex/fmtutil.sh
-tetex/fmtutil-sys.sh
-tetex/texconfig-dialog.sh
-tetex/texconfig-sys.sh
-tetex/texconfig.sh
-tetex/texlinks.sh
-'
-texmf_dist_scripts='
adhocfilelist/adhocfilelist.sh
bibexport/bibexport.sh
dtxgen/dtxgen
@@ -62,15 +52,15 @@ fontools/ot2kpx
fragmaster/fragmaster.pl
glossaries/makeglossaries
jfontmaps/kanji-fontmap-creator.pl
-jfontmaps/updmap-setup-kanji.pl
-jfontmaps/updmap-setup-kanji-sys.sh
+jfontmaps/kanji-config-updmap.pl
+jfontmaps/kanji-config-updmap-sys.sh
latex2man/latex2man
latexdiff/latexdiff.pl
latexdiff/latexdiff-vc.pl
latexdiff/latexrevise.pl
latexmk/latexmk.pl
latexpand/latexpand
-luaotfload/mkluatexfontdb.lua
+luaotfload/luaotfload-tool.lua
m-tx/m-tx.lua
match_parens/match_parens
mathspic/mathspic.pl
@@ -92,7 +82,7 @@ pmx/pmx2pdf.lua
pst2pdf/pst2pdf.pl
ptex2pdf/ptex2pdf.lua
purifyeps/purifyeps
-splitindex/perl/splitindex.pl
+splitindex/splitindex.pl
sty2dtx/sty2dtx.pl
svn-multi/svn-multi.pl
texdoc/texdoc.tlu
@@ -100,6 +90,9 @@ texcount/texcount.pl
texdef/texdef.pl
texdiff/texdiff
texdirflatten/texdirflatten
+texlive/rungs.tlu
+texlive/tlmgr.pl
+texlive/updmap.pl
texliveonfly/texliveonfly.py
texloganalyser/texloganalyser
thumbpdf/thumbpdf.pl
@@ -107,21 +100,32 @@ ulqda/ulqda.pl
uptex/convbkmk.rb
urlbst/urlbst
vpe/vpe.pl
-context/lua/mtxrun.lua
-context/shell/context.sh
-tetex/allcm.sh
-tetex/allneeded.sh
-tetex/dvi2fax.sh
-tetex/dvired.sh
-tetex/kpsetool.sh
-tetex/kpsewhere.sh
-tetex/texdoctk.pl
-tetex/updmap-sys.sh
-tetex/updmap.pl
-tetex/pslatex.sh
-tetex/e2pall.pl
-tetex/fontinst.sh
-tetex/ps2frag.sh
-tetex/rubibtex.sh
-tetex/rumakeindex.sh
+context/stubs/unix/context
+context/stubs/unix/ctxtools
+context/stubs/unix/luatools
+context/stubs/unix/mtxrun
+context/stubs/unix/pstopdf
+context/stubs/unix/texexec
+context/stubs/unix/texmfstart
+'
+tl_scripts='
+e2pall.pl
+fmtutil-sys.sh
+updmap-sys.sh
+allcm.sh
+allneeded.sh
+dvi2fax.sh
+dvired.sh
+fmtutil.sh
+fontinst.sh
+kpsetool.sh
+kpsewhere.sh
+ps2frag.sh
+pslatex.sh
+rubibtex.sh
+rumakeindex.sh
+texconfig-dialog.sh
+texconfig-sys.sh
+texconfig.sh
+texlinks.sh
'
diff --git a/texlive-base/debian/patches/debian-fmtutil-adaptions b/texlive-base/debian/patches/debian-fmtutil-adaptions
index 9a3df98..d8305e7 100644
--- a/texlive-base/debian/patches/debian-fmtutil-adaptions
+++ b/texlive-base/debian/patches/debian-fmtutil-adaptions
@@ -1,10 +1,10 @@
---
- texmf/doc/man/man1/fmtutil.1 | 7 +++++--
- texmf/scripts/tetex/fmtutil.sh | 28 +++++++++-------------------
+ texmf-dist/doc/man/man1/fmtutil.1 | 7 +++++--
+ texmf-dist/scripts/texlive/fmtutil.sh | 28 +++++++++-------------------
2 files changed, 14 insertions(+), 21 deletions(-)
---- texlive-base-2012.20121123.orig/texmf/doc/man/man1/fmtutil.1
-+++ texlive-base-2012.20121123/texmf/doc/man/man1/fmtutil.1
+--- texlive-base-2013.20130509.orig/texmf-dist/doc/man/man1/fmtutil.1
++++ texlive-base-2013.20130509/texmf-dist/doc/man/man1/fmtutil.1
@@ -45,7 +45,7 @@
no-op in TeX Live
.TP
@@ -27,8 +27,8 @@
.SH "BUGS"
None known, but report any bugs found to <tex-k@tug.org> (mailing list).
.SH "AUTHOR"
---- texlive-base-2012.20121123.orig/texmf/scripts/tetex/fmtutil.sh
-+++ texlive-base-2012.20121123/texmf/scripts/tetex/fmtutil.sh
+--- texlive-base-2013.20130509.orig/texmf-dist/scripts/texlive/fmtutil.sh
++++ texlive-base-2013.20130509/texmf-dist/scripts/texlive/fmtutil.sh
@@ -542,9 +542,11 @@
grep -v '^ *#' "$cnf_file" | sed 's@^ *@@; s@ *$@@' | grep . | sort
cleanup $? ;;
diff --git a/texlive-base/debian/patches/debian-texconfig-adaptions b/texlive-base/debian/patches/debian-texconfig-adaptions
index 5fe15d7..ce4440e 100644
--- a/texlive-base/debian/patches/debian-texconfig-adaptions
+++ b/texlive-base/debian/patches/debian-texconfig-adaptions
@@ -1,10 +1,10 @@
---
- texmf/doc/man/man1/texconfig.1 | 28 +++++++++
- texmf/scripts/tetex/texconfig.sh | 110 +++++++++++----------------------------
+ texmf-dist/doc/man/man1/texconfig.1 | 28 +++++++-
+ texmf-dist/scripts/texlive/texconfig.sh | 110 +++++++++-----------------------
2 files changed, 60 insertions(+), 78 deletions(-)
---- texlive-base-2012.20121123.orig/texmf/doc/man/man1/texconfig.1
-+++ texlive-base-2012.20121123/texmf/doc/man/man1/texconfig.1
+--- texlive-base-2013.20130509.orig/texmf-dist/doc/man/man1/texconfig.1
++++ texlive-base-2013.20130509/texmf-dist/doc/man/man1/texconfig.1
@@ -46,6 +46,20 @@
.IR TEXMFSYSCONFIG .
(You may need to be root to do this.)
@@ -51,8 +51,8 @@
.TP
.B hyphen FORMAT
This command allows to edit the hyphenation configuration file for
---- texlive-base-2012.20121123.orig/texmf/scripts/tetex/texconfig.sh
-+++ texlive-base-2012.20121123/texmf/scripts/tetex/texconfig.sh
+--- texlive-base-2013.20130509.orig/texmf-dist/scripts/texlive/texconfig.sh
++++ texlive-base-2013.20130509/texmf-dist/scripts/texlive/texconfig.sh
@@ -52,6 +52,7 @@
FMT=fmt
test ! -x /bin/fmt && test ! -f /usr/bin/fmt &&
diff --git a/texlive-base/debian/patches/debian-texmfcnf.lua b/texlive-base/debian/patches/debian-texmfcnf.lua
index dde8bd5..87f1759 100644
--- a/texlive-base/debian/patches/debian-texmfcnf.lua
+++ b/texlive-base/debian/patches/debian-texmfcnf.lua
@@ -1,12 +1,10 @@
Adjust the texmfcnf.lua file to realities in Debian
---
- texmfcnf.lua | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
+ texmf-dist/web2c/texmfcnf.lua | 30 ++++++++++++++----------------
+ 1 file changed, 14 insertions(+), 16 deletions(-)
-Index: texlive-base-2012.20120529/texmf/web2c/texmfcnf.lua
-===================================================================
---- texlive-base-2012.20120529.orig/texmf/web2c/texmfcnf.lua 2012-05-13 08:34:52.000000000 +0900
-+++ texlive-base-2012.20120529/texmf/web2c/texmfcnf.lua 2012-06-01 20:43:57.189689613 +0900
+--- texlive-base-2013.20130509.orig/texmf-dist/web2c/texmfcnf.lua
++++ texlive-base-2013.20130509/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
@@ -32,7 +30,7 @@ Index: texlive-base-2012.20120529/texmf/web2c/texmfcnf.lua
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
- TEXMFSYSVAR = "selfautoparent:texmf-var",
-- TEXMFVAR = "home:.texlive2012/texmf-var",
+- TEXMFVAR = "home:.texlive2013/texmf-var",
+ TEXMFSYSVAR = "/var/lib/texmf",
+ TEXMFVAR = "home:.texmf-var",
@@ -40,17 +38,16 @@ Index: texlive-base-2012.20120529/texmf/web2c/texmfcnf.lua
-- will be chosen but there can be more readable paths.
TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
-- TEXMFCONFIG = "home:.texlive2012/texmf-config",
+- TEXMFCONFIG = "home:.texlive2013/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,14 +59,16 @@
+@@ -61,13 +59,13 @@
-- By using prefixes we don't get expanded paths in the cache __path__
-- entry. This makes the tex root relocatable.
- TEXMFOS = "selfautodir:",
-- TEXMFMAIN = "selfautoparent:texmf",
- TEXMFDIST = "selfautoparent:texmf-dist",
-
- TEXMFLOCAL = texmflocal,
@@ -58,11 +55,8 @@ Index: texlive-base-2012.20120529/texmf/web2c/texmfcnf.lua
- TEXMFFONTS = "selfautoparent:texmf-fonts",
- TEXMFPROJECT = "selfautoparent:texmf-project",
+ -- TEXMFOS = "selfautodir:",
-+ -- TEXMFSYSTEM = "selfautoparent:$SELFAUTOSYSTEM",
-+ TEXMFMAIN = "/usr/share/texlive/texmf",
-+ TEXMFDIST = "/usr/share/texlive/texmf-dist",
-+ TEXMFCONTEXT = "/usr/share/texmf",
-+
++ TEXMFDIST = "/usr/share/texlive/texmf-dist",
++ TEXMFDEBIAN = "/usr/share/texmf",
+ TEXMFLOCAL = "/usr/local/share/texmf",
+ TEXMFSYSCONFIG = "/etc/texmf",
+ -- TEXMFFONTS = "selfautoparent:texmf-fonts",
@@ -70,16 +64,16 @@ Index: texlive-base-2012.20120529/texmf/web2c/texmfcnf.lua
TEXMFHOME = "home:texmf",
-- TEXMFHOME = os.name == "macosx" and "home:Library/texmf" or "home:texmf",
-@@ -76,7 +76,7 @@
+@@ -75,7 +73,7 @@
-- We need texmfos for a few rare files but as I have a few more bin trees
-- a hack is needed. Maybe other users also have texmf-platform-new trees.
-- TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}",
-+ TEXMF = "{$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFMAIN,!!$TEXMFDIST}",
+- TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFDIST}",
++ TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDEBIAN,!!$TEXMFDIST}",
TEXFONTMAPS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
ENCFONTS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//",
-@@ -175,7 +175,7 @@
+@@ -174,7 +172,7 @@
-- In an edit cycle it can be handy to launch an editor. The
-- preferred one can be set here.
diff --git a/texlive-base/debian/patches/debian-updmap-man b/texlive-base/debian/patches/debian-updmap-man
index aebdae4..6738020 100644
--- a/texlive-base/debian/patches/debian-updmap-man
+++ b/texlive-base/debian/patches/debian-updmap-man
@@ -1,10 +1,10 @@
---
- texmf/doc/man/man1/updmap.1 | 25 +++++++++++++------------
+ texmf-dist/doc/man/man1/updmap.1 | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
---- texlive-base-2012.20121123.orig/texmf/doc/man/man1/updmap.1
-+++ texlive-base-2012.20121123/texmf/doc/man/man1/updmap.1
-@@ -178,28 +178,29 @@
+--- texlive-base-2013.20130509.orig/texmf-dist/doc/man/man1/updmap.1
++++ texlive-base-2013.20130509/texmf-dist/doc/man/man1/updmap.1
+@@ -175,26 +175,27 @@
mentioned in all the updmap.cfg files are merged.
.IP
Thus, if updmap.cfg files are present in all trees, and the default
@@ -14,35 +14,33 @@
.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
-+TEXMFLOCAL /usr/local/share/texmf\-local/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
+-TEXMFSYSCONFIG \fI$TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg\fP
+-TEXMFSYSVAR \fI$TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg\fP
+-TEXMFLOCAL \fI$TEXLIVE/texmf\-local/web2c/updmap.cfg\fP
+-TEXMFDIST \fI$TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg\fP
++TEXMFSYSCONFIG \fI/etc/texmf/web2c/updmap.cfg\fP
++TEXMFSYSVAR \fI/var/lib/texmf/web2c/updmap.cfg\fP
++TEXMFLOCAL \fI/usr/local/share/texmf/web2c/updmap.cfg\fP
++TEXMFDEBIAN \fI/usr/share/texmf/web2c/updmap.cfg\fP
++TEXMFDIST \fI/usr/share/texlive/texmf\-dist/web2c/updmap.cfg\fP
.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
-+TEXMFLOCAL /usr/local/share/texmf\-local/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
+-TEXMFCONFIG $HOME/.texliveYYYY/texmf\-config/web2c/updmap.cfg
+-TEXMFVAR $HOME/.texliveYYYY/texmf\-var/web2c/updmap.cfg
++TEXMFCONFIG $HOME/.texmf\-config/web2c/updmap.cfg
++TEXMFVAR $HOME/.texmf\-var/web2c/updmap.cfg
+ TEXMFHOME \fI$HOME/texmf/web2c/updmap.cfg\fP
+-TEXMFSYSCONFIG \fI$TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg\fP
+-TEXMFSYSVAR \fI$TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg\fP
+-TEXMFLOCAL \fI$TEXLIVE/texmf\-local/web2c/updmap.cfg\fP
+-TEXMFDIST \fI$TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg\fP
++TEXMFSYSCONFIG \fI/etc/texmf/web2c/updmap.cfg\fP
++TEXMFSYSVAR \fI/var/lib/texmf/web2c/updmap.cfg\fP
++TEXMFLOCAL \fI/usr/local/share/texmf/web2c/updmap.cfg\fP
++TEXMFDEBIAN \fI/usr/share/texmf/web2c/updmap.cfg\fP
++TEXMFDIST \fI/usr/share/texlive/texmf\-dist/web2c/updmap.cfg\fP
.IP
-(where YYYY is the TeX Live release version).
.fi
.IP
- There is another exception to keep upgradability from earlier versions
+ There is one exception to keep upgradability from earlier versions
diff --git a/texlive-base/debian/patches/debian_updmap-search-path b/texlive-base/debian/patches/debian_updmap-search-path
index d01ff7a..70eb27c 100644
--- a/texlive-base/debian/patches/debian_updmap-search-path
+++ b/texlive-base/debian/patches/debian_updmap-search-path
@@ -1,10 +1,10 @@
---
- texmf-dist/scripts/tetex/updmap.pl | 22 ++++++++++++++++++++--
- 1 file changed, 20 insertions(+), 2 deletions(-)
+ texmf-dist/scripts/texlive/updmap.pl | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
---- texlive-base-2012.20121112.orig/texmf-dist/scripts/tetex/updmap.pl
-+++ texlive-base-2012.20121112/texmf-dist/scripts/tetex/updmap.pl
-@@ -29,7 +29,7 @@
+--- texlive-base-2013.20130509.orig/texmf-dist/scripts/texlive/updmap.pl
++++ texlive-base-2013.20130509/texmf-dist/scripts/texlive/updmap.pl
+@@ -30,7 +30,7 @@
exit 1;
}
chomp($TEXMFROOT);
@@ -13,20 +13,7 @@
}
-@@ -299,8 +299,11 @@
- #
- if (@tmlused) {
- my @tmp;
-+ chomp(my $TEXMFDEBIAN =`kpsewhich --var-value=TEXMFDEBIAN`);
- for my $f (@used_files) {
-- if ($f =~ m!\Q$TEXMFMAIN/\E!) {
-+ # make sure that TEXMFLOCAL is also moved above TEXMFDEBIAN
-+ # and do not push it two times!
-+ if ($f =~ m!\Q$TEXMFMAIN/\E|\Q$TEXMFDEBIAN/\E!) {
- push @tmp, @tmlused;
- push @tmp, $f;
- } else {
-@@ -395,6 +398,21 @@
+@@ -356,6 +356,21 @@
print "\t$m (in $orig)\n";
}
print "in $changes_config_file\n";
diff --git a/texlive-base/debian/patches/dvipdfm-config-no-rungs b/texlive-base/debian/patches/dvipdfm-config-no-rungs
index 71654ef..1f2d460 100644
--- a/texlive-base/debian/patches/dvipdfm-config-no-rungs
+++ b/texlive-base/debian/patches/dvipdfm-config-no-rungs
@@ -1,32 +1,17 @@
---
- texmf/dvipdfm/config/config | 2 +-
- texmf/dvipdfmx/dvipdfmx.cfg | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ texmf-dist/dvipdfmx/dvipdfmx.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: texlive-base-2011.20120216/texmf/dvipdfm/config/config
-===================================================================
---- texlive-base-2011.20120216.orig/texmf/dvipdfm/config/config 2008-12-11 01:38:07.000000000 +0900
-+++ texlive-base-2011.20120216/texmf/dvipdfm/config/config 2012-02-16 23:59:58.365163186 +0900
-@@ -6,7 +6,7 @@
- %% keep this the same in dvipdfm and dvipdfmx.
- %% can't use zcat because the pipe breaks on Windows; better to have
- %% one config file.
--D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
-+D "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
-
% Distiller config. Uses ghostscript and works on compressed and
% uncompressed files. Use zcat -f <%i instead of zcat -f %i
-Index: texlive-base-2011.20120216/texmf/dvipdfmx/dvipdfmx.cfg
-===================================================================
---- texlive-base-2011.20120216.orig/texmf/dvipdfmx/dvipdfmx.cfg 2012-02-16 23:59:31.000000000 +0900
-+++ texlive-base-2011.20120216/texmf/dvipdfmx/dvipdfmx.cfg 2012-02-17 00:01:12.141305776 +0900
-@@ -149,7 +149,8 @@
- %% extant. You can find the one that is active by running:
+--- texlive-base-2013.20130509.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
++++ texlive-base-2013.20130509/texmf-dist/dvipdfmx/dvipdfmx.cfg
+@@ -147,7 +147,7 @@
%% kpsewhich -progname=dvipdfmx -format='other text files' dvipdfmx.cfg
+ %% and control which one is found by setting DVIPDFMXINPUTS.
%%
--D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
-+D "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
-+
+-D "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
++D "gs -q -dNOPAUSE -dBATCH -dEPSCrop -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
- %% Frank Siegert's PStill:
- %D "/usr/local/bin/pstill -c -o '%o' '%i'"
+ % pre-2013 invocation using -sPAPERSIZE instead of -dEPSCrop, no other changes:
+ %D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit"
diff --git a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
index a61b7c5..2fd03f4 100644
--- a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
+++ b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
@@ -1,11 +1,11 @@
---
- texmf/dvipdfmx/dvipdfmx-paper.cfg | 11 +++++++++++
- texmf/dvipdfmx/dvipdfmx.cfg | 10 ++--------
- tlpkg/texlive.tlpdb | 1 +
+ texmf-dist/dvipdfmx/dvipdfmx-paper.cfg | 11 +++++++++++
+ texmf-dist/dvipdfmx/dvipdfmx.cfg | 10 ++--------
+ tlpkg/texlive.tlpdb | 1 +
3 files changed, 14 insertions(+), 8 deletions(-)
--- /dev/null
-+++ texlive-base-2012.20130315/texmf/dvipdfmx/dvipdfmx-paper.cfg
++++ texlive-base-2013.20130509/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
@@ -0,0 +1,11 @@
+%% PDF Document Settings
+%%
@@ -18,8 +18,8 @@
+
+p a4
+
---- texlive-base-2012.20130315.orig/texmf/dvipdfmx/dvipdfmx.cfg
-+++ texlive-base-2012.20130315/texmf/dvipdfmx/dvipdfmx.cfg
+--- texlive-base-2013.20130509.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
++++ texlive-base-2013.20130509/texmf-dist/dvipdfmx/dvipdfmx.cfg
@@ -27,14 +27,8 @@
%% PDF Document Settings
@@ -37,13 +37,13 @@
%% Annotation Box Margin:
%%
---- texlive-base-2012.20130315.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2012.20130315/tlpkg/texlive.tlpdb
-@@ -54502,6 +54502,7 @@
- texmf/doc/man/man1/extractbb.man1.pdf
+--- texlive-base-2013.20130509.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130509/tlpkg/texlive.tlpdb
+@@ -56673,6 +56673,7 @@
+ texmf-dist/doc/man/man1/extractbb.man1.pdf
runfiles size=42
- texmf/dvipdfmx/dvipdfmx.cfg
-+ texmf/dvipdfmx/dvipdfmx-paper.cfg
- texmf/fonts/cmap/README
- texmf/fonts/cmap/dvipdfmx/EUC-UCS2
- texmf/fonts/cmap/dvipdfmx/README
+ texmf-dist/dvipdfmx/dvipdfmx.cfg
++ texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
+ texmf-dist/fonts/cmap/dvipdfmx/EUC-UCS2
+ texmf-dist/fonts/cmap/dvipdfmx/README
+ texmf-dist/fonts/cmap/dvipdfmx/UTF8-UCS2
diff --git a/texlive-base/debian/patches/dvipdfmx.cfg_whitespace b/texlive-base/debian/patches/dvipdfmx.cfg_whitespace
index c876f8e..13bfa56 100644
--- a/texlive-base/debian/patches/dvipdfmx.cfg_whitespace
+++ b/texlive-base/debian/patches/dvipdfmx.cfg_whitespace
@@ -1,11 +1,11 @@
---
- texmf/dvipdfmx/dvipdfmx.cfg | 2 +-
+ texmf-dist/dvipdfmx/dvipdfmx.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: texlive-base-2011.20120216/texmf/dvipdfmx/dvipdfmx.cfg
+Index: texlive-base-2011.20120216/texmf-dist/dvipdfmx/dvipdfmx.cfg
===================================================================
---- texlive-base-2011.20120216.orig/texmf/dvipdfmx/dvipdfmx.cfg 2011-11-03 22:59:19.000000000 +0900
-+++ texlive-base-2011.20120216/texmf/dvipdfmx/dvipdfmx.cfg 2012-02-16 23:59:31.849633176 +0900
+--- texlive-base-2011.20120216.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg 2011-11-03 22:59:19.000000000 +0900
++++ texlive-base-2011.20120216/texmf-dist/dvipdfmx/dvipdfmx.cfg 2012-02-16 23:59:31.849633176 +0900
@@ -34,7 +34,7 @@
%% papersize-spec is 'paper-format' or length-pair, e.g., 'a4', 'letter',
%% '20cm,30cm'. Recognized unit is 'cm', 'mm', 'bp', 'pt', 'in'.
diff --git a/texlive-base/debian/patches/dvips-config-paper-factorization b/texlive-base/debian/patches/dvips-config-paper-factorization
index e587f02..36b8fa5 100644
--- a/texlive-base/debian/patches/dvips-config-paper-factorization
+++ b/texlive-base/debian/patches/dvips-config-paper-factorization
@@ -1,11 +1,11 @@
---
- texmf/dvips/config/config-paper.ps | 524 ++++++++++++++++++++++++++++++++++++
- texmf/dvips/config/config.ps | 525 -------------------------------------
- tlpkg/texlive.tlpdb | 1
+ texmf-dist/dvips/config/config-paper.ps | 524 +++++++++++++++++++++++++++++++
+ texmf-dist/dvips/config/config.ps | 525 --------------------------------
+ tlpkg/texlive.tlpdb | 1
3 files changed, 532 insertions(+), 518 deletions(-)
--- /dev/null
-+++ texlive-base-2012.20130315/texmf/dvips/config/config-paper.ps
++++ texlive-base-2013.20130509/texmf-dist/dvips/config/config-paper.ps
@@ -0,0 +1,524 @@
+%
+% config-paper.ps
@@ -531,8 +531,8 @@
+@+ if
+@+ %%EndPaperSize
+
---- texlive-base-2012.20130315.orig/texmf/dvips/config/config.ps
-+++ texlive-base-2012.20130315/texmf/dvips/config/config.ps
+--- texlive-base-2013.20130509.orig/texmf-dist/dvips/config/config.ps
++++ texlive-base-2013.20130509/texmf-dist/dvips/config/config.ps
@@ -67,524 +67,13 @@
%
% emacs-page
@@ -1065,13 +1065,13 @@
% use -t unknown with a \special{papersize=...} for a nonstandard page size.
@ unknown 0in 0in
---- texlive-base-2012.20130315.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2012.20130315/tlpkg/texlive.tlpdb
-@@ -55198,6 +55198,7 @@
- texmf/dvips/config/config.mirrorprint
- texmf/dvips/config/config.ot2
- texmf/dvips/config/config.ps
-+ texmf/dvips/config/config-paper.ps
- texmf/dvips/config/config.qms
- texmf/dvips/config/config.toshiba
- texmf/dvips/config/config.unms
+--- texlive-base-2013.20130509.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130509/tlpkg/texlive.tlpdb
+@@ -57467,6 +57467,7 @@
+ texmf-dist/dvips/config/config.mirrorprint
+ texmf-dist/dvips/config/config.ot2
+ texmf-dist/dvips/config/config.ps
++ texmf-dist/dvips/config/config-paper.ps
+ texmf-dist/dvips/config/config.qms
+ texmf-dist/dvips/config/config.toshiba
+ texmf-dist/dvips/config/config.unms
diff --git a/texlive-base/debian/patches/fix-info-dir-sections b/texlive-base/debian/patches/fix-info-dir-sections
index 29b2757..8793eac 100644
--- a/texlive-base/debian/patches/fix-info-dir-sections
+++ b/texlive-base/debian/patches/fix-info-dir-sections
@@ -1,13 +1,13 @@
add info dir section and entry to texdraw and epspdf
---
---
- texmf/doc/info/epspdf.info 2012-03-06 11:43:52.019809190 +0900 |binary
- texmf/doc/info/epspdf.info |binary
- texmf/doc/info/texdraw.info | 5 +++++
- 2 files changed, 5 insertions(+)
+ texmf-dist/doc/info/epspdf.info 2012-03-06 11:43:52.019809190 +0900 |binary
+ texmf-dist/doc/info/epspdf.info |binary
+ texmf-dist/doc/info/texdraw.info | 5 +++++
+ 1 file changed, 5 insertions(+)
---- texlive-base-2012.20130315.orig/texmf/doc/info/texdraw.info
-+++ texlive-base-2012.20130315/texmf/doc/info/texdraw.info
+--- texlive-base-2013.20130509.orig/texmf-dist/doc/info/texdraw.info
++++ texlive-base-2013.20130509/texmf-dist/doc/info/texdraw.info
@@ -14,6 +14,11 @@
entire resulting derived work is distributed under the terms of a
permission notice identical to this one.
@@ -20,4 +20,3 @@ add info dir section and entry to texdraw and epspdf
File: texdraw, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
-Binary files texlive-base-2012.20130315.orig/texmf/doc/info/epspdf.info and texlive-base-2012.20130315/texmf/doc/info/epspdf.info differ
diff --git a/texlive-base/debian/patches/fix-natbib-add-spaces b/texlive-base/debian/patches/fix-natbib-add-spaces
index 64c5370..8dc1899 100644
--- a/texlive-base/debian/patches/fix-natbib-add-spaces
+++ b/texlive-base/debian/patches/fix-natbib-add-spaces
@@ -5,10 +5,8 @@ fix this by adding some %
texmf-dist/tex/latex/natbib/natbib.sty | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
-Index: texlive-base-2012.20120611/texmf-dist/source/latex/natbib/natbib.dtx
-===================================================================
---- texlive-base-2012.20120611.orig/texmf-dist/source/latex/natbib/natbib.dtx 2010-12-07 10:39:19.000000000 +0900
-+++ texlive-base-2012.20120611/texmf-dist/source/latex/natbib/natbib.dtx 2012-06-25 10:57:23.330134667 +0900
+--- texlive-base-2013.20130509.orig/texmf-dist/source/latex/natbib/natbib.dtx
++++ texlive-base-2013.20130509/texmf-dist/source/latex/natbib/natbib.dtx
@@ -3992,8 +3992,8 @@
% indexing can be achieved.
% \begin{macrocode}
@@ -20,10 +18,8 @@ Index: texlive-base-2012.20120611/texmf-dist/source/latex/natbib/natbib.dtx
\@namedef{al@#1\@extra@b@citeb}{#2}}
\DeclareRobustCommand\citetalias{\begingroup
\NAT@swafalse\let\NAT@ctype\thr@@\NAT@parfalse\NAT@citetp}
-Index: texlive-base-2012.20120611/texmf-dist/tex/latex/natbib/natbib.sty
-===================================================================
---- texlive-base-2012.20120611.orig/texmf-dist/tex/latex/natbib/natbib.sty 2010-12-07 10:39:19.000000000 +0900
-+++ texlive-base-2012.20120611/texmf-dist/tex/latex/natbib/natbib.sty 2012-06-25 10:57:14.030135437 +0900
+--- texlive-base-2013.20130509.orig/texmf-dist/tex/latex/natbib/natbib.sty
++++ texlive-base-2013.20130509/texmf-dist/tex/latex/natbib/natbib.sty
@@ -740,8 +740,8 @@
\DeclareRobustCommand\citefullauthor
{\citeauthor*}
diff --git a/texlive-base/debian/patches/fix-pgf2pdf-script b/texlive-base/debian/patches/fix-pgf2pdf-script
index 7273328..cc878ce 100644
--- a/texlive-base/debian/patches/fix-pgf2pdf-script
+++ b/texlive-base/debian/patches/fix-pgf2pdf-script
@@ -1,7 +1,9 @@
-Index: texlive-base-2009/texmf-dist/scripts/pgfplots/pgf2pdf.sh
-===================================================================
---- texlive-base-2009.orig/texmf-dist/scripts/pgfplots/pgf2pdf.sh 2009-11-12 20:32:18.000000000 +0900
-+++ texlive-base-2009/texmf-dist/scripts/pgfplots/pgf2pdf.sh 2009-11-12 20:33:46.000000000 +0900
+---
+ texmf-dist/scripts/pgfplots/pgf2pdf.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- texlive-base-2013.20130509.orig/texmf-dist/scripts/pgfplots/pgf2pdf.sh
++++ texlive-base-2013.20130509/texmf-dist/scripts/pgfplots/pgf2pdf.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
diff --git a/texlive-base/debian/patches/fix-scripts b/texlive-base/debian/patches/fix-scripts
index f528c50..2af9fc0 100644
--- a/texlive-base/debian/patches/fix-scripts
+++ b/texlive-base/debian/patches/fix-scripts
@@ -3,10 +3,8 @@
texmf-dist/scripts/thumbpdf/thumbpdf.pl | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
-Index: texlive-base-2011.20120226/texmf-dist/scripts/context/perl/mptopdf.pl
-===================================================================
---- texlive-base-2011.20120226.orig/texmf-dist/scripts/context/perl/mptopdf.pl 2011-06-01 17:54:21.000000000 +0900
-+++ texlive-base-2011.20120226/texmf-dist/scripts/context/perl/mptopdf.pl 2012-03-06 11:54:43.276042221 +0900
+--- texlive-base-2013.20130509.orig/texmf-dist/scripts/context/perl/mptopdf.pl
++++ texlive-base-2013.20130509/texmf-dist/scripts/context/perl/mptopdf.pl
@@ -1,5 +1,4 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
- if 0;
@@ -14,10 +12,8 @@ Index: texlive-base-2011.20120226/texmf-dist/scripts/context/perl/mptopdf.pl
# MikTeX users can set environment variable TEXSYSTEM to "miktex".
-Index: texlive-base-2011.20120226/texmf-dist/scripts/thumbpdf/thumbpdf.pl
-===================================================================
---- texlive-base-2011.20120226.orig/texmf-dist/scripts/thumbpdf/thumbpdf.pl 2011-08-12 02:05:58.000000000 +0900
-+++ texlive-base-2011.20120226/texmf-dist/scripts/thumbpdf/thumbpdf.pl 2012-03-06 11:54:13.180031217 +0900
+--- texlive-base-2013.20130509.orig/texmf-dist/scripts/thumbpdf/thumbpdf.pl
++++ texlive-base-2013.20130509/texmf-dist/scripts/thumbpdf/thumbpdf.pl
@@ -1,5 +1,4 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
- if 0;
diff --git a/texlive-base/debian/patches/fmtutil_keep_failedlog b/texlive-base/debian/patches/fmtutil_keep_failedlog
index e7ebc8c..e5b793c 100644
--- a/texlive-base/debian/patches/fmtutil_keep_failedlog
+++ b/texlive-base/debian/patches/fmtutil_keep_failedlog
@@ -1,9 +1,9 @@
---
- texmf/scripts/tetex/fmtutil.sh | 4 +++-
+ texmf-dist/scripts/texlive/fmtutil.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---- texlive-base-2012.20121123.orig/texmf/scripts/tetex/fmtutil.sh
-+++ texlive-base-2012.20121123/texmf/scripts/tetex/fmtutil.sh
+--- texlive-base-2013.20130509.orig/texmf-dist/scripts/texlive/fmtutil.sh
++++ texlive-base-2013.20130509/texmf-dist/scripts/texlive/fmtutil.sh
@@ -763,7 +763,6 @@
log_warning "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
diff --git a/texlive-base/debian/patches/pdftex-config-paper-factorization b/texlive-base/debian/patches/pdftex-config-paper-factorization
index 859c8fd..76e5aec 100644
--- a/texlive-base/debian/patches/pdftex-config-paper-factorization
+++ b/texlive-base/debian/patches/pdftex-config-paper-factorization
@@ -1,18 +1,18 @@
---
- texmf/tex/generic/config/pdftexconfig-paper.tex | 4 ++++
- texmf/tex/generic/config/pdftexconfig.tex | 4 ++--
- tlpkg/texlive.tlpdb | 1 +
+ texmf-dist/tex/generic/config/pdftexconfig-paper.tex | 4 ++++
+ texmf-dist/tex/generic/config/pdftexconfig.tex | 4 ++--
+ tlpkg/texlive.tlpdb | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
--- /dev/null
-+++ texlive-base-2012.20130315/texmf/tex/generic/config/pdftexconfig-paper.tex
++++ texlive-base-2013.20130509/texmf-dist/tex/generic/config/pdftexconfig-paper.tex
@@ -0,0 +1,4 @@
+% paper size settings, included from pdftexconfig.tex for pdftex
+\pdfpagewidth=210 true mm
+\pdfpageheight=297 true mm
+\endinput
---- texlive-base-2012.20130315.orig/texmf/tex/generic/config/pdftexconfig.tex
-+++ texlive-base-2012.20130315/texmf/tex/generic/config/pdftexconfig.tex
+--- texlive-base-2013.20130509.orig/texmf-dist/tex/generic/config/pdftexconfig.tex
++++ texlive-base-2013.20130509/texmf-dist/tex/generic/config/pdftexconfig.tex
@@ -3,8 +3,8 @@
\pdfoutput=1
\pdfcompresslevel=9
@@ -24,13 +24,13 @@
\pdfhorigin=1 true in
\pdfvorigin=1 true in
\pdfpkresolution=600
---- texlive-base-2012.20130315.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2012.20130315/tlpkg/texlive.tlpdb
-@@ -125153,6 +125153,7 @@
- texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map
- texmf/tex/generic/config/pdftex-dvi.tex
- texmf/tex/generic/config/pdftexconfig.tex
-+ texmf/tex/generic/config/pdftexconfig-paper.tex
- texmf/tex/generic/pdftex/glyphtounicode.tex
+--- texlive-base-2013.20130509.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130509/tlpkg/texlive.tlpdb
+@@ -133059,6 +133059,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
catalogue-ctan /systems/pdftex
catalogue-date 2011-11-09 15:33:34 +0100
diff --git a/texlive-base/debian/patches/set-e-fmtutil b/texlive-base/debian/patches/set-e-fmtutil
index 2153cc7..f7add53 100644
--- a/texlive-base/debian/patches/set-e-fmtutil
+++ b/texlive-base/debian/patches/set-e-fmtutil
@@ -1,9 +1,9 @@
---
- texmf/scripts/tetex/fmtutil.sh | 7 +++++--
+ texmf-dist/scripts/texlive/fmtutil.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---- texlive-base-2012.20121123.orig/texmf/scripts/tetex/fmtutil.sh
-+++ texlive-base-2012.20121123/texmf/scripts/tetex/fmtutil.sh
+--- texlive-base-2013.20130509.orig/texmf-dist/scripts/texlive/fmtutil.sh
++++ texlive-base-2013.20130509/texmf-dist/scripts/texlive/fmtutil.sh
@@ -3,6 +3,9 @@
# Public domain. Originally written by Thomas Esser.
# Run with --help for usage.
diff --git a/texlive-base/debian/patches/texdoc-see-and-zip b/texlive-base/debian/patches/texdoc-see-and-zip
index 32964dd..3c0a77f 100644
--- a/texlive-base/debian/patches/texdoc-see-and-zip
+++ b/texlive-base/debian/patches/texdoc-see-and-zip
@@ -2,10 +2,8 @@
texmf-dist/texdoc/texdoc.cnf | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
-Index: texlive-base-2012.20120516/texmf-dist/texdoc/texdoc.cnf
-===================================================================
---- texlive-base-2012.20120516.orig/texmf-dist/texdoc/texdoc.cnf 2012-01-04 05:06:58.000000000 +0900
-+++ texlive-base-2012.20120516/texmf-dist/texdoc/texdoc.cnf 2012-05-21 09:14:21.880669783 +0900
+--- texlive-base-2013.20130509.orig/texmf-dist/texdoc/texdoc.cnf
++++ texlive-base-2013.20130509/texmf-dist/texdoc/texdoc.cnf
@@ -34,6 +34,12 @@
# viewer_pdf = xpdf # works
# viewer_pdf = xpdf %s & # works even better
diff --git a/texlive-base/debian/patches/texmf.cnf-debian b/texlive-base/debian/patches/texmf.cnf-debian
index 9266d49..85669d2 100644
--- a/texlive-base/debian/patches/texmf.cnf-debian
+++ b/texlive-base/debian/patches/texmf.cnf-debian
@@ -1,33 +1,28 @@
---
- texmf/web2c/texmf.cnf | 55 +++++++++++++++++++++++++++-----------------------
- 1 file changed, 30 insertions(+), 25 deletions(-)
+ texmf-dist/web2c/texmf.cnf | 54 +++++++++++++--------------------------------
+ 1 file changed, 16 insertions(+), 38 deletions(-)
-Index: texlive-base-2012.20120529/texmf/web2c/texmf.cnf
-===================================================================
---- texlive-base-2012.20120529.orig/texmf/web2c/texmf.cnf 2012-05-13 08:34:52.000000000 +0900
-+++ texlive-base-2012.20120529/texmf/web2c/texmf.cnf 2012-06-01 20:43:57.189689613 +0900
-@@ -51,23 +51,26 @@
+--- texlive-base-2013.20130509.orig/texmf-dist/web2c/texmf.cnf
++++ texlive-base-2013.20130509/texmf-dist/web2c/texmf.cnf
+@@ -51,7 +51,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).
-TEXMFROOT = $SELFAUTOPARENT
+TEXMFROOT = /usr/share/texlive
- % The tree containing runtime files related to the specific
- % distribution and version.
--TEXMFMAIN = $TEXMFROOT/texmf
-+TEXMFMAIN = /usr/share/texlive/texmf
+ % The main tree of distributed packages and programs:
+ TEXMFDIST = $TEXMFROOT/texmf-dist
+@@ -60,14 +60,17 @@
+ % Keep the variable name.
+ TEXMFMAIN = $TEXMFDIST
- % The main tree of packages, distribution-agnostic:
--TEXMFDIST = $TEXMFROOT/texmf-dist
-+TEXMFDIST = /usr/share/texlive/texmf-dist
-+
+% The Debian search tree
+TEXMFDEBIAN = /usr/share/texmf
-
++
% Local additions to the distribution trees.
-TEXMFLOCAL = $TEXMFROOT/../texmf-local
-+TEXMFLOCAL = /usr/local/share/texmf
++TEXMFLOCAL = /usr/local/share/texmf-local
% TEXMFSYSVAR, where *-sys store cached runtime data.
-TEXMFSYSVAR = $TEXMFROOT/texmf-var
@@ -43,38 +38,41 @@ Index: texlive-base-2012.20120529/texmf/web2c/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 = {!!$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,7 +81,7 @@ Index: texlive-base-2012.20120529/texmf/web2c/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
-@@ -326,7 +329,7 @@
+@@ -329,7 +332,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.
@@ -92,40 +90,39 @@ Index: texlive-base-2012.20120529/texmf/web2c/texmf.cnf
% PostScript Type 1 outline fonts.
T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
-@@ -481,22 +484,24 @@
- % 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 = {\
-+%$SELFAUTOLOC,\
-+%$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
-+%$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
-+%$SELFAUTODIR,\
-+%$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
-+%$SELFAUTODIR/texmf-local/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\
-+%}
++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}
-
-+TEXMFCNF = /etc/texmf/web2c;/usr/share/texlive/texmf/web2c;/usr/share/texlive/texmf-dist/web2c;/usr/local/share/texmf/web2c
-+
- % kpathsea 3.5.3 and later sets these at runtime. To avoid empty
- % expansions from binaries linked against an earlier version of the
- % library, we set $progname and $engine to something non-empty:
diff --git a/texlive-base/debian/patches/upstream_fix_babel_french_days b/texlive-base/debian/patches/upstream_fix_babel_french_days
index 4645738..953e3f5 100644
--- a/texlive-base/debian/patches/upstream_fix_babel_french_days
+++ b/texlive-base/debian/patches/upstream_fix_babel_french_days
@@ -2,8 +2,8 @@
texmf-dist/tex/latex/babelbib/spanish.bdf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---- texlive-base-2012.20120611.orig/texmf-dist/tex/latex/babelbib/spanish.bdf
-+++ texlive-base-2012.20120611/texmf-dist/tex/latex/babelbib/spanish.bdf
+--- texlive-base-2013.20130509.orig/texmf-dist/tex/latex/babelbib/spanish.bdf
++++ texlive-base-2013.20130509/texmf-dist/tex/latex/babelbib/spanish.bdf
@@ -73,9 +73,9 @@
\def\btxmonfebshort##1{\protect\foreignlanguage{#1}{Feb##1{}}}%
\def\btxmonmarshort##1{\protect\foreignlanguage{#1}{Mar##1{}}}%
diff --git a/texlive-base/debian/patches/upstream_updmap-ignoring-settings b/texlive-base/debian/patches/upstream_updmap-ignoring-settings
index 7e4b060..9763e14 100644
--- a/texlive-base/debian/patches/upstream_updmap-ignoring-settings
+++ b/texlive-base/debian/patches/upstream_updmap-ignoring-settings
@@ -1,9 +1,9 @@
---
- texmf/scripts/tetex/updmap.pl | 4 ++--
+ texmf-dist/scripts/texlive/updmap.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- texlive-base-2012.20120611.orig/texmf/scripts/tetex/updmap.pl
-+++ texlive-base-2012.20120611/texmf/scripts/tetex/updmap.pl
+--- texlive-base-2012.20120611.orig/texmf-dist/scripts/texlive/updmap.pl
++++ texlive-base-2012.20120611/texmf-dist/scripts/texlive/updmap.pl
@@ -1042,10 +1042,10 @@
&writeLines(">$dvipsoutputdir/builtin35.map",
normalizeLines(@builtin35_map));
diff --git a/texlive-base/debian/patches/xdvi-config-paper-factorization b/texlive-base/debian/patches/xdvi-config-paper-factorization
index dd9cfcf..d0dae63 100644
--- a/texlive-base/debian/patches/xdvi-config-paper-factorization
+++ b/texlive-base/debian/patches/xdvi-config-paper-factorization
@@ -1,11 +1,11 @@
---
- texmf/xdvi/XDvi | 2 +-
- texmf/xdvi/XDvi-paper | 1 +
- tlpkg/texlive.tlpdb | 1 +
+ texmf-dist/xdvi/XDvi | 2 +-
+ texmf-dist/xdvi/XDvi-paper | 1 +
+ tlpkg/texlive.tlpdb | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
---- texlive-base-2012.20130315.orig/texmf/xdvi/XDvi
-+++ texlive-base-2012.20130315/texmf/xdvi/XDvi
+--- texlive-base-2013.20130509.orig/texmf-dist/xdvi/XDvi
++++ texlive-base-2013.20130509/texmf-dist/xdvi/XDvi
@@ -21,7 +21,7 @@
!!! and greater flexibility for shrink values. Generating MF fonts shouldn't be an
!!! issue when using T1lib.
@@ -16,16 +16,16 @@
!!! This should be the best choice for modern displays with large color depth.
*thorough: true
--- /dev/null
-+++ texlive-base-2012.20130315/texmf/xdvi/XDvi-paper
++++ texlive-base-2013.20130509/texmf-dist/xdvi/XDvi-paper
@@ -0,0 +1 @@
+*paper: a4
---- texlive-base-2012.20130315.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2012.20130315/tlpkg/texlive.tlpdb
-@@ -188849,6 +188849,7 @@
- texmf/doc/man/man1/xdvi.man1.pdf
+--- texlive-base-2013.20130509.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130509/tlpkg/texlive.tlpdb
+@@ -199535,6 +199535,7 @@
runfiles size=9
- texmf/xdvi/XDvi
-+ texmf/xdvi/XDvi-paper
- texmf/xdvi/pixmap/toolbar.xpm
- texmf/xdvi/pixmap/toolbar2.xpm
- texmf/xdvi/xdvi.cfg
+ texmf-dist/dvips/xdvi/config.xdvi
+ texmf-dist/xdvi/XDvi
++ texmf-dist/xdvi/XDvi-paper
+ texmf-dist/xdvi/pixmap/toolbar.xpm
+ texmf-dist/xdvi/pixmap/toolbar2.xpm
+ catalogue-ctan /dviware/xdvi
diff --git a/texlive-extra/debian/patches/fix-mf2pt1-info b/texlive-extra/debian/patches/fix-mf2pt1-info
index 3b0450b..cc562b4 100644
--- a/texlive-extra/debian/patches/fix-mf2pt1-info
+++ b/texlive-extra/debian/patches/fix-mf2pt1-info
@@ -1,11 +1,9 @@
---
- texmf/doc/info/mf2pt1.info | 2 +-
+ texmf-dist/doc/info/mf2pt1.info | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: texlive-extra-2012.20120611/texmf/doc/info/mf2pt1.info
-===================================================================
---- texlive-extra-2012.20120611.orig/texmf/doc/info/mf2pt1.info 2012-04-01 08:11:11.000000000 +0900
-+++ texlive-extra-2012.20120611/texmf/doc/info/mf2pt1.info 2012-07-30 11:06:28.760202853 +0900
+--- texlive-extra-2013.20130509.orig/texmf-dist/doc/info/mf2pt1.info
++++ texlive-extra-2013.20130509/texmf-dist/doc/info/mf2pt1.info
@@ -2,7 +2,7 @@
INFO-DIR-SECTION TeX
diff --git a/texlive-extra/debian/patches/fix-scripts b/texlive-extra/debian/patches/fix-scripts
index 869d669..f781ee2 100644
--- a/texlive-extra/debian/patches/fix-scripts
+++ b/texlive-extra/debian/patches/fix-scripts
@@ -5,8 +5,8 @@
texmf-dist/scripts/vpe/vpe.pl | 3 +--
4 files changed, 5 insertions(+), 14 deletions(-)
---- texlive-extra-2012.20130315.orig/texmf-dist/scripts/pkfix/pkfix.pl
-+++ texlive-extra-2012.20130315/texmf-dist/scripts/pkfix/pkfix.pl
+--- texlive-extra-2013.20130509.orig/texmf-dist/scripts/pkfix/pkfix.pl
++++ texlive-extra-2013.20130509/texmf-dist/scripts/pkfix/pkfix.pl
@@ -1,5 +1,4 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
- if 0;
@@ -14,8 +14,8 @@
use strict;
$^W=1; # turn warning on
#
---- texlive-extra-2012.20130315.orig/texmf-dist/scripts/pst2pdf/pst2pdf.pl
-+++ texlive-extra-2012.20130315/texmf-dist/scripts/pst2pdf/pst2pdf.pl
+--- texlive-extra-2013.20130509.orig/texmf-dist/scripts/pst2pdf/pst2pdf.pl
++++ texlive-extra-2013.20130509/texmf-dist/scripts/pst2pdf/pst2pdf.pl
@@ -1,5 +1,4 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
- if 0;
@@ -23,8 +23,8 @@
use strict; # to be sure, that all is safe ... :-)
---- texlive-extra-2012.20130315.orig/texmf-dist/scripts/vpe/vpe.pl
-+++ texlive-extra-2012.20130315/texmf-dist/scripts/vpe/vpe.pl
+--- texlive-extra-2013.20130509.orig/texmf-dist/scripts/vpe/vpe.pl
++++ texlive-extra-2013.20130509/texmf-dist/scripts/vpe/vpe.pl
@@ -1,5 +1,4 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
- if 0;
@@ -32,8 +32,8 @@
use strict;
#
# vpe.pl
---- texlive-extra-2012.20130315.orig/texmf-dist/scripts/a2ping/a2ping.pl
-+++ texlive-extra-2012.20130315/texmf-dist/scripts/a2ping/a2ping.pl
+--- texlive-extra-2013.20130509.orig/texmf-dist/scripts/a2ping/a2ping.pl
++++ texlive-extra-2013.20130509/texmf-dist/scripts/a2ping/a2ping.pl
@@ -1,11 +1,5 @@
-#! /bin/sh
-eval '(exit $?0)' && eval 'PERL_BADLANG=x;export PERL_BADLANG;: \
diff --git a/texlive-extra/debian/patches/latex2man-mktemp b/texlive-extra/debian/patches/latex2man-mktemp
index 1becc30..e93babf 100644
--- a/texlive-extra/debian/patches/latex2man-mktemp
+++ b/texlive-extra/debian/patches/latex2man-mktemp
@@ -5,8 +5,8 @@ Debian bug #668779
texmf-dist/scripts/latex2man/latex2man | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- texlive-extra-2012.20130111.orig/texmf-dist/scripts/latex2man/latex2man
-+++ texlive-extra-2012.20130111/texmf-dist/scripts/latex2man/latex2man
+--- texlive-extra-2013.20130509.orig/texmf-dist/scripts/latex2man/latex2man
++++ texlive-extra-2013.20130509/texmf-dist/scripts/latex2man/latex2man
@@ -29,8 +29,6 @@
$VERSION = "1.24";
$DATE = date2str ('$Date: 2010/12/22 12:44:30 $' =~ m|(\d+/\d+/\d+)|);
diff --git a/texlive-extra/debian/patches/ulqda-use-digest-sha b/texlive-extra/debian/patches/ulqda-use-digest-sha
index d384057..49090cc 100644
--- a/texlive-extra/debian/patches/ulqda-use-digest-sha
+++ b/texlive-extra/debian/patches/ulqda-use-digest-sha
@@ -2,8 +2,8 @@
texmf-dist/scripts/ulqda/ulqda.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- texlive-extra-2012.20120611.orig/texmf-dist/scripts/ulqda/ulqda.pl
-+++ texlive-extra-2012.20120611/texmf-dist/scripts/ulqda/ulqda.pl
+--- texlive-extra-2013.20130509.orig/texmf-dist/scripts/ulqda/ulqda.pl
++++ texlive-extra-2013.20130509/texmf-dist/scripts/ulqda/ulqda.pl
@@ -17,7 +17,7 @@
#
--
Debian packaging of texlive-nonbin)
Reply to: