[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[texlive-nonbin] 01/02: update patches, try a release



This is an automated email from the git hooks/post-receive script.

preining pushed a commit to branch master
in repository texlive-nonbin.

commit d576a6ad69443072746f569f36cf522b9c8ef019
Author: Norbert Preining <preining@debian.org>
Date:   Wed Oct 14 12:39:58 2015 +0900

    update patches, try a release
---
 texlive-base/debian/changelog                      |  5 +-
 .../patches/dvipdfmx-config-paper-factorization    | 12 ++---
 .../patches/dvips-config-paper-factorization       | 12 ++---
 .../patches/pdftex-config-paper-factorization      | 57 ++++++++++++++--------
 .../debian/patches/xdvi-config-paper-factorization | 12 ++---
 texlive-extra/debian/changelog                     |  5 +-
 texlive-lang/debian/changelog                      |  5 +-
 7 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index dadaae1..f155864 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,12 +1,11 @@
-texlive-base (2015.20150917-2~1) UNRELEASED; urgency=medium
+texlive-base (2015.20151014-1) unstable; urgency=medium
 
-  * NEW UPSTREAM CHECKOUT NECESSARY
   * set all packages to M-A: foreign (Closes: #792281)
   * new upstream checkout
     - adds missing logosl8.mf and  missing logo*tfm files (Closes: #796097)
       (thanks to Giuseppe Bilotta for perseverance)
 
- -- Norbert Preining <preining@debian.org>  Tue, 13 Oct 2015 11:45:37 +0900
+ -- Norbert Preining <preining@debian.org>  Wed, 14 Oct 2015 11:14:17 +0900
 
 texlive-base (2015.20150917-1) unstable; urgency=medium
 
diff --git a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
index 56634cd..7616f3e 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-2015.20150809/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
++++ texlive-base-2015.20151014/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
 @@ -0,0 +1,11 @@
 +%% PDF Document Settings
 +%%
@@ -18,8 +18,8 @@
 +
 +p a4
 +
---- texlive-base-2015.20150809.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
-+++ texlive-base-2015.20150809/texmf-dist/dvipdfmx/dvipdfmx.cfg
+--- texlive-base-2015.20151014.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
++++ texlive-base-2015.20151014/texmf-dist/dvipdfmx/dvipdfmx.cfg
 @@ -27,14 +27,8 @@
  
  %% PDF Document Settings
@@ -37,9 +37,9 @@
  
  %% Annotation Box Margin:
  %%
---- texlive-base-2015.20150809.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2015.20150809/tlpkg/texlive.tlpdb
-@@ -69597,6 +69597,7 @@
+--- texlive-base-2015.20151014.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2015.20151014/tlpkg/texlive.tlpdb
+@@ -69797,6 +69797,7 @@
   texmf-dist/doc/man/man1/xdvipdfmx.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 13e48aa..210e0ae 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-2015.20150809/texmf-dist/dvips/config/config-paper.ps
++++ texlive-base-2015.20151014/texmf-dist/dvips/config/config-paper.ps
 @@ -0,0 +1,524 @@
 +%
 +% config-paper.ps
@@ -531,8 +531,8 @@
 +@+ if
 +@+ %%EndPaperSize
 +
---- texlive-base-2015.20150809.orig/texmf-dist/dvips/config/config.ps
-+++ texlive-base-2015.20150809/texmf-dist/dvips/config/config.ps
+--- texlive-base-2015.20151014.orig/texmf-dist/dvips/config/config.ps
++++ texlive-base-2015.20151014/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-2015.20150809.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2015.20150809/tlpkg/texlive.tlpdb
-@@ -70328,6 +70328,7 @@
+--- texlive-base-2015.20151014.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2015.20151014/tlpkg/texlive.tlpdb
+@@ -70542,6 +70542,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 f20d6d8..8841e04 100644
--- a/texlive-base/debian/patches/pdftex-config-paper-factorization
+++ b/texlive-base/debian/patches/pdftex-config-paper-factorization
@@ -1,32 +1,49 @@
 ---
- texmf-dist/tex/generic/config/pdftexconfig-paper.tex |    4 ++++
- texmf-dist/tex/generic/config/pdftexconfig.tex       |    4 ++--
+ texmf-dist/tex/generic/config/pdftexconfig-paper.tex |   13 +++++++++++++
+ texmf-dist/tex/generic/config/pdftexconfig.tex       |   12 ++----------
  tlpkg/texlive.tlpdb                                  |    1 +
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ 3 files changed, 16 insertions(+), 10 deletions(-)
 
 --- /dev/null
-+++ texlive-base-2015.20150809/texmf-dist/tex/generic/config/pdftexconfig-paper.tex
-@@ -0,0 +1,4 @@
++++ texlive-base-2015.20151014/texmf-dist/tex/generic/config/pdftexconfig-paper.tex
+@@ -0,0 +1,13 @@
 +% paper size settings, included from pdftexconfig.tex for pdftex
-+\pdfpagewidth=210 true mm
-+\pdfpageheight=297 true mm
++%
++% In 2015, a new luatex replaced \pdfpage{width,height} with just
++% \page{width,height}, and it might be prefixed with \luatex.  So set
++% any that may be defined.
++\ifx\luatexpagewidth\undefined\else \luatexpagewidth=210 true mm \fi
++\ifx\pdfpagewidth\undefined\else \pdfpagewidth=210 true mm \fi
++\ifx\pagewidth\undefined\else \pagewidth=210 true mm \fi
++%
++\ifx\luatexpageheight\undefined\else \luatexpageheight=297 true mm \fi
++\ifx\pdfpageheight\undefined\else \pdfpageheight=297 true mm \fi
++\ifx\pageheight\undefined\else \pageheight=297 true mm \fi
 +\endinput
---- texlive-base-2015.20150809.orig/texmf-dist/tex/generic/config/pdftexconfig.tex
-+++ texlive-base-2015.20150809/texmf-dist/tex/generic/config/pdftexconfig.tex
-@@ -3,8 +3,8 @@
+--- texlive-base-2015.20151014.orig/texmf-dist/tex/generic/config/pdftexconfig.tex
++++ texlive-base-2015.20151014/texmf-dist/tex/generic/config/pdftexconfig.tex
+@@ -3,16 +3,8 @@
+ % Thomas Esser, 2004. public domain.
  \pdfoutput=1
- \pdfcompresslevel=9
- \pdfdecimaldigits=3
--\pdfpagewidth=210 true mm
--\pdfpageheight=297 true mm
+ %
+-% In 2015, a new luatex replaced \pdfpage{width,height} with just
+-% \page{width,height}, and it might be prefixed with \luatex.  So set
+-% any that may be defined.
+-\ifx\luatexpagewidth\undefined\else \luatexpagewidth=210 true mm \fi
+-\ifx\pdfpagewidth\undefined\else \pdfpagewidth=210 true mm \fi
+-\ifx\pagewidth\undefined\else \pagewidth=210 true mm \fi
+-%
+-\ifx\luatexpageheight\undefined\else \luatexpageheight=297 true mm \fi
+-\ifx\pdfpageheight\undefined\else \pdfpageheight=297 true mm \fi
+-\ifx\pageheight\undefined\else \pageheight=297 true mm \fi
 +% pdftex paper settings are in pdftexconfig-paper.tex
 +\input pdftexconfig-paper.tex
- \pdfhorigin=1 true in
- \pdfvorigin=1 true in
- \pdfpkresolution=600
---- texlive-base-2015.20150809.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2015.20150809/tlpkg/texlive.tlpdb
-@@ -159212,6 +159212,7 @@
+ %
+ % Other settings.
+ \pdfcompresslevel=9
+--- texlive-base-2015.20151014.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2015.20151014/tlpkg/texlive.tlpdb
+@@ -160096,6 +160096,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/xdvi-config-paper-factorization b/texlive-base/debian/patches/xdvi-config-paper-factorization
index ff1a784..33d9d91 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-2015.20150809.orig/texmf-dist/xdvi/XDvi
-+++ texlive-base-2015.20150809/texmf-dist/xdvi/XDvi
+--- texlive-base-2015.20151014.orig/texmf-dist/xdvi/XDvi
++++ texlive-base-2015.20151014/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-2015.20150809/texmf-dist/xdvi/XDvi-paper
++++ texlive-base-2015.20151014/texmf-dist/xdvi/XDvi-paper
 @@ -0,0 +1 @@
 +*paper: a4
---- texlive-base-2015.20150809.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2015.20150809/tlpkg/texlive.tlpdb
-@@ -232112,6 +232112,7 @@
+--- texlive-base-2015.20151014.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2015.20151014/tlpkg/texlive.tlpdb
+@@ -233206,6 +233206,7 @@
  runfiles size=9
   texmf-dist/dvips/xdvi/config.xdvi
   texmf-dist/xdvi/XDvi
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index c06f878..f21cb26 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,8 +1,9 @@
-texlive-extra (2015.20150917-2~1) UNRELEASED; urgency=medium
+texlive-extra (2015.20151014-1) unstable; urgency=medium
 
+  * new upstream checkout
   * set all packages to M-A: foreign
 
- -- Norbert Preining <preining@debian.org>  Fri, 25 Sep 2015 17:03:13 +0900
+ -- Norbert Preining <preining@debian.org>  Wed, 14 Oct 2015 11:14:36 +0900
 
 texlive-extra (2015.20150917-1) unstable; urgency=medium
 
diff --git a/texlive-lang/debian/changelog b/texlive-lang/debian/changelog
index 0e00994..d83a152 100644
--- a/texlive-lang/debian/changelog
+++ b/texlive-lang/debian/changelog
@@ -1,8 +1,9 @@
-texlive-lang (2015.20150917-2~1) UNRELEASED; urgency=medium
+texlive-lang (2015.20151014-1) unstable; urgency=medium
 
+  * new upstream checkout
   * set all packages to M-A: foreign
 
- -- Norbert Preining <preining@debian.org>  Fri, 25 Sep 2015 17:03:35 +0900
+ -- Norbert Preining <preining@debian.org>  Wed, 14 Oct 2015 11:14:53 +0900
 
 texlive-lang (2015.20150917-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git


Reply to: