[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2013.20130530-1-14-gd5a797f
The following commit has been merged in the master branch:
commit e907cca65c9a979166556d95df2a70999b25d6b5
Author: Norbert Preining <preining@debian.org>
Date: Mon Jul 22 17:29:30 2013 +0900
update tlmgr.pl for selfmode fix, unfuzzy patches
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 874e38f..dd4606b 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -4,8 +4,10 @@ texlive-base (2013.20130722-1) unstable; urgency=low
* conflict with texlive common so that it gets removed (Closes: #710789)
* add Polish debconf translation, thanks to Michał Kułach
(Closes: #711235)
+ * update tlmgr (and with new upstream also TLUtils.pm) to support
+ map files in user mode
- -- Norbert Preining <preining@debian.org> Mon, 22 Jul 2013 12:03:35 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 22 Jul 2013 17:35:16 +0900
texlive-base (2013.20130530-1) unstable; urgency=low
diff --git a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
index 07324d1..cc61141 100644
--- a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
+++ b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
@@ -5,7 +5,7 @@
3 files changed, 14 insertions(+), 8 deletions(-)
--- /dev/null
-+++ texlive-base-2013.20130523/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
++++ texlive-base-2013.20130722/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
@@ -0,0 +1,11 @@
+%% PDF Document Settings
+%%
@@ -18,8 +18,8 @@
+
+p a4
+
---- texlive-base-2013.20130523.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
-+++ texlive-base-2013.20130523/texmf-dist/dvipdfmx/dvipdfmx.cfg
+--- texlive-base-2013.20130722.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
++++ texlive-base-2013.20130722/texmf-dist/dvipdfmx/dvipdfmx.cfg
@@ -27,14 +27,8 @@
%% PDF Document Settings
@@ -37,9 +37,9 @@
%% Annotation Box Margin:
%%
---- texlive-base-2013.20130523.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2013.20130523/tlpkg/texlive.tlpdb
-@@ -56597,6 +56597,7 @@
+--- texlive-base-2013.20130722.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130722/tlpkg/texlive.tlpdb
+@@ -56687,6 +56687,7 @@
texmf-dist/doc/man/man1/extractbb.man1.pdf
runfiles size=42
texmf-dist/dvipdfmx/dvipdfmx.cfg
diff --git a/texlive-base/debian/patches/dvips-config-paper-factorization b/texlive-base/debian/patches/dvips-config-paper-factorization
index 529da40..c201731 100644
--- a/texlive-base/debian/patches/dvips-config-paper-factorization
+++ b/texlive-base/debian/patches/dvips-config-paper-factorization
@@ -5,7 +5,7 @@
3 files changed, 532 insertions(+), 518 deletions(-)
--- /dev/null
-+++ texlive-base-2013.20130523/texmf-dist/dvips/config/config-paper.ps
++++ texlive-base-2013.20130722/texmf-dist/dvips/config/config-paper.ps
@@ -0,0 +1,524 @@
+%
+% config-paper.ps
@@ -531,8 +531,8 @@
+@+ if
+@+ %%EndPaperSize
+
---- texlive-base-2013.20130523.orig/texmf-dist/dvips/config/config.ps
-+++ texlive-base-2013.20130523/texmf-dist/dvips/config/config.ps
+--- texlive-base-2013.20130722.orig/texmf-dist/dvips/config/config.ps
++++ texlive-base-2013.20130722/texmf-dist/dvips/config/config.ps
@@ -67,524 +67,13 @@
%
% emacs-page
@@ -1065,9 +1065,9 @@
% use -t unknown with a \special{papersize=...} for a nonstandard page size.
@ unknown 0in 0in
---- texlive-base-2013.20130523.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2013.20130523/tlpkg/texlive.tlpdb
-@@ -57391,6 +57391,7 @@
+--- texlive-base-2013.20130722.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130722/tlpkg/texlive.tlpdb
+@@ -57481,6 +57481,7 @@
texmf-dist/dvips/config/config.mirrorprint
texmf-dist/dvips/config/config.ot2
texmf-dist/dvips/config/config.ps
diff --git a/texlive-base/debian/patches/pdftex-config-paper-factorization b/texlive-base/debian/patches/pdftex-config-paper-factorization
index 893d8b3..c94a4a9 100644
--- a/texlive-base/debian/patches/pdftex-config-paper-factorization
+++ b/texlive-base/debian/patches/pdftex-config-paper-factorization
@@ -5,14 +5,14 @@
3 files changed, 7 insertions(+), 2 deletions(-)
--- /dev/null
-+++ texlive-base-2013.20130523/texmf-dist/tex/generic/config/pdftexconfig-paper.tex
++++ texlive-base-2013.20130722/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-2013.20130523.orig/texmf-dist/tex/generic/config/pdftexconfig.tex
-+++ texlive-base-2013.20130523/texmf-dist/tex/generic/config/pdftexconfig.tex
+--- texlive-base-2013.20130722.orig/texmf-dist/tex/generic/config/pdftexconfig.tex
++++ texlive-base-2013.20130722/texmf-dist/tex/generic/config/pdftexconfig.tex
@@ -3,8 +3,8 @@
\pdfoutput=1
\pdfcompresslevel=9
@@ -24,9 +24,9 @@
\pdfhorigin=1 true in
\pdfvorigin=1 true in
\pdfpkresolution=600
---- texlive-base-2013.20130523.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2013.20130523/tlpkg/texlive.tlpdb
-@@ -133347,6 +133347,7 @@
+--- texlive-base-2013.20130722.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130722/tlpkg/texlive.tlpdb
+@@ -134281,6 +134281,7 @@
texmf-dist/scripts/simpdftex/simpdftex
texmf-dist/tex/generic/config/pdftex-dvi.tex
texmf-dist/tex/generic/config/pdftexconfig.tex
diff --git a/texlive-base/debian/patches/series b/texlive-base/debian/patches/series
index 0aab5a6..b210a96 100644
--- a/texlive-base/debian/patches/series
+++ b/texlive-base/debian/patches/series
@@ -3,6 +3,7 @@
# dvipdfmx.cfg_whitespace
#
# for epspdf this seems to be upstream, need to fix texpwer, too
+upstream-selfmode-fix
fix-info-dir-sections
# could be merged into the later fix-scripts patch
fix-pgf2pdf-script
diff --git a/texlive-base/debian/patches/upstream-selfmode-fix b/texlive-base/debian/patches/upstream-selfmode-fix
new file mode 100644
index 0000000..4e604fd
--- /dev/null
+++ b/texlive-base/debian/patches/upstream-selfmode-fix
@@ -0,0 +1,49 @@
+---
+ texmf-dist/scripts/texlive/tlmgr.pl | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+--- texlive-base-2013.20130722.orig/texmf-dist/scripts/texlive/tlmgr.pl
++++ texlive-base-2013.20130722/texmf-dist/scripts/texlive/tlmgr.pl
+@@ -1,12 +1,12 @@
+ #!/usr/bin/env perl
+-# $Id: tlmgr.pl 31082 2013-07-03 04:25:56Z preining $
++# $Id: tlmgr.pl 31259 2013-07-21 22:07:38Z karl $
+ #
+ # Copyright 2008-2013 Norbert Preining
+ # This file is licensed under the GNU General Public License version 2
+ # or any later version.
+
+-my $svnrev = '$Revision: 31082 $';
+-my $datrev = '$Date: 2013-07-03 06:25:56 +0200 (Wed, 03 Jul 2013) $';
++my $svnrev = '$Revision: 31259 $';
++my $datrev = '$Date: 2013-07-22 00:07:38 +0200 (Mon, 22 Jul 2013) $';
+ my $tlmgrrevision;
+ my $prg;
+ if ($svnrev =~ m/: ([0-9]+) /) {
+@@ -681,7 +681,6 @@
+ chomp(my $TEXMFLOCAL = `kpsewhich -var-value=TEXMFLOCAL`);
+ chomp(my $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`);
+
+- #
+ # maps handling
+ {
+ my $updmap_run_needed = 0;
+@@ -691,8 +690,9 @@
+ for my $m (keys %{$::execute_actions{'disable'}{'maps'}}) {
+ $updmap_run_needed = 1;
+ }
++ my $dest = $opts{"usermode"} ? "$::maintree/web2c/updmap.cfg"
++ : "$TEXMFDIST/web2c/updmap.cfg";
+ if ($updmap_run_needed) {
+- my $dest = "$TEXMFDIST/web2c/updmap.cfg";
+ TeXLive::TLUtils::create_updmap($localtlpdb, $dest);
+ }
+ $errors += do_cmd_and_check("updmap$sysmode") if $updmap_run_needed;
+@@ -702,7 +702,6 @@
+ # we first have to check if the config files, that is fmtutil.cnf
+ # or one of the language* files have changed, regenerate them
+ # if necessary, and then run the necessary fmtutil calls.
+-
+ {
+ # first check for language* files
+ my $regenerate_language = 0;
diff --git a/texlive-base/debian/patches/xdvi-config-paper-factorization b/texlive-base/debian/patches/xdvi-config-paper-factorization
index 58f3c0d..c6d5e65 100644
--- a/texlive-base/debian/patches/xdvi-config-paper-factorization
+++ b/texlive-base/debian/patches/xdvi-config-paper-factorization
@@ -4,8 +4,8 @@
tlpkg/texlive.tlpdb | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
---- texlive-base-2013.20130523.orig/texmf-dist/xdvi/XDvi
-+++ texlive-base-2013.20130523/texmf-dist/xdvi/XDvi
+--- texlive-base-2013.20130722.orig/texmf-dist/xdvi/XDvi
++++ texlive-base-2013.20130722/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,12 +16,12 @@
!!! This should be the best choice for modern displays with large color depth.
*thorough: true
--- /dev/null
-+++ texlive-base-2013.20130523/texmf-dist/xdvi/XDvi-paper
++++ texlive-base-2013.20130722/texmf-dist/xdvi/XDvi-paper
@@ -0,0 +1 @@
+*paper: a4
---- texlive-base-2013.20130523.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2013.20130523/tlpkg/texlive.tlpdb
-@@ -199552,6 +199552,7 @@
+--- texlive-base-2013.20130722.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130722/tlpkg/texlive.tlpdb
+@@ -200251,6 +200251,7 @@
runfiles size=9
texmf-dist/dvips/xdvi/config.xdvi
texmf-dist/xdvi/XDvi
--
Debian packaging of texlive-nonbin)
Reply to: