[Reproducible-commits] [texlive-bin] 108/400: cherrypick a bugfix from upstream for ptex kanji code scanning (debian/quilt/upstream-fix-ptex-scanning)

[Maria Valentina Marin Rodrigues]

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

akira-guest pushed a commit to branch master
in repository texlive-bin.

commit 1ec89c499c5e50a8fa8085eac39e40446f075ed7
Author: Norbert Preining <preining at debian.org>
Date:   Tue Jul 17 17:24:18 2012 +0000

    cherrypick a bugfix from upstream for ptex kanji code scanning
    (debian/quilt/upstream-fix-ptex-scanning)
---
 debian/changelog                        |  8 ++++++++
 debian/quilt/series                     |  1 +
 debian/quilt/upstream-fix-ptex-scanning | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 481e66e..1fc15ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+texlive-bin (2012.20120628-2) unstable; urgency=low
+
+  * cherrypick a bugfix from upstream for ptex kanji code scanning
+    (debian/quilt/upstream-fix-ptex-scanning)
+  * format and lintian fixes
+
+ -- Norbert Preining <preining at debian.org>  Wed, 18 Jul 2012 02:22:29 +0900
+
 texlive-bin (2012.20120628-1) unstable; urgency=low
 
   * new upstream (some emergency fixes), the following patches have
diff --git a/debian/quilt/series b/debian/quilt/series
index f054dad..f63406a 100644
--- a/debian/quilt/series
+++ b/debian/quilt/series
@@ -26,3 +26,4 @@ patch-update-updmap-manpage
 xdvi-upupstream-fixes
 #upstream included# upstream-fix-ini-synctex-segfault
 #upstream included# fix-pipe-in-out-regression
+upstream-fix-ptex-scanning
diff --git a/debian/quilt/upstream-fix-ptex-scanning b/debian/quilt/upstream-fix-ptex-scanning
new file mode 100644
index 0000000..ad78396
--- /dev/null
+++ b/debian/quilt/upstream-fix-ptex-scanning
@@ -0,0 +1,33 @@
+Fix scanning of characters in ptex
+upstream svn 27076
+---
+ texk/web2c/ptexdir/ChangeLog    |    5 +++++
+ texk/web2c/ptexdir/ptex-base.ch |    2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+Index: texlive-bin-2012.20120628/texk/web2c/ptexdir/ChangeLog
+===================================================================
+--- texlive-bin-2012.20120628.orig/texk/web2c/ptexdir/ChangeLog	2012-05-23 16:16:33.000000000 +0900
++++ texlive-bin-2012.20120628/texk/web2c/ptexdir/ChangeLog	2012-07-18 02:20:01.638046297 +0900
+@@ -1,3 +1,8 @@
++2012-07-17  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
++
++	* ptex-base.ch: fix a bug in
++	@<Scan an alphabetic character code into |cur_val|@>
++
+ 2012-05-22  Peter Breitenlohner  <peb at mppmu.mpg.de>
+ 
+ 	* pdvitype.test, sample.test: Cope with spaces in paths returned
+Index: texlive-bin-2012.20120628/texk/web2c/ptexdir/ptex-base.ch
+===================================================================
+--- texlive-bin-2012.20120628.orig/texk/web2c/ptexdir/ptex-base.ch	2012-05-12 21:40:41.000000000 +0900
++++ texlive-bin-2012.20120628/texk/web2c/ptexdir/ptex-base.ch	2012-07-18 02:19:29.125987453 +0900
+@@ -2149,7 +2149,7 @@
+ else if cur_tok<cs_token_flag+single_base then
+   cur_val:=cur_tok-cs_token_flag-active_base
+ else cur_val:=cur_tok-cs_token_flag-single_base;
+-if (cur_val>255)and(cur_cmd<kanji) then
++if (cur_val>255)and((cur_cmd<kanji)or(cur_cmd>max_char_code)) then
+   begin print_err("Improper alphabetic or KANJI constant");
+ @.Improper alphabetic constant@>
+   help2("A one-character control sequence belongs after a ` mark.")@/

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