[texlive-nonbin] 03/04: unfuzzify patches
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit dba57e95eb38ab8e08a07aaaada5d8b768d257b3
Author: Norbert Preining <preining@debian.org>
Date: Tue Nov 28 11:12:20 2017 +0900
unfuzzify patches
---
texlive-base/debian/patches/debian-tlmgr-usermode | 16 +++---
.../patches/dvipdfmx-config-paper-factorization | 12 ++---
.../patches/dvips-config-paper-factorization | 12 ++---
.../debian/patches/xdvi-config-paper-factorization | 12 ++---
texlive-extra/debian/patches/mhelvens-pkg-update | 57 ----------------------
texlive-extra/debian/patches/series | 1 -
6 files changed, 26 insertions(+), 84 deletions(-)
diff --git a/texlive-base/debian/patches/debian-tlmgr-usermode b/texlive-base/debian/patches/debian-tlmgr-usermode
index 7a38025..4990842 100644
--- a/texlive-base/debian/patches/debian-tlmgr-usermode
+++ b/texlive-base/debian/patches/debian-tlmgr-usermode
@@ -3,10 +3,10 @@
texmf-dist/scripts/texlive/tlmgr.pl | 50 +++---------------------------------
2 files changed, 7 insertions(+), 45 deletions(-)
---- texlive-base-2017.20170525.orig/texmf-dist/scripts/texlive/tlmgr.pl
-+++ texlive-base-2017.20170525/texmf-dist/scripts/texlive/tlmgr.pl
-@@ -20,7 +20,7 @@
- $tlmgrrevision .= " ($datrev)";
+--- texlive-base-2017.20171128.orig/texmf-dist/scripts/texlive/tlmgr.pl
++++ texlive-base-2017.20171128/texmf-dist/scripts/texlive/tlmgr.pl
+@@ -21,7 +21,7 @@
+ $tlmgrversion = "$tlmgrrevision ($datrev)";
our $Master;
-our $ismain;
@@ -14,7 +14,7 @@
our $loadmediasrcerror;
our $packagelogfile;
our $packagelogged;
-@@ -38,50 +38,7 @@
+@@ -39,50 +39,7 @@
BEGIN {
$^W = 1;
@@ -66,7 +66,7 @@
$::installerdir = $Master; # for config.guess et al., see TLUtils.pm
# make Perl find our packages first:
-@@ -396,6 +353,9 @@
+@@ -407,6 +364,9 @@
GetOptions(\%opts, keys(%optarg)) or pod2usage(2);
@@ -76,8 +76,8 @@
$::debug_translation = 0;
$::debug_translation = 1 if $opts{"debug-translation"};
---- texlive-base-2017.20170525.orig/texmf-dist/doc/man/man1/tlmgr.1
-+++ texlive-base-2017.20170525/texmf-dist/doc/man/man1/tlmgr.1
+--- texlive-base-2017.20171128.orig/texmf-dist/doc/man/man1/tlmgr.1
++++ texlive-base-2017.20171128/texmf-dist/doc/man/man1/tlmgr.1
@@ -150,6 +150,8 @@
<http://tug.org/texlive/tlmgr.html>, along with procedures for updating
\&\f(CW\*(C`tlmgr\*(C'\fR itself and information about test versions.
diff --git a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
index 6cdc82d..bd448d9 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-2017.20170525/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
++++ texlive-base-2017.20171128/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
@@ -0,0 +1,11 @@
+%% PDF Document Settings
+%%
@@ -18,8 +18,8 @@
+
+p a4
+
---- texlive-base-2017.20170525.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
-+++ texlive-base-2017.20170525/texmf-dist/dvipdfmx/dvipdfmx.cfg
+--- texlive-base-2017.20171128.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
++++ texlive-base-2017.20171128/texmf-dist/dvipdfmx/dvipdfmx.cfg
@@ -29,14 +29,8 @@
%% PDF Document Settings
@@ -37,9 +37,9 @@
%% Annotation Box Margin:
%%
---- texlive-base-2017.20170525.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2017.20170525/tlpkg/texlive.tlpdb
-@@ -77812,6 +77812,7 @@
+--- texlive-base-2017.20171128.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2017.20171128/tlpkg/texlive.tlpdb
+@@ -81045,6 +81045,7 @@
texmf-dist/doc/man/man1/xdvipdfmx.man1.pdf
runfiles size=40
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 de0f674..d17f771 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, 542 insertions(+), 527 deletions(-)
--- /dev/null
-+++ texlive-base-2017.20170525/texmf-dist/dvips/config/config-paper.ps
++++ texlive-base-2017.20171128/texmf-dist/dvips/config/config-paper.ps
@@ -0,0 +1,533 @@
+%
+% config-paper.ps
@@ -540,8 +540,8 @@
+@+ if
+@+ %%EndPaperSize
+
---- texlive-base-2017.20170525.orig/texmf-dist/dvips/config/config.ps
-+++ texlive-base-2017.20170525/texmf-dist/dvips/config/config.ps
+--- texlive-base-2017.20171128.orig/texmf-dist/dvips/config/config.ps
++++ texlive-base-2017.20171128/texmf-dist/dvips/config/config.ps
@@ -67,533 +67,13 @@
%
% emacs-page
@@ -1088,9 +1088,9 @@
@ nopaper 0in 0in
@+ % dvips-nopaper
+
---- texlive-base-2017.20170525.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2017.20170525/tlpkg/texlive.tlpdb
-@@ -78529,6 +78529,7 @@
+--- texlive-base-2017.20171128.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2017.20171128/tlpkg/texlive.tlpdb
+@@ -81763,6 +81763,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/xdvi-config-paper-factorization b/texlive-base/debian/patches/xdvi-config-paper-factorization
index 1567834..04a0617 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, 13 insertions(+), 1 deletion(-)
---- texlive-base-2017.20170525.orig/texmf-dist/xdvi/XDvi
-+++ texlive-base-2017.20170525/texmf-dist/xdvi/XDvi
+--- texlive-base-2017.20171128.orig/texmf-dist/xdvi/XDvi
++++ texlive-base-2017.20171128/texmf-dist/xdvi/XDvi
@@ -21,7 +21,17 @@
!!! and greater flexibility for shrink values. Generating MF fonts shouldn't be an
!!! issue when using T1lib.
@@ -26,12 +26,12 @@
!!! This should be the best choice for modern displays with large color depth.
*thorough: true
--- /dev/null
-+++ texlive-base-2017.20170525/texmf-dist/xdvi/XDvi-paper
++++ texlive-base-2017.20171128/texmf-dist/xdvi/XDvi-paper
@@ -0,0 +1 @@
+*paper: a4
---- texlive-base-2017.20170525.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2017.20170525/tlpkg/texlive.tlpdb
-@@ -258300,6 +258300,7 @@
+--- texlive-base-2017.20171128.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2017.20171128/tlpkg/texlive.tlpdb
+@@ -267961,6 +267961,7 @@
runfiles size=9
texmf-dist/dvips/xdvi/config.xdvi
texmf-dist/xdvi/XDvi
diff --git a/texlive-extra/debian/patches/mhelvens-pkg-update b/texlive-extra/debian/patches/mhelvens-pkg-update
deleted file mode 100644
index bf2e067..0000000
--- a/texlive-extra/debian/patches/mhelvens-pkg-update
+++ /dev/null
@@ -1,57 +0,0 @@
-fixes for packages from https://github.com/mhelvens to adjust to new expl3
-Patches by Caraffini Diego, submitted upstream
-Closes: #876323 and #876325
----
- texmf-dist/tex/latex/lt3graph/lt3graph.sty | 6 +++---
- texmf-dist/tex/latex/pkgloader/pkgloader.sty | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
---- texlive-extra-2017.20170920.orig/texmf-dist/tex/latex/lt3graph/lt3graph.sty
-+++ texlive-extra-2017.20170920/texmf-dist/tex/latex/lt3graph/lt3graph.sty
-@@ -48,7 +48,7 @@
- % \begin{macrocode}
- \NeedsTeXFormat{LaTeX2e}
- \RequirePackage{expl3}
--\ProvidesExplPackage{lt3graph}{2017/01/05}{0.1.8}
-+\ProvidesExplPackage{lt3graph}{2017/09/20}{0.1.8a}
- {a LaTeX3 datastructure for representing directed graphs with data}
- % \end{macrocode}
- %
-@@ -1226,7 +1226,7 @@
- % #6: ptr to edge value (not used)
- \str_if_eq:nnT {#2} {#4} {
- \__graph_map_successors_tokens_aux:nnv
-- {#3} {#5} {\prop_get:cn{\__graph_tl:nnn{graph}{#1}{vertices}}{#5}}
-+ {#3} {#5} {\prop_item:cn{\__graph_tl:nnn{graph}{#1}{vertices}}{#5}}
- }
- }
- \cs_new:Nn \__graph_map_successors_tokens_aux:nnn {
-@@ -1275,7 +1275,7 @@
- % #6: ptr to edge value (not used)
- \str_if_eq:nnT {#2} {#4} {
- \__graph_map_successors_function_aux:Nnv
-- #3 {#5} {\prop_get:cn{\__graph_tl:nnn{graph}{#1}{vertices}}{#5}}
-+ #3 {#5} {\prop_item:cn{\__graph_tl:nnn{graph}{#1}{vertices}}{#5}}
- }
- }
- \cs_new:Nn \__graph_map_successors_function_aux:Nnn {
---- texlive-extra-2017.20170920.orig/texmf-dist/tex/latex/pkgloader/pkgloader.sty
-+++ texlive-extra-2017.20170920/texmf-dist/tex/latex/pkgloader/pkgloader.sty
-@@ -48,7 +48,7 @@
- % \begin{macrocode}
- \NeedsTeXFormat{LaTeX2e}
- \RequirePackage{expl3}
--\ProvidesExplPackage{pkgloader}{2014/11/30}{0.5.0}
-+\ProvidesExplPackage{pkgloader}{2017/09/20}{0.5.0a}
- {managing the options and loading order of LaTeX packages}
- % \end{macrocode}
- %
-@@ -844,7 +844,7 @@
- % filenames from their four character extension:
- %
- % \begin{macrocode}
--\cs_new:Nn \__pkgloader_strip_extension:f {
-+\cs_new:Npn \__pkgloader_strip_extension:f #1 {
- \tl_reverse:f{
- \tl_tail:f{\tl_tail:f{\tl_tail:f{\tl_tail:f{
- \tl_reverse:n{#1}
diff --git a/texlive-extra/debian/patches/series b/texlive-extra/debian/patches/series
index 66c1558..ed9f606 100644
--- a/texlive-extra/debian/patches/series
+++ b/texlive-extra/debian/patches/series
@@ -6,4 +6,3 @@ fix-invoice.sty
fix-perl522-noise
sympytex-path
fix-gbrief-multiple
-mhelvens-pkg-update
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: