[Debian-tex-commits] SVN CJK commit + diffs: r5658 - in cjk/trunk/debian: . patches

Sat Jan 12 17:29:29 UTC 2013

Author: danai
Date: 2013-01-12 17:29:28 +0000 (Sat, 12 Jan 2013)
New Revision: 5658

Modified:
   cjk/trunk/debian/README.Debian
   cjk/trunk/debian/changelog
   cjk/trunk/debian/control
   cjk/trunk/debian/patches/04_extend_examplefiles.diff
   cjk/trunk/debian/patches/08_add_newpage_to_examples.diff
Log:
Upgrade to latest GIT version upstream, and do not build the latex-cjk-xcjk package anymore because it is rendered obsolete upstream.


Modified: cjk/trunk/debian/README.Debian
===================================================================

--- cjk/trunk/debian/README.Debian	2013-01-09 23:04:28 UTC (rev 5657)
+++ cjk/trunk/debian/README.Debian	2013-01-12 17:29:28 UTC (rev 5658)
@@ -1,3 +1,18 @@
+4.8.3 CHANGES
+-------------
+
+xCJK
+
+The package `xCJK' is now obsolete.  Upstream suggests to use the
+package `xeCJK' instead, which is currently part of the Debian package
+`texlive-xetex'.
+
+As such, the Debian package "latex-cjk-xcjk" is not built anymore, and from
+now on all LaTeX CJK Debian packages will conflict with said package.
+
+ -- Danai SAE-HAN (韓達耐) <danai at debian.org>, Sun, 13 Jan 2013 01:09:51 +0800
+
+
 4.6.0 CHANGES
 -------------
 

Modified: cjk/trunk/debian/changelog
===================================================================
--- cjk/trunk/debian/changelog	2013-01-09 23:04:28 UTC (rev 5657)
+++ cjk/trunk/debian/changelog	2013-01-12 17:29:28 UTC (rev 5658)
@@ -1,22 +1,24 @@
-cjk (4.8.3+git20120621-1) unstable; urgency=low
+cjk (4.8.3+git20120914-1) UNRELEASED; urgency=low
 
   * The "Thank you" release.
   * Acknowledge work by Norbert to make CJK automagically work with TL2012.
   * New upstream release:
-     - Improve captions for Chinese (T/S) and Japanese;
-     - fix imcompatibilities with 'ulem.sty';
-     - remove xCJK files, as it is superseded by the xeCJK packages;
-     - accept Thai input in utf-8 encoding;
-     - update compatibility of the Thai font-tlwg fonts to 0.5;
-     - make some commands robust.
-  * [debian/latex-cjk-thai.install] Add new thai_utf.tex example file.
-  * [debian/latex-cjk-xcjk.install, debian/xCJK-extended*] Remove all xCJK
-     references because it they are also removed upstream.  Please use the
-     xeCJK package instead.
-  * [debian/rules, debian/control] Remove latex-cjk-xcjk.
-  * [debian/patches/*] Refresh against upstream.
+     - Make cjk-enc.el work with Emacs23;
+     - improve captions for Chinese (T/S) and Japanese;
+     - fix imcompatibility with ulem.sty;
+     - remove xCJK; use the xeCJK package instead;
+     - accept Thai input in UTF-8 with cjk-enc.el and add a thai_utf8.tex example file;
+     - add support for Thai font tlwg v0.5;
+     - make some commands robust (\CJKtilde, \standardtilde, \CJKspace, \CJKnospace);
+     - add Greek to the CJKutf8.tex example because the recent lgrx package delivers
+       good Babel UTF-8 support for LGR encoding (however, cut-and-paste support remains
+       a problem; see the upstream debian/changelog.gz file for more information).
+  * Rebuild against TexLive 2012.
+  * [debian/*] Do not build the xcjk package anymore as it is made obsolete upstream.
+     Instead use the Debian package "texlive-xetex" which includes the LaTeX package
+     "xeCJK".
 
- -- Danai SAE-HAN (韓達耐) <danai at debian.org>  Tue, 25 Jun 2012 08:02:27 +0800
+ -- Danai SAE-HAN (韓達耐) <danai at debian.org>  Sat, 12 Jan 2013 00:18:49 +0800
 
 cjk (4.8.2+git20111216-2) unstable; urgency=low
 

Modified: cjk/trunk/debian/control
===================================================================
--- cjk/trunk/debian/control	2013-01-09 23:04:28 UTC (rev 5657)
+++ cjk/trunk/debian/control	2013-01-12 17:29:28 UTC (rev 5658)
@@ -13,7 +13,7 @@
 Package: latex-cjk-common
 Architecture: any
 Depends: texlive-latex-base, texlive-font-utils (>= 2007.dfsg.2-1), tex-common (>= 3), ${misc:Depends}, ${shlibs:Depends}
-Conflicts: cjk-latex (<= 4.5.1), latex-cjk
+Conflicts: cjk-latex (<= 4.5.1), latex-cjk, latex-cjk-xcjk
 Replaces: cjk-latex
 Provides: cjk-latex
 Description: LaTeX macro package for CJK (Chinese/Japanese/Korean)

Modified: cjk/trunk/debian/patches/04_extend_examplefiles.diff
===================================================================
--- cjk/trunk/debian/patches/04_extend_examplefiles.diff	2013-01-09 23:04:28 UTC (rev 5657)
+++ cjk/trunk/debian/patches/04_extend_examplefiles.diff	2013-01-12 17:29:28 UTC (rev 5658)
@@ -157,13 +157,8 @@
 ===================================================================
 --- cjk-4.8.3+git20090105.orig/examples/CJKutf8.tex	2010-05-17 01:33:42.202855639 +0200
 +++ cjk-4.8.3+git20090105/examples/CJKutf8.tex	2010-05-17 01:37:12.000000000 +0200
-@@ -4,18 +4,36 @@
- % written by Werner Lemberg <wl at gnu.org>
+@@ -9,11 +9,19 @@
  %
- % Version 4.8.3 (07-May-2012)
--
--% Vietnamese support for Babel comes with the VnTeX package.
- %
  % Read CJKutf8.txt for more details.
  
 +% To get all the languages working on Debian, make sure you read the
@@ -176,12 +171,17 @@
 +
  \documentclass[12pt]{article}
  
+ \usepackage{cmap}
+ 
 -\usepackage[10pt]{type1ec}          % use only 10pt fonts
-+%\usepackage[10pt]{type1ec}          % use only 10pt fonts
++#\usepackage[10pt]{type1ec}          % use only 10pt fonts
  \usepackage[T1]{fontenc}
  
  \usepackage{CJKutf8}
- \usepackage[german, russian, vietnam, USenglish]{babel}
+@@ -23,6 +31,19 @@
+             greek,                  % LGR font encoding
+             USenglish]{babel}
+ 
 +% You need texlive-lang-cyrillic for "russian",
 +% texlive-lang-vietnamese for "vietnam", and texlive-lang-german for
 +% "german".   If you don't have these packages, then adjust the above
@@ -194,10 +194,11 @@
 +% hesitate and e-mail to <danai.sae-han at edpnet.be>.
 +% If you don't mind not using UTF-8, then check out CJKbabel.tex to
 +% get Korean text in harmony with other scripts.
++
+ \usepackage{textalpha}              % improved LGR support
  
  \usepackage[overlap, CJK]{ruby}
- \usepackage{CJKulem}
-@@ -45,12 +63,12 @@
+@@ -53,12 +74,12 @@
  
  \begin{CJK}{UTF8}{}
  
@@ -226,7 +227,7 @@
 +%
 +% written by Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
 +%
-+ % Version 4.8.3 (07-May-2012)
++% Version 4.8.3 (07-May-2012)
 +
 +\documentclass[12pt]{article}
 +

Modified: cjk/trunk/debian/patches/08_add_newpage_to_examples.diff
===================================================================
--- cjk/trunk/debian/patches/08_add_newpage_to_examples.diff	2013-01-09 23:04:28 UTC (rev 5657)
+++ cjk/trunk/debian/patches/08_add_newpage_to_examples.diff	2013-01-12 17:29:28 UTC (rev 5658)
@@ -1,4 +1,4 @@
-## 08_add_newpage_to_examples.diff by <danai at debian.org>
+# 08_add_newpage_to_examples.diff by <danai at debian.org>
 ##
 ## Fix examples/*.tex: add \newpage in a CJK environment.  I add
 ## this because larger documents with \tableofcontents will
@@ -106,8 +106,8 @@
 ===================================================================
 --- cjk-4.8.3+git20090105.orig/examples/CJKutf8.tex	2010-05-17 01:03:16.000000000 +0200
 +++ cjk-4.8.3+git20090105/examples/CJKutf8.tex	2010-05-17 01:03:16.000000000 +0200
-@@ -123,6 +123,11 @@
-     этот FAQ и его структура' объяснены детали этой новой структуры.}
+@@ -144,6 +144,11 @@
+     διαβάσετε αυτή την ΣΤΕ και πώς είναι οργανωμένη>>.}
  \end{otherlanguage}
  
 +% We need to end the CJK environment with a \newpage; otherwise the


