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

Danai Sae-Han danai at alioth.debian.org
Fri Jan 6 07:59:50 UTC 2012 

Author: danai
Date: 2012-01-06 07:59:49 +0000 (Fri, 06 Jan 2012)
New Revision: 4995

Modified:
   cjk/trunk/debian/README.source
   cjk/trunk/debian/TODO.Debian
   cjk/trunk/debian/changelog
   cjk/trunk/debian/compat
   cjk/trunk/debian/control
   cjk/trunk/debian/patches/04_extend_examplefiles.diff
   cjk/trunk/debian/patches/08_add_newpage_to_examples.diff
   cjk/trunk/debian/rules
Log:
Lots of new fixes, use the last GIT upstream release.

Modified: cjk/trunk/debian/README.source
===================================================================
--- cjk/trunk/debian/README.source	2012-01-06 07:58:05 UTC (rev 4994)
+++ cjk/trunk/debian/README.source	2012-01-06 07:59:49 UTC (rev 4995)
@@ -24,21 +24,7 @@
 to get an updated upstream tarball, completely according to the conventions that
 apply on Debian.
 
+In other words, when you are in the "cjk" folder, just run:
+$ ./debian/rules get-orig-source
 
-2. Patching
------------
-
-The Debian source package of `cjk' uses dpatch as patching mechanism.
-
-In debian/patches you have a `00list' file in which you define all the dpatch
-files that need to be applied at build time.  The .dpatch files themselves are
-just diff files with a few extra header files on top, e.g. a few descriptive
-lines, author, etc.
-
-To add a patch, simply rename your diff file with a .dpatch suffix, add the
-header files on top, and add the filename to the `00list' file.
-
-Be careful that the diff line numbering is based on the original upstream
-source and possible patches from dpatch files that come earlier in the chain.
-
- -- Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>, Tue, 25 Aug 2009 23:27:38 +0200
+ -- Danai SAE-HAN (韓達耐) <danai at debian.org>, Fri,  6 Jan 2012 00:00:44 +0100

Modified: cjk/trunk/debian/TODO.Debian
===================================================================
--- cjk/trunk/debian/TODO.Debian	2012-01-06 07:58:05 UTC (rev 4994)
+++ cjk/trunk/debian/TODO.Debian	2012-01-06 07:59:49 UTC (rev 4995)
@@ -53,9 +53,6 @@
     - http://oku.edu.mie-u.ac.jp/~okumura/texwiki/
       http://www.tug.org/interviews/interview-files/haruhiko-okumura.html
 
-  * What about the Debian package "ttf-vlgothic", which is a Japanese Gothic
-    TTF from Vine Linux?
-
   * Remove /var/cache/fonts/pk/bla when purging a font package that
     depends on the use of MakeTeXPK [not necessary for the Type1 font
     packages].  More important for the HBF packages.
@@ -176,5 +173,5 @@
 
   * Fix a few things in README.Debian-msgothic.
 
-Wed, 2006-09-05 (danai.sae-han at edpnet.be):
-  * Switch from dpatch to quilt (DebSrc 3.0).
+Sun, 07 Nov 2010 00:31:10 +0100
+  * Make debian/copyright machine-readable.

Modified: cjk/trunk/debian/changelog
===================================================================
--- cjk/trunk/debian/changelog	2012-01-06 07:58:05 UTC (rev 4994)
+++ cjk/trunk/debian/changelog	2012-01-06 07:59:49 UTC (rev 4995)
@@ -1,3 +1,34 @@
+cjk (4.8.2+git20111216-1) unstable; urgency=low
+
+  * The "Stayin' alive" release.
+  * New upstream release:
+     - New macros for CJKfntef.sty;
+     - fix line breaks with furigana;
+     - update kpathsea support (remove ancient stuff);
+     - introduce `LATEX' preprocessor macro;
+     - various fixes for cefconv;
+     - make cjk-enc.el work with Emacs23+.
+  * Rebuild against latest TeXlive 2009 packages in Debian.
+  * [debian/rules]
+     - Remove bashism in get-orig-source stanza;
+     - do not use "git reset --hard" anymore, but use the GIT commit hash
+       with "git archive".  Thanks to Miroslav Suchý, Joey Hess and
+       Bernard R. Link.
+  * [debian/compat] Upgrade Debhelper compatibility from version 7 to 8.
+  * [debian/control]
+     - Depend on debhelper (>= 8);
+     - bump Standards-Version to 3.9.2; no changes;
+     - do not suggest the deprecated TTF packages for the xcjk package and
+       replace them with new font packages.  Thanks to Hideki Yamane
+       (Closes: #644768 and #652255);
+     - add "latex-fonts-thai-tlwg" to Build-Depends-Indep.  Thanks Hideki!
+  * [debian/patches/04_extend_examplefiles.diff] Rediff thai.tex.
+  * [debian/README.source] Remove the section about patching, because it
+     is rendered obsolete with Debian source "3.0 (quilt)".
+  * [debian/TODO.Debian] Update.
+
+ -- Danai SAE-HAN (韓達耐) <danai at debian.org>  Fri, 06 Jan 2012 05:36:00 +0100
+
 cjk (4.8.2+git20090105-5) unstable; urgency=low
 
   * The "Find Kimchi" release.

Modified: cjk/trunk/debian/compat
===================================================================
--- cjk/trunk/debian/compat	2012-01-06 07:58:05 UTC (rev 4994)
+++ cjk/trunk/debian/compat	2012-01-06 07:59:49 UTC (rev 4995)
@@ -1 +1 @@
-7
+8

Modified: cjk/trunk/debian/control
===================================================================
--- cjk/trunk/debian/control	2012-01-06 07:58:05 UTC (rev 4994)
+++ cjk/trunk/debian/control	2012-01-06 07:59:49 UTC (rev 4995)
@@ -1,11 +1,11 @@
 Source: cjk
-Build-Depends: debhelper (>= 7), quilt, libkpathsea-dev, texlive-extra-utils, git-core, tex-common (>= 2.04)
-Build-Depends-Indep: texlive-base-bin, perl-base (>= 5.8.0), texlive-font-utils, thailatex
+Build-Depends: debhelper (>= 8), quilt, libkpathsea-dev, texlive-extra-utils, git-core, tex-common (>= 2.04)
+Build-Depends-Indep: texlive-base-bin, perl-base (>= 5.8.0), texlive-font-utils, thailatex, latex-fonts-thai-tlwg
 Section: tex
 Priority: optional
 Maintainer: Debian TeX maintainers <debian-tex-maint at lists.debian.org>
 Uploaders: Danai SAE-HAN (韓達耐) <danai at debian.org>, Norbert Preining <preining at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/debian-tex/cjk/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-tex/cjk/trunk/
 Homepage: http://cjk.ffii.org/
@@ -32,7 +32,14 @@
 Package: latex-cjk-xcjk
 Architecture: all
 Depends: latex-cjk-common (>= ${source:Version}), texlive-xetex, tex-common (>= 2.04), ${misc:Depends}
-Suggests: ttf-dejima-mincho, ttf-kiloji, ttf-thai-tlwg, ttf-arphic-ukai, ttf-arphic-uming, ttf-baekmuk, ttf-sazanami-gothic, ttf-sazanami-mincho, ttf-unfonts-core, ttf-unfonts-extra, ttf-vlgothic, ttf-wqy-zenhei
+Suggests: fonts-dejima-mincho, fonts-kiloji, 
+          fonts-thai-tlwg, 
+          fonts-arphic-ukai, fonts-arphic-uming, 
+          fonts-baekmuk, 
+          fonts-ipafont-gothic | fonts-japanese-gothic, 
+          fonts-ipafont-mincho | fonts-japanese-mincho,
+          fonts-unfonts-core, fonts-unfonts-extra, 
+          ttf-wqy-zenhei
 Conflicts: cjk-latex (<= 4.5.1)
 Description: XeTeX module of LaTeX CJK
  CJK is a macro package for LaTeX.  This package gives you the possibility

Modified: cjk/trunk/debian/patches/04_extend_examplefiles.diff
===================================================================
--- cjk/trunk/debian/patches/04_extend_examplefiles.diff	2012-01-06 07:58:05 UTC (rev 4994)
+++ cjk/trunk/debian/patches/04_extend_examplefiles.diff	2012-01-06 07:59:49 UTC (rev 4995)
@@ -478,30 +478,35 @@
  
 Index: cjk-4.8.2+git20090105/examples/thai.tex
 ===================================================================
---- cjk-4.8.2+git20090105.orig/examples/thai.tex	2010-05-17 01:33:42.274854824 +0200
-+++ cjk-4.8.2+git20090105/examples/thai.tex	2010-05-17 01:37:12.000000000 +0200
-@@ -11,21 +11,34 @@
+--- cjk-4.8.2+git20111216.orig/examples/thai.tex	2011-12-03 15:10:23.000000000 +0100
++++ cjk-4.8.2+git20111216/examples/thai.tex	2012-01-06 00:15:17.029691808 +0100
+@@ -11,7 +11,8 @@
  %   . font switching between Thai and non-Thai
  %   . intercharacter glue
  %
 -% Please read cjk-enc.txt for usage instructions.
--
 +% Please read cjk-enc.txt for usage instructions, or have a look at
-+% muletest.tex or CJKbabel.tex.
++% muletest.tex or CJKbabel.tex instead.
+ %
+ % To process without cjk-enc.el, comment out the line containing
+ % `\extrasthaicjk'.  Note, however, that you get overlong lines, and you
+@@ -20,18 +21,33 @@
  
  \documentclass[12pt]{article}
-+\usepackage[USenglish,thaicjk]{babel} % Last entry is the default.
  
 -\usepackage[thaicjk]{babel}
--
-+\usepackage{CJK}
++\usepackage[USenglish,thaicjk]{babel} % Last entry is the default.
  
+ % \addto\extrasthaicjk{\fontencoding{C90}\selectfont}
+ 
+ 
  \begin{document}
  
 +%Currently using:
 +%\font\thai = ftnr8z
 +
 +\section{Norasi}
++
 +ÃÒ¡Òà FAQ ¹ÕéÊÃéÒ§¢Öé¹à¾×èÍÊÃØ»¤Ó¶ÒÁ·Õè¶ÒÁ¡Ñ¹ºèͤÃÑé§áÅФӵͺ¤Ó¶ÒÁã¹ÃٻẺ·ÕÊдǡ.
 +â¤Ã§ÊÃéÒ§¢Í§ÃÒ¡Òà FAQ ¹Õéà»ÅÕè¹ä»ÁÒ¡µÑé§áµèÃØè¹·ÕèáÅéÇ.
 +\textbf{´ÙÃÒÂÅÐàÍÕ´ÊÓËÃѺâ¤Ã§ÊÃéÒ§ãËÁèä´é¨Ò¡ªèǧ ``â¤Ã§ÊÃéÒ§áÅÐÇÔ¸Õ¡ÒÃÍèÒ¹
@@ -510,6 +515,7 @@
 +
 +\section{Garuda}
 +\tt
++
  ÃÒ¡Òà FAQ ¹ÕéÊÃéÒ§¢Öé¹à¾×èÍÊÃØ»¤Ó¶ÒÁ·Õè¶ÒÁ¡Ñ¹ºèͤÃÑé§áÅФӵͺ¤Ó¶ÒÁã¹ÃٻẺ·ÕÊдǡ.
  â¤Ã§ÊÃéÒ§¢Í§ÃÒ¡Òà FAQ ¹Õéà»ÅÕè¹ä»ÁÒ¡µÑé§áµèÃØè¹·ÕèáÅéÇ.
  \textbf{´ÙÃÒÂÅÐàÍÕ´ÊÓËÃѺâ¤Ã§ÊÃéÒ§ãËÁèä´é¨Ò¡ªèǧ ``â¤Ã§ÊÃéÒ§áÅÐÇÔ¸Õ¡ÒÃÍèÒ¹

Modified: cjk/trunk/debian/patches/08_add_newpage_to_examples.diff
===================================================================
--- cjk/trunk/debian/patches/08_add_newpage_to_examples.diff	2012-01-06 07:58:05 UTC (rev 4994)
+++ cjk/trunk/debian/patches/08_add_newpage_to_examples.diff	2012-01-06 07:59:49 UTC (rev 4995)
@@ -56,12 +56,12 @@
  \end{document}
 Index: cjk-4.8.2+git20090105/examples/CJKfntef.tex
 ===================================================================
---- cjk-4.8.2+git20090105.orig/examples/CJKfntef.tex	2010-05-17 01:03:13.919356386 +0200
-+++ cjk-4.8.2+git20090105/examples/CJKfntef.tex	2010-05-17 01:03:16.000000000 +0200
-@@ -50,6 +50,11 @@
+--- cjk-4.8.2+git20090105.orig/examples/CJKfntef.tex	2009-11-07 21:12:42.000000000 +0100
++++ cjk-4.8.2+git20090105/examples/CJKfntef.tex	2010-11-08 02:32:21.443104014 +0100
+@@ -79,6 +79,11 @@
+ \verb|\CJKunderanysymbol{...}{...}{...}|:\\
+ \CJKunderanysymbol{0.5em}{-}{ºº×ּӵ㣬 ¿Éͬʱ¼ÓÏ»®Ïß¼ÓÏ»®£¬Ïß, ×Ô¶¯»»ÐÐ,}
  
- \CJKxout*{ºº×ּӵ㣬 \CJKunderdot{¿Éͬʱ¼ÓÏ»®Ïß¼ÓÏ»®£¬Ïß, ×Ô¶¯»»ÐÐ,}}
- 
 +% We need to end the CJK environment with a \newpage; otherwise the
 +% .aux and .toc files sometimes get messed up.  See `CJK.txt' in
 +% /usr/share/doc/latex-cjk-common/ for more information, under

Modified: cjk/trunk/debian/rules
===================================================================
--- cjk/trunk/debian/rules	2012-01-06 07:58:05 UTC (rev 4994)
+++ cjk/trunk/debian/rules	2012-01-06 07:59:49 UTC (rev 4995)
@@ -27,7 +27,7 @@
 upstream_version := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 isodate := $(shell dpkg-parsechangelog | sed -ne 's/^Version.*git\(.*\)-.*/\1/p')
 unixdate := $(shell date -d $(isodate) +%s)
-# Add 24 hours to the Unix time.
+# Add 24 hours to the Unix timestamp.
 unixdate := $(shell expr $(unixdate) + 86400 )
 
 # To get the Master revision number (i.e. 4.8.0), use:
@@ -62,7 +62,7 @@
 # You will need a Build-Dependency on the `sharutils' package in debian/control.
 #	cd debian && uudecode thaifonts.tar.gz.uu && tar xzf thaifonts.tar.gz
 #	(cd $(build_thaifonts) && cp ../utils/thaifont/tools/c90.* ../utils/thaifont/tools/*.fontinst ../debian/thaifonts/* . && cd ../debian/thaifonts && prename 's/_//' * && prename 's/\./n\./' norasi.* garuda.*)
-	(cd $(build_thaifonts) && cp ../utils/thaifont/tools/c90.* ../utils/thaifont/tools/*.fontinst /usr/share/texmf/fonts/afm/public/thai/garuda*.afm /usr/share/texmf/fonts/afm/public/thai/norasi*.afm .)
+	(cd $(build_thaifonts) && cp ../utils/thaifont/tools/c90.* ../utils/thaifont/tools/*.fontinst /usr/share/texmf/fonts/afm/public/tlwg/garuda*.afm /usr/share/texmf/fonts/afm/public/tlwg/norasi*.afm .)
 
 	(cd $(build_thaifonts) && tex norasi-c90.fontinst && tex garuda-c90.fontinst && for i in f*.pl; do pltotf $$i; done)
 
@@ -179,14 +179,15 @@
 	rm -rf cjk-$(upstream_version)
 	rm -f ../cjk_$(upstream_version).orig.tar.gz
 
-	# Download the latest GIT version and downgrade it to $(isodate).
+	# Download the latest GIT version and downgrade it to $(unixdate).
 	git clone git://git.sv.gnu.org/cjk.git cjk-$(upstream_version)
-	cd cjk-$(upstream_version) && git reset --hard $(shell cd cjk-$(upstream_version) && git rev-list --all -n 1 --before=1231196400 2>&1)
 
+#	cd cjk-$(upstream_version) && git reset --hard `git rev-list --all -n 1 --before=$(unixdate)`
+
 	# Make a pristine package.
 # --no-name/-n is important because it won't save the timestamp in the
 # 5th to 8th byte of the gzip.
-	cd cjk-$(upstream_version) && git archive --format=tar --prefix=cjk-$(upstream_version)/ master | gzip -9 --no-name > ../../tarballs/cjk_$(upstream_version).orig.tar.gz
+	cd cjk-$(upstream_version) && git archive --format=tar --prefix=cjk-$(upstream_version)/ $$(git rev-list --all -n 1 --before=$(unixdate)) | gzip -9 --no-name -c > ../../tarballs/cjk_$(upstream_version).orig.tar.gz
 
 	# Clean again, because we use svn-buildpackage afterwards.
 	rm -rf cjk-$(upstream_version)

More information about the Debian-tex-commits mailing list