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

Re: Possible freeze exception for texlive-bin



On Do, 26 Jul 2012, Norbert Preining wrote:
> On Mi, 25 Jul 2012, Adam D. Barratt wrote:
> > above, please let us have a debdiff anyway, if only for documentation  
> 
> Sure, give me 30min ... to build new packages ;-)

Here we go, full debdiff for -2 release. I will not upload unless you
give me an ok, because I want to keep the repository clean and ready
for fixes for stable and don't want to branch between stable/unstable 
for now.

Best wishes

Norbert
------------------------------------------------------------------------
Norbert Preining            preining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan                                 TeX Live & Debian Developer
DSA: 0x09C5B094   fp: 14DF 2E6C 0307 BE6D AD76  A9C0 D2BF 4AA3 09C5 B094
------------------------------------------------------------------------
One's never alone with a rubber duck.
                 --- Douglas Adams, The Hitchhikers Guide to the Galaxy
diff -Nru texlive-bin-2012.20120628/debian/changelog texlive-bin-2012.20120628/debian/changelog
--- texlive-bin-2012.20120628/debian/changelog	2012-06-28 23:47:35.000000000 +0900
+++ texlive-bin-2012.20120628/debian/changelog	2012-07-26 02:20:46.000000000 +0900
@@ -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@debian.org>  Thu, 26 Jul 2012 02:20:44 +0900
+
 texlive-bin (2012.20120628-1) unstable; urgency=low
 
   * new upstream (some emergency fixes), the following patches have
diff -Nru texlive-bin-2012.20120628/debian/control texlive-bin-2012.20120628/debian/control
--- texlive-bin-2012.20120628/debian/control	2012-05-15 15:13:23.000000000 +0900
+++ texlive-bin-2012.20120628/debian/control	2012-07-18 02:16:43.000000000 +0900
@@ -1,11 +1,11 @@
 Source: texlive-bin
 Section: tex
 Priority: optional
-Maintainer:  Debian TeX Maintainers <debian-tex-maint@lists.debian.org>
+Maintainer: Debian TeX Maintainers <debian-tex-maint@lists.debian.org>
 Uploaders: Norbert Preining <preining@debian.org>, Frank Küster <frank@kuesterei.ch>
 Build-Depends: debhelper (>= 7.0.50~), sharutils, ed, libncurses5-dev | libncurses-dev, libxaw7-dev, libpng-dev, zlib1g-dev | libz-dev, libgd2-xpm-dev | libgd2-noxpm-dev, flex, bison, libpoppler-private-dev (>= 0.12.4), libfontconfig1-dev, dh-autoreconf, time, libgraphite-dev (>= 1:2.3.1), quilt
 Standards-Version: 3.9.3
-Homepage: http://www.tug.org/texlive
+Homepage: http://www.tug.org/texlive/
 
 Package: texlive-binaries
 Architecture: any
@@ -37,14 +37,15 @@
 Depends: ${misc:Depends}, libkpathsea6 (= ${binary:Version}), ${shlibs:Depends}
 Description: TeX Live: path search library for TeX (development part)
  This package contains the static library and header files for the
- Kpathsea[rch] library.
+ Kpathsea[rch] library, which implements generic path searching,
+ configuration, and TeX-specific file searching.
 
 Package: libptexenc1
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: TeX Live: ptex encoding library
- library for encoding support in ptex
+Description: TeX Live: pTeX encoding library
+ library for encoding support in pTeX, a japanese TeX engine.
 
 Package: libptexenc-dev
 Section: libdevel
@@ -52,4 +53,5 @@
 Depends: ${misc:Depends}, libptexenc1 (= ${binary:Version}), ${shlibs:Depends}
 Description: TeX Live: ptex encoding library (development part)
  This package contains the static library and header files for the
- ptexenc library.
+ ptexenc library, a library for encoding support in pTeX, a japanese
+ TeX engine.
diff -Nru texlive-bin-2012.20120628/debian/quilt/series texlive-bin-2012.20120628/debian/quilt/series
--- texlive-bin-2012.20120628/debian/quilt/series	2012-06-28 23:43:27.000000000 +0900
+++ texlive-bin-2012.20120628/debian/quilt/series	2012-07-18 02:21:57.000000000 +0900
@@ -26,3 +26,4 @@
 xdvi-upupstream-fixes
 #upstream included# upstream-fix-ini-synctex-segfault
 #upstream included# fix-pipe-in-out-regression
+upstream-fix-ptex-scanning
diff -Nru texlive-bin-2012.20120628/debian/quilt/upstream-fix-ptex-scanning texlive-bin-2012.20120628/debian/quilt/upstream-fix-ptex-scanning
--- texlive-bin-2012.20120628/debian/quilt/upstream-fix-ptex-scanning	1970-01-01 09:00:00.000000000 +0900
+++ texlive-bin-2012.20120628/debian/quilt/upstream-fix-ptex-scanning	2012-07-18 02:52:47.000000000 +0900
@@ -0,0 +1,87 @@
+Fix scanning of characters in ptex
+patch by Hironori Kitagawa
+upstream svn 27076
+
+reported in http://oku.edu.mie-u.ac.jp/tex/mod/forum/
+QA -> Forums -> 一般フォーラム ->  Improper alphabetic constant. がでない?
+
+Test case: the following tex file:
+\newcount\foo
+\foo`\A
+\showthe\foo % 65
+\foo`\AA % !?
+\showthe\foo
+\bye
+
+when run through etex gives the correct:
+This is pdfTeX, Version 3.1415926-2.3-1.40.12 (TeX Live 2012/dev/W32TeX)
+ restricted \write18 enabled.
+entering extended mode
+(./test.tex
+> 65.
+l.3 \showthe\foo
+                 % 65
+?
+! Improper alphabetic constant.
+
+                   \AA
+l.4 \foo`\AA
+             % !?
+?
+> 48.
+l.5 \showthe\foo
+
+?
+[1] )
+Output written on test.dvi (1 page, 220 bytes).
+Transcript written on test.log.
+
+
+
+while when running through eptex it gives the wrong:
+This is e-pTeX, Version 3.1415926-p3.2-110825-2.3 (sjis) (TeX Live
+2012/dev/W32TeX)
+ restricted \write18 enabled.
+entering extended mode
+(./test.tex
+> 65.
+l.3 \showthe\foo
+                 % 65
+?
+> 452.
+l.5 \showthe\foo
+
+?
+ )
+No pages of output.
+Transcript written on test.log.
+
+
+--
+
+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@yahoo.co.jp>
++
++	* ptex-base.ch: fix a bug in
++	@<Scan an alphabetic character code into |cur_val|@>
++
+ 2012-05-22  Peter Breitenlohner  <peb@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.")@/
diff -Nru texlive-bin-2012.20120628/debian/texlive-binaries.lintian-overrides texlive-bin-2012.20120628/debian/texlive-binaries.lintian-overrides
--- texlive-bin-2012.20120628/debian/texlive-binaries.lintian-overrides	2012-04-10 10:15:04.000000000 +0900
+++ texlive-bin-2012.20120628/debian/texlive-binaries.lintian-overrides	2012-07-11 04:46:52.000000000 +0900
@@ -1 +1,7 @@
+# there is currently no way to get rid of t1lib. Since it has been
+# removed from sid, we need to embed it.
 texlive-binaries: embedded-library usr/bin/xdvi-xaw: t1lib
+
+# The default configuration file path that is explained in the man
+# page contains the FHS directory first, /usr/etc later. 
+texlive-binaries: FSSTND-dir-in-manual-page

Reply to: