[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2012.20130111-1-10-g2d308f8
The following commit has been merged in the master branch:
commit cbdcddcd185de22f20cbdea1632a504baf2c1c7d
Author: Norbert Preining <preining@debian.org>
Date: Mon Mar 18 11:23:24 2013 +0900
update and unfuzzify patches for texlive-base
diff --git a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
index df5e011..a61b7c5 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-2012.20121112/texmf/dvipdfmx/dvipdfmx-paper.cfg
++++ texlive-base-2012.20130315/texmf/dvipdfmx/dvipdfmx-paper.cfg
@@ -0,0 +1,11 @@
+%% PDF Document Settings
+%%
@@ -18,8 +18,8 @@
+
+p a4
+
---- texlive-base-2012.20121112.orig/texmf/dvipdfmx/dvipdfmx.cfg
-+++ texlive-base-2012.20121112/texmf/dvipdfmx/dvipdfmx.cfg
+--- texlive-base-2012.20130315.orig/texmf/dvipdfmx/dvipdfmx.cfg
++++ texlive-base-2012.20130315/texmf/dvipdfmx/dvipdfmx.cfg
@@ -27,14 +27,8 @@
%% PDF Document Settings
@@ -37,9 +37,9 @@
%% Annotation Box Margin:
%%
---- texlive-base-2012.20121112.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2012.20121112/tlpkg/texlive.tlpdb
-@@ -53412,6 +53412,7 @@
+--- 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
runfiles size=42
texmf/dvipdfmx/dvipdfmx.cfg
diff --git a/texlive-base/debian/patches/dvips-config-paper-factorization b/texlive-base/debian/patches/dvips-config-paper-factorization
index a606339..e587f02 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-2012.20121112/texmf/dvips/config/config-paper.ps
++++ texlive-base-2012.20130315/texmf/dvips/config/config-paper.ps
@@ -0,0 +1,524 @@
+%
+% config-paper.ps
@@ -531,8 +531,8 @@
+@+ if
+@+ %%EndPaperSize
+
---- texlive-base-2012.20121112.orig/texmf/dvips/config/config.ps
-+++ texlive-base-2012.20121112/texmf/dvips/config/config.ps
+--- texlive-base-2012.20130315.orig/texmf/dvips/config/config.ps
++++ texlive-base-2012.20130315/texmf/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-2012.20121112.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2012.20121112/tlpkg/texlive.tlpdb
-@@ -54110,6 +54110,7 @@
+--- 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
diff --git a/texlive-base/debian/patches/fix-info-dir-sections b/texlive-base/debian/patches/fix-info-dir-sections
index 12dcbd6..29b2757 100644
--- a/texlive-base/debian/patches/fix-info-dir-sections
+++ b/texlive-base/debian/patches/fix-info-dir-sections
@@ -2,14 +2,12 @@ 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 | 5 +++++
+ texmf/doc/info/epspdf.info |binary
texmf/doc/info/texdraw.info | 5 +++++
- 2 files changed, 10 insertions(+)
+ 2 files changed, 5 insertions(+)
-Index: texlive-base-2011.20120226/texmf/doc/info/texdraw.info
-===================================================================
---- texlive-base-2011.20120226.orig/texmf/doc/info/texdraw.info 2006-01-03 09:00:18.000000000 +0900
-+++ texlive-base-2011.20120226/texmf/doc/info/texdraw.info 2012-03-06 11:43:12.000000000 +0900
+--- texlive-base-2012.20130315.orig/texmf/doc/info/texdraw.info
++++ texlive-base-2012.20130315/texmf/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.
@@ -22,19 +20,4 @@ Index: texlive-base-2011.20120226/texmf/doc/info/texdraw.info
File: texdraw, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
-Index: texlive-base-2011.20120226/texmf/doc/info/epspdf.info
-===================================================================
---- texlive-base-2011.20120226.orig/texmf/doc/info/epspdf.info 2011-02-27 22:21:24.000000000 +0900
-+++ texlive-base-2011.20120226/texmf/doc/info/epspdf.info 2012-03-06 11:43:52.019809190 +0900
-@@ -9,6 +9,11 @@
- the copyright notice and this notice are preserved. This file is
- offered as-is, without any warranty.
-
-+INFO-DIR-SECTION TeX
-+START-INFO-DIR-ENTRY
-+* epspdf: (epspdf). Epspdf and epsdftk.
-+END-INFO-DIR-ENTRY
-+
-
- File: epspdf.info, Node: Top, Next: Usage, 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/pdftex-config-paper-factorization b/texlive-base/debian/patches/pdftex-config-paper-factorization
index 707f978..859c8fd 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-2012.20121112/texmf/tex/generic/config/pdftexconfig-paper.tex
++++ texlive-base-2012.20130315/texmf/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.20121112.orig/texmf/tex/generic/config/pdftexconfig.tex
-+++ texlive-base-2012.20121112/texmf/tex/generic/config/pdftexconfig.tex
+--- texlive-base-2012.20130315.orig/texmf/tex/generic/config/pdftexconfig.tex
++++ texlive-base-2012.20130315/texmf/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-2012.20121112.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2012.20121112/tlpkg/texlive.tlpdb
-@@ -122303,6 +122303,7 @@
+--- 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
diff --git a/texlive-base/debian/patches/xdvi-config-paper-factorization b/texlive-base/debian/patches/xdvi-config-paper-factorization
index 2e3c508..dd9cfcf 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-2012.20121112.orig/texmf/xdvi/XDvi
-+++ texlive-base-2012.20121112/texmf/xdvi/XDvi
+--- texlive-base-2012.20130315.orig/texmf/xdvi/XDvi
++++ texlive-base-2012.20130315/texmf/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-2012.20121112/texmf/xdvi/XDvi-paper
++++ texlive-base-2012.20130315/texmf/xdvi/XDvi-paper
@@ -0,0 +1 @@
+*paper: a4
---- texlive-base-2012.20121112.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2012.20121112/tlpkg/texlive.tlpdb
-@@ -184464,6 +184464,7 @@
+--- 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
runfiles size=9
texmf/xdvi/XDvi
--
Debian packaging of texlive-nonbin)
Reply to: