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

Danai Sae-Han danai at alioth.debian.org
Sun Dec 13 02:05:00 UTC 2009 

Author: danai
Date: 2009-12-13 02:04:52 +0000 (Sun, 13 Dec 2009)
New Revision: 4446

Added:
   cjk/trunk/debian/patches/03_Makefile.diff
   cjk/trunk/debian/patches/04_extend_examplefiles.diff
   cjk/trunk/debian/patches/05_fix_examplefiles.diff
   cjk/trunk/debian/patches/06_extend_JIS_example.diff
   cjk/trunk/debian/patches/08_add_newpage_to_examples.diff
   cjk/trunk/debian/patches/series
Removed:
   cjk/trunk/debian/patches/00list
   cjk/trunk/debian/patches/02_thai_fontmaps.dpatch
   cjk/trunk/debian/patches/03_Makefile.dpatch
   cjk/trunk/debian/patches/04_extend_examplefiles.dpatch
   cjk/trunk/debian/patches/05_fix_examplefiles.dpatch
   cjk/trunk/debian/patches/06_extend_JIS_example.dpatch
   cjk/trunk/debian/patches/07_remove_unnecessary_C_libs.dpatch
   cjk/trunk/debian/patches/08_add_newpage_to_examples.dpatch
Modified:
   cjk/trunk/debian/control
   cjk/trunk/debian/rules
Log:
Switch from dpatch to quilt to comply with the Debian Source v3.0 standard.
Multi-byte encodings other than UTF-8 must now be cat'ed 1-on-1 to the diff
file, so no more iconv trickery like we used to have with dpatch.


Modified: cjk/trunk/debian/control
===================================================================
--- cjk/trunk/debian/control	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/control	2009-12-13 02:04:52 UTC (rev 4446)
@@ -1,5 +1,5 @@
 Source: cjk
-Build-Depends: debhelper (>= 7), dpatch (>= 2.0.14), libkpathsea-dev, texlive-extra-utils, git-core, tex-common (>= 1.20)
+Build-Depends: debhelper (>= 7), quilt, libkpathsea-dev, texlive-extra-utils, git-core, tex-common (>= 1.20)
 Build-Depends-Indep: texlive-base-bin, perl-base (>= 5.8.0), texlive-font-utils, sharutils, thailatex
 Section: tex
 Priority: optional

Deleted: cjk/trunk/debian/patches/00list
===================================================================
--- cjk/trunk/debian/patches/00list	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/patches/00list	2009-12-13 02:04:52 UTC (rev 4446)
@@ -1,7 +0,0 @@
-#02_thai_fontmaps.dpatch
-03_Makefile.dpatch
-04_extend_examplefiles.dpatch
-05_fix_examplefiles.dpatch
-06_extend_JIS_example.dpatch
-#07_remove_unnecessary_C_libs.dpatch
-08_add_newpage_to_examples.dpatch

Deleted: cjk/trunk/debian/patches/02_thai_fontmaps.dpatch
===================================================================
--- cjk/trunk/debian/patches/02_thai_fontmaps.dpatch	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/patches/02_thai_fontmaps.dpatch	2009-12-13 02:04:52 UTC (rev 4446)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_thai_fontmaps.dpatch by  <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use the same .pfb fonts as those from the thailatex package.
-
- at DPATCH@
-
-diff -Nbaurw cjk_4.6.0.orig/utils/thaifont/texmf/fonts/map/dvips/garuda/garuda.map cjk-4.6.0/utils/thaifont/texmf/fonts/map/dvips/garuda/garuda.map
---- cjk_4.6.0.orig/utils/thaifont/texmf/fonts/map/dvips/garuda/garuda.map	2005-11-06 23:01:30.000000000 +0100
-+++ cjk-4.6.0/utils/thaifont/texmf/fonts/map/dvips/garuda/garuda.map	2005-11-26 01:59:07.000000000 +0100
-@@ -1,4 +1,4 @@
--fgdr8z Garuda " C90Encoding ReEncodeFont " <c90.enc <garudan.pfb
--fgdb8z Garuda-Bold " C90Encoding ReEncodeFont " <c90.enc <garudab.pfb
--fgdo8z Garuda-Oblique " C90Encoding ReEncodeFont " <c90.enc <garudao.pfb
--fgdbo8z Garuda-BoldOblique " C90Encoding ReEncodeFont " <c90.enc <garudabo.pfb
-+fgdr8z Garuda " C90Encoding ReEncodeFont " <c90.enc <garuda.pfb
-+fgdb8z Garuda-Bold " C90Encoding ReEncodeFont " <c90.enc <garuda_b.pfb
-+fgdo8z Garuda-Oblique " C90Encoding ReEncodeFont " <c90.enc <garuda_o.pfb
-+fgdbo8z Garuda-BoldOblique " C90Encoding ReEncodeFont " <c90.enc <garuda_bo.pfb
-diff -Nbaurw cjk_4.6.0.orig/utils/thaifont/texmf/fonts/map/dvips/norasi/norasi.map cjk-4.6.0/utils/thaifont/texmf/fonts/map/dvips/norasi/norasi.map
---- cjk_4.6.0.orig/utils/thaifont/texmf/fonts/map/dvips/norasi/norasi.map	2005-11-06 23:01:30.000000000 +0100
-+++ cjk-4.6.0/utils/thaifont/texmf/fonts/map/dvips/norasi/norasi.map	2005-11-26 01:58:50.000000000 +0100
-@@ -1,4 +1,4 @@
--ftnr8z Norasi " C90Encoding ReEncodeFont " <c90.enc <norasin.pfb
--ftnb8z Norasi-Bold " C90Encoding ReEncodeFont " <c90.enc <norasib.pfb
--ftni8z Norasi-Italic " C90Encoding ReEncodeFont " <c90.enc <norasii.pfb
--ftnbi8z Norasi-BoldItalic " C90Encoding ReEncodeFont " <c90.enc <norasibi.pfb
-+ftnr8z Norasi " C90Encoding ReEncodeFont " <c90.enc <norasi.pfb
-+ftnb8z Norasi-Bold " C90Encoding ReEncodeFont " <c90.enc <norasi_b.pfb
-+ftni8z Norasi-Italic " C90Encoding ReEncodeFont " <c90.enc <norasi_i.pfb
-+ftnbi8z Norasi-BoldItalic " C90Encoding ReEncodeFont " <c90.enc <norasi_bi.pfb

Added: cjk/trunk/debian/patches/03_Makefile.diff
===================================================================
--- cjk/trunk/debian/patches/03_Makefile.diff	                        (rev 0)
+++ cjk/trunk/debian/patches/03_Makefile.diff	2009-12-13 02:04:52 UTC (rev 4446)
@@ -0,0 +1,60 @@
+## 03_Makefile.diff by <danai at debian.org>
+##
+## Modify the upstream Makefile so it builds on Debian.
+
+--- cjk-20060912/Makefile	2006-09-13 09:38:58.440284066 +0200
++++ cjk-4.6.0+cvs20060912/Makefile	2006-09-13 09:42:31.981880560 +0200
+@@ -33,6 +33,53 @@
+ # o The TeXLive version of some font definition files are used (in the
+ #   `texlive' subdirectory).
+ 
++
++###
++# Makefile for CJK LaTeX (Debian package)
++# written by Anthony Fok <foka at debian.org>
++# Complaints should be sent to Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
++
++CFLAGS = -O2 -g -Wall
++TEXMF = $(prefix)/share/texmf
++
++cjkutils = utils/Bg5conv/bg5conv \
++       utils/extconv/extconv \
++       utils/SJISconv/sjisconv \
++       utils/CEFconv/cefconv \
++       utils/CEFconv/cef5conv \
++       utils/CEFconv/cefsconv
++
++# allutils = $(cjkutils) utils/thaiconv/thaiconv utils/hbf2gf/hbf2gf
++allutils = $(cjkutils) utils/hbf2gf/hbf2gf
++
++all: $(allutils)
++
++.PHONY: all install clean distclean
++
++utils/hbf2gf/hbf2gf:
++	( cd utils/hbf2gf; \
++         ./configure --prefix=/usr \
++               --with-kpathsea-lib=/usr/lib \
++               --with-kpathsea-include=/usr/include \
++               --mandir='$${prefix}/share/man'; \
++	$(MAKE) )
++
++install: all
++	install -d $(prefix)/bin $(TEXMF)/hbf2gf
++
++	cp -a $(cjkutils) $(prefix)/bin
++	install -m 0755 utils/*conv/*latex $(prefix)/bin
++
++	$(MAKE) -C utils/hbf2gf install
++	cp -a utils/hbf2gf/cfg/* $(TEXMF)/hbf2gf
++
++clean:
++	rm -f $(allutils)
++	if [[ -e utils/hbf2gf/Makefile ]]; then $(MAKE) -C utils/hbf2gf distclean; fi
++
++distclean: clean
++###
++
+ version=4.8.2
+ 
+ distdir=cjk-$(version)


Property changes on: cjk/trunk/debian/patches/03_Makefile.diff
___________________________________________________________________
Added: svn:executable
   + *

Deleted: cjk/trunk/debian/patches/03_Makefile.dpatch
===================================================================
--- cjk/trunk/debian/patches/03_Makefile.dpatch	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/patches/03_Makefile.dpatch	2009-12-13 02:04:52 UTC (rev 4446)
@@ -1,64 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_Makefile.dpatch by  <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Modify the upstream Makefile so it builds on Debian.
-
- at DPATCH@
-
---- cjk-20060912/Makefile	2006-09-13 09:38:58.440284066 +0200
-+++ cjk-4.6.0+cvs20060912/Makefile	2006-09-13 09:42:31.981880560 +0200
-@@ -33,6 +33,53 @@
- # o The TeXLive version of some font definition files are used (in the
- #   `texlive' subdirectory).
- 
-+
-+###
-+# Makefile for CJK LaTeX (Debian package)
-+# written by Anthony Fok <foka at debian.org>
-+# Complaints should be sent to Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
-+
-+CFLAGS = -O2 -g -Wall
-+TEXMF = $(prefix)/share/texmf
-+
-+cjkutils = utils/Bg5conv/bg5conv \
-+       utils/extconv/extconv \
-+       utils/SJISconv/sjisconv \
-+       utils/CEFconv/cefconv \
-+       utils/CEFconv/cef5conv \
-+       utils/CEFconv/cefsconv
-+
-+# allutils = $(cjkutils) utils/thaiconv/thaiconv utils/hbf2gf/hbf2gf
-+allutils = $(cjkutils) utils/hbf2gf/hbf2gf
-+
-+all: $(allutils)
-+
-+.PHONY: all install clean distclean
-+
-+utils/hbf2gf/hbf2gf:
-+	( cd utils/hbf2gf; \
-+         ./configure --prefix=/usr \
-+               --with-kpathsea-lib=/usr/lib \
-+               --with-kpathsea-include=/usr/include \
-+               --mandir='$${prefix}/share/man'; \
-+	$(MAKE) )
-+
-+install: all
-+	install -d $(prefix)/bin $(TEXMF)/hbf2gf
-+
-+	cp -a $(cjkutils) $(prefix)/bin
-+	install -m 0755 utils/*conv/*latex $(prefix)/bin
-+
-+	$(MAKE) -C utils/hbf2gf install
-+	cp -a utils/hbf2gf/cfg/* $(TEXMF)/hbf2gf
-+
-+clean:
-+	rm -f $(allutils)
-+	if [[ -e utils/hbf2gf/Makefile ]]; then $(MAKE) -C utils/hbf2gf distclean; fi
-+
-+distclean: clean
-+###
-+
- version=4.8.2
- 
- distdir=cjk-$(version)

Added: cjk/trunk/debian/patches/04_extend_examplefiles.diff
===================================================================
--- cjk/trunk/debian/patches/04_extend_examplefiles.diff	                        (rev 0)
+++ cjk/trunk/debian/patches/04_extend_examplefiles.diff	2009-12-13 02:04:52 UTC (rev 4446)
@@ -0,0 +1,512 @@
+## 04_extend_examplefiles.diff by <danai at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## Improve some of the example files, and put extra comments if
+## extra packages need to be installed.
+
+diff -Nbaurw cjk-4.7.0/examples/Big5.tex cjk-current/examples/Big5.tex
+--- cjk-4.7.0/examples/Big5.tex	2007-04-08 23:00:19.556336401 +0200
++++ cjk-current/examples/Big5.tex	2007-05-09 05:57:20.691664812 +0200
+@@ -8,15 +8,33 @@
+ %
+ % process this file with bg5latex
+ 
+-\documentclass[12pt]{article} 
++\documentclass[12pt]{scrartcl}
++%\documentclass[12pt]{scrreprt}
++%\documentclass[12pt]{scrbook}
+ 
+ \usepackage{CJK}
+ 
+ 
+ \begin{document}
+ 
+-\begin{CJK*}{Bg5}{bsmi}
++\begin{CJK*}{Bg5}{bkai}
+ \CJKtilde
++% Traditional Chinese captions
++\CJKcaption{Bg5}
++
++\tableofcontents
++%\newpage
++\part{``Part'' in Chinese}
++
++%\chapter{blabla}
++
++\section{Some more commands}
++\today~is the date in Chinese.
++
++\subsection{¯SÀ°¡I}
++w00t!  A subsection title in Chinese!
++
++\section{¤¤¤å}
+ 
+ \noindent ¥»±`°Ý°Ýµª¶°~(FAQ list)~¬O±q¤@¨Ç¸g±`³Q°Ý¨ìªº°ÝÃD¤Î¨ä¾A·íªº¸Ñ
+ µª¤¤¡A¥H¤è«Kªº§Î¦¡ºK­n¦Ó¥Xªº¡C¸ò¤W¤@ª©¤£¦Pªº¬O¡A¨ä½s±Æµ²ºc¤w¹ý©³§ïÅÜ¡C
+@@ -31,5 +50,5 @@
+ %%% coding: big5
+ %%% mode: latex
+ %%% TeX-master: t
+-%%% TeX-command-default: "CJKLaTeX"
++%%% TeX-command-default: "LaTeX"
+ %%% End:
+diff -Nbaurw cjk-4.7.0/examples/CEF_test.tex cjk-current/examples/CEF_test.tex
+--- cjk-4.7.0/examples/CEF_test.tex	2007-04-08 23:00:19.564336437 +0200
++++ cjk-current/examples/CEF_test.tex	2007-05-09 05:57:20.799664976 +0200
+@@ -5,6 +5,10 @@
+ %
+ % process this text with ceflatex
+ 
++% CEF doesn't work on Debian, because I haven't packaged the HBF
++% (bitmap fonts) yet.
++%   Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
++
+ \documentclass[12pt]{article}
+ 
+ \usepackage[global]{CJK}
+diff -Nbaurw cjk-4.7.0/examples/CJKbabel.tex cjk-current/examples/CJKbabel.tex
+--- cjk-4.7.0/examples/CJKbabel.tex	2007-04-08 23:00:19.576336490 +0200
++++ cjk-current/examples/CJKbabel.tex	2007-05-09 05:57:20.835665031 +0200
+@@ -5,26 +5,32 @@
+ % written by Werner Lemberg <wl at gnu.org>
+ %
+ % Version 4.8.2 (29-Dec-2008)
+-
+-% You need Emacs 20 to process this file!
++%
++% Read cjk-enc.txt for more details.
+ 
+ % You should load this file into Emacs (C-x C-f) and call
+-% `cjk-write-file' (M-x cjk-write-file).  Then run LaTeX on the file
+-% `CJKbabel.cjk'.
++% `cjk-write-file' (M-x cjk-write-file).  `cjk-write-file' has a
++% shortcut: C-c SPC C-x.  Then run LaTeX on the file `CJKbabel.cjk'.
+ %
+ % `cjk-write-file' will be available after loading cjk-enc.el into
+-% Emacs 20 with the commands load-file or load-library.
++% Emacs with the commands load-file or load-library.
++% If you didn't touch the default Debian installation, then this is
++% already taken care of.
++
++% To get all the languages working on Debian, make sure you read the
++% comments a few lines below.
+ %
+-% Vietnamese support for Babel comes with the VnTeX package.
++% Korean text works in an emule-encoded TeX file on Debian, but you'll
++% need to have "hlatex-fonts-base" installed as well.
+ %
+-% Read cjk-enc.txt for more details.
++%   Danai SAE-HAN (’´Ú’ã’ÂÑ) <danai.sae-han at edpnet.be>
+ 
+ \documentclass[12pt]{article}
+ 
+ \usepackage{inputenc}               % load it without argument
+                                     % to avoid Babel warnings
+ 
+-\usepackage[10pt]{type1ec}          % use only 10pt fonts
++%\usepackage[10pt]{type1ec}          % use only 10pt fonts
+ \usepackage[T1]{fontenc}
+ 
+ \usepackage[german,
+@@ -33,6 +39,11 @@
+             greek,                  % LGR font encoding
+             vietnam,                % T5 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
++% line accordingly, and comment out the corresponding language block
++% beneath.
+ 
+ \usepackage[overlap, CJK]{ruby}
+ \usepackage{CJKulem}
+@@ -109,9 +120,9 @@
+ \end{otherlanguage}
+ 
+ \begin{otherlanguage}{thaicjk}
+-  …Ã…Ò…Â…¡…Ò…Ã FAQ €¥¹¥Õ¥é…Ê€¥Ã¥é…Ò…§€¥¢¥Ö¥é…¹…à€¥¾¥×¥è…Í…Ê€¥Ã¥Ø…»…¤…Ó…¶…Ò…Á€¥·¥Õ¥è…¶…Ò…Á€¥¡¥Ñ…¹€¥º¥è…Í…Â…¤€¥Ã¥Ñ¥é…§…á…Å…Ð…¤…Ó…µ…Í…º…¤…Ó…¶…Ò…Á…ã…¹€¥Ã¥Ù…»…á…º…º€¥·¥Õ…Ê…Ð…´…Ç…¡.
+-  \uline{…â…¤…Ã…§…Ê€¥Ã¥é…Ò…§…¢…Í…§…Ã…Ò…Â…¡…Ò…Ã FAQ €¥¹¥Õ¥é…à…»€¥Å¥Õ¥è…Â…¹…ä…»…Á…Ò…¡€¥µ¥Ñ¥é…§…ဥµ¥è€¥Ã¥Ø¥è…¹€¥·¥Õ¥è…ဥťé…Ç.}
+-  \textbf{€¥´¥Ù…Ã…Ò…Â…Å…Ð…à€¥Í¥Õ…Â…´…Ê…Ó…Ë€¥Ã¥Ñ…º…â…¤…Ã…§…Ê€¥Ã¥é…Ò…§…ã…Ë€¥Á¥è…䀥´¥é…¨…Ò…¡€¥ª¥è…Ç…§ ``…â…¤…Ã…§…Ê€¥Ã¥é…Ò…§…á…ŅЀ¥Ç¥Ô€¥¸¥Õ…¡…҅À¥Í¥è…Ò…¹
++  …Ã…Ò…Â…¡…Ò…Ã FAQ €ò¤£…¹…Õ…é…Ê€ò¤¢…Ã…é…Ò…§€ò¤£…¢…Ö…é…¹…à€ò¤£…¾…×…è…Í…Ê€ò¤¢…Ã…Ø…»…¤…Ó…¶…Ò…Á€ò¤£…·…Õ…è…¶…Ò…Á€ò¤¢…¡…Ñ…¹€ò¤¢…º…è…Í…Â…¤€ò¤£…Ã…Ñ…é…§…á…Å…Ð…¤…Ó…µ…Í…º…¤…Ó…¶…Ò…Á…ã…¹€ò¤¢…Ã…Ù…»…á…º…º€ò¤¢…·…Õ…Ê…Ð…´…Ç…¡.
++  \uline{…â…¤…Ã…§…Ê€ò¤¢…Ã…é…Ò…§…¢…Í…§…Ã…Ò…Â…¡…Ò…Ã FAQ €ò¤£…¹…Õ…é…à…»€ò¤£…Å…Õ…è…Â…¹…ä…»…Á…Ò…¡€ò¤£…µ…Ñ…é…§…á€ò¤¢…µ…è€ò¤£…Ã…Ø…è…¹€ò¤£…·…Õ…è…á€ò¤¢…Å…é…Ç.}
++  \textbf{€ò¤¢…´…Ù…Ã…Ò…Â…Å…Ð…à€ò¤¢…Í…Õ…Â…´…Ê…Ó…Ë€ò¤¢…Ã…Ñ…º…â…¤…Ã…§…Ê€ò¤¢…Ã…é…Ò…§…ã…Ë€ò¤¢…Á…è…ä€ò¤¢…´…é…¨…Ò…¡€ò¤¢…ª…è…Ç…§ ``…â…¤…Ã…§…Ê€ò¤¢…Ã…é…Ò…§…á…ŅЀò¤¢…Ç…Ô€ò¤¢…¸…Õ…¡…҅Àò¤¢…Í…è…Ò…¹
+     FAQ.''}
+ \end{otherlanguage}
+ 
+diff -Nbaurw cjk-4.7.0/examples/CJKmixed.tex cjk-current/examples/CJKmixed.tex
+--- cjk-4.7.0/examples/CJKmixed.tex	2007-04-08 23:00:19.644336792 +0200
++++ cjk-current/examples/CJKmixed.tex	2007-05-09 05:57:20.851665056 +0200
+@@ -4,8 +4,11 @@
+ % written by Werner Lemberg <wl at gnu.org>
+ %
+ % Version 4.8.2 (29-Dec-2008)
++
++% To get Vietnamese working on Debian, make sure you have
++% "texlive-lang-vietnamese" installed.
+ %
+-% Vietnamese support for Babel comes with the VnTeX package.
++%   Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
+ 
+ \documentclass[12pt]{article}
+ 
+diff -Nbaurw cjk-4.7.0/examples/CJKutf8.tex cjk-current/examples/CJKutf8.tex
+--- cjk-4.7.0/examples/CJKutf8.tex	2007-04-08 23:00:19.648336810 +0200
++++ cjk-current/examples/CJKutf8.tex	2007-05-09 05:57:20.859665068 +0200
+@@ -4,18 +4,36 @@
+ % written by Werner Lemberg <wl at gnu.org>
+ %
+ % Version 4.8.2 (29-Dec-2008)
+-
+-% 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
++% comments a few lines below.
++%
++% Also install the "cm-super" package if you want LaTeX fonts to be
++% scaled to any size you want.  Uncomment the "type1ec" line below.
++%
++%   Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
++
+ \documentclass[12pt]{article}
+ 
+-\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}
++% 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
++% line accordingly, and comment out the corresponding language block
++% beneath.
++% 
++% With regard to Korean, I have yet to package the Unicode fonts for
++% Debian.  Don't hold your breath though.  If you want an easy
++% Makefile that creates and installs everything automatically, don't
++% 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[overlap, CJK]{ruby}
+ \usepackage{CJKulem}
+@@ -45,12 +63,12 @@
+ 
+ \begin{CJK}{UTF8}{}
+ 
+-\begin{Korean}
+-  이 FAQ 은 자주 반복되는 질문과 그에 대한 대답을 간단명료한 양식으로
+-  모아 엮어졌습니다. \uline{이 FAQ 의 구조는 지난 판에 비하여
+-    획기적으로 변경되었습니다.}  \textbf{상세한 것은 ``이 FAQ 을 어떻게
+-    읽을 것인가'' 라는 대목을 참조하시기 바랍니다.}
+-\end{Korean}
++%\begin{Korean}
++%  이 FAQ 은 자주 반복되는 질문과 그에 대한 대답을 간단명료한 양식으로
++%  모아 엮어졌습니다. \uline{이 FAQ 의 구조는 지난 판에 비하여
++%    획기적으로 변경되었습니다.}  \textbf{상세한 것은 ``이 FAQ 을 어떻게
++%    읽을 것인가'' 라는 대목을 참조하시기 바랍니다.}
++%\end{Korean}
+ 
+ \begin{otherlanguage}{german}
+   Dieses FAQ wurde erstellt, um häufig gestellte Fragen und ihre
+diff -Nbaurw cjk-4.7.0/examples/KS-hlatex.tex cjk-current/examples/KS-hlatex.tex
+--- cjk-4.7.0/examples/KS-hlatex.tex	1970-01-01 01:00:00.000000000 +0100
++++ cjk-current/examples/KS-hlatex.tex	2007-05-09 05:57:20.971665238 +0200
+@@ -0,0 +1,187 @@
++% This is a testfile of the CJK Debian package to test Korean.
++% Please install hlatex-fonts-base (perhaps -extra as well).
++%
++% written by Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
++%
++ % Version 4.8.2 (29-Dec-2008)
++
++\documentclass[12pt]{article}
++
++\usepackage{CJK}
++\usepackage{pshan}
++
++
++\begin{document}
++
++\begin{CJK}[HL]{KS}{}
++
++\newcommand{\testpar}{\noindent ÀÌ FAQ Àº ÀÚÁÖ ¹Ýº¹µÇ´Â Áú¹®°ú ±×¿¡
++  ´ëÇÑ ´ë´äÀ» °£´Ü¸í·áÇѾç½ÄÀ¸·Î ¸ð¾Æ ¿«¾îÁ³½À´Ï´Ù. ÀÌ FAQ ÀÇ ±¸Á¶´Â
++  Áö³­ ÆÇ¿¡ ºñÇÏ¿©È¹±âÀûÀ¸·Î º¯°æµÇ¾ú½À´Ï´Ù.  \textbf{»ó¼¼ÇÑ °ÍÀº ``ÀÌ
++    FAQ À» ¾î¶»°ÔÀÐÀ» °ÍÀΰ¡'' ¶ó´Â ´ë¸ñÀ» ÂüÁ¶ÇϽñ⠹ٶø´Ï´Ù.}}
++
++\section{Myoungjo (default)}
++%\CJKfamily{}
++\mj
++\rm
++\testpar
++
++\sl
++\testpar
++
++
++\section{Bom}
++%\CJKfamily{}
++\bm
++\rm
++\testpar
++
++\sl
++\testpar
++
++
++\section{Dinaru}
++%\CJKfamily{}
++\dn
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Graphic}
++%\CJKfamily{}
++\gr
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Gothic}
++%\CJKfamily{}
++\gt
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Jamo Gothic}
++%\CJKfamily{}
++\jgt
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Jamo Myoungjo}
++%\CJKfamily{}
++\jmj
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Jamo Novel}
++%\CJKfamily{}
++\jnv
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Jamo Sora}
++%\CJKfamily{}
++\jsr
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Pilgi}
++%\CJKfamily{}
++\pg
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Pilgia}
++%\CJKfamily{}
++\pga
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Pen Heulim}
++%\CJKfamily{}
++\ph
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Pen}
++%\CJKfamily{}
++\pn
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Shinmun Myoungjo}
++%\CJKfamily{}
++\sh
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Typewriter (Taza)}
++%\CJKfamily{}
++\tz
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Vada}
++%\CJKfamily{}
++\vd
++\rm
++\testpar
++
++\sl
++\testpar
++
++\section{Yetgul}
++%\CJKfamily{}
++\yt
++\rm
++\testpar
++
++\sl
++\testpar
++
++
++\end{CJK}
++
++\end{document}
++
++%%% Local Variables:
++%%% coding: euc-korea
++%%% mode: latex
++%%% TeX-master: t
++%%% End:
+diff -Nbaurw cjk-4.7.0/examples/muletest.tex cjk-current/examples/muletest.tex
+--- cjk-4.7.0/examples/muletest.tex	2007-04-08 23:00:19.664336881 +0200
++++ cjk-current/examples/muletest.tex	2007-05-09 05:57:21.015665305 +0200
+@@ -4,26 +4,31 @@
+ % written by Werner Lemberg <wl at gnu.org>
+ %
+ % Version 4.8.2 (29-Dec-2008)
+-
+-% You need Emacs 20 (or Mule 2.3) to process this file!
++%
++% Read cjk-enc.txt for more details.
+ 
+ % You should load this file into Mule with `*internal*' encoding scheme
+ % (C-u C-x C-f) and call `cjk-write-file' (M-x cjk-write-file).
++% `cjk-write-file' has a shortcut: C-c SPC C-x.
+ % Then run LaTeX on the file `muletest.cjk'.
+ %
+ % Under Emacs 20 type `C-x C-f muletest.tex' to load this file.
+ %
+ % `cjk-write-file' will be available after loading cjk-enc.el into Mule
+ % (Emacs 20) with the commands load-file or load-library.
++% If you didn't touch the default Debian installation, then this is
++% already taken care of.
+ %
+-% If you don't have german.sty, comment out the `\usepackage{german}'
+-% line.
++% To get all the languages working on Debian, make sure you read the
++% comments a few lines below.
+ %
+-% The T5 encoding is part of the VnTeX package (available at CTAN) which
+-% contains Vietnamese fonts and other support files for both TeX and
+-% LaTeX.
++% Korean text works in an emule-encoded TeX file on Debian, but you'll
++% need to have "hlatex-fonts-base" installed as well.
+ %
+-% Read cjk-enc.txt for more details.
++% Also install the "cm-super" package if you want LaTeX fonts to be
++% scaled to any size you want.  Uncomment the "type1ec" line below.
++%
++%   Danai SAE-HAN (’´Ú’ã’ÂÑ) <danai.sae-han at edpnet.be>
+ 
+ \documentclass[12pt]{article}
+ 
+diff -Nbaurw cjk-4.7.0/examples/rubytest.tex cjk-current/examples/rubytest.tex
+--- cjk-4.7.0/examples/rubytest.tex	2007-04-08 23:00:19.664336881 +0200
++++ cjk-current/examples/rubytest.tex	2007-05-09 05:57:21.071665391 +0200
+@@ -5,16 +5,15 @@
+ %
+ % Version 4.8.2 (29-Dec-2008)
+ 
+-% You need Emacs 20 (or Mule 2.3) to process this file!
+-
+ % You should load this file into Mule with `*internal*' encoding scheme
+ % (C-u C-x C-f) and call `cjk-write-file' (M-x cjk-write-file).
++% `cjk-write-file' has a shortcut: C-c SPC C-x.
+ % Then run LaTeX on the created file `rubytest.cjk'.
+ %
+-% Under Emacs 20 type `C-x C-f rubytest.tex' to load this file.
+-%
+ % `cjk-write-file' will be available after loading cjk-enc.el into Mule
+ % (Emacs 20) with the commands load-file or load-library.
++% If you didn't touch the default Debian installation, then this is
++% already taken care of.
+ 
+ \documentclass[12pt]{article}
+ 
+diff -Nbaurw cjk-4.7.0/examples/thai.tex cjk-current/examples/thai.tex
+--- cjk-4.7.0/examples/thai.tex	2007-04-08 23:00:19.668336899 +0200
++++ cjk-current/examples/thai.tex	2007-05-09 05:57:21.091665421 +0200
+@@ -11,21 +11,34 @@
+ %   . 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.
+ 
+ \documentclass[12pt]{article}
++\usepackage[USenglish,thaicjk]{babel} % Last entry is the default.
+ 
+-\usepackage[thaicjk]{babel}
+-
++\usepackage{CJK}
+ 
+ \begin{document}
+ 
++%Currently using:
++%\font\thai = ftnr8z
++
++\section{Norasi}
++ÃÒ¡Òà FAQ ¹ÕéÊÃéÒ§¢Öé¹à¾×èÍÊÃØ»¤Ó¶ÒÁ·Õè¶ÒÁ¡Ñ¹ºèͤÃÑé§áÅФӵͺ¤Ó¶ÒÁã¹ÃٻẺ·ÕÊдǡ.
++â¤Ã§ÊÃéÒ§¢Í§ÃÒ¡Òà FAQ ¹Õéà»ÅÕè¹ä»ÁÒ¡µÑé§áµèÃØè¹·ÕèáÅéÇ.
++\textbf{´ÙÃÒÂÅÐàÍÕ´ÊÓËÃѺâ¤Ã§ÊÃéÒ§ãËÁèä´é¨Ò¡ªèǧ ``â¤Ã§ÊÃéÒ§áÅÐÇÔ¸Õ¡ÒÃÍèÒ¹
++  FAQ.''}
++
++
++\section{Garuda}
++\tt
+ ÃÒ¡Òà FAQ ¹ÕéÊÃéÒ§¢Öé¹à¾×èÍÊÃØ»¤Ó¶ÒÁ·Õè¶ÒÁ¡Ñ¹ºèͤÃÑé§áÅФӵͺ¤Ó¶ÒÁã¹ÃٻẺ·ÕÊдǡ.
+ â¤Ã§ÊÃéÒ§¢Í§ÃÒ¡Òà FAQ ¹Õéà»ÅÕè¹ä»ÁÒ¡µÑé§áµèÃØè¹·ÕèáÅéÇ.
+ \textbf{´ÙÃÒÂÅÐàÍÕ´ÊÓËÃѺâ¤Ã§ÊÃéÒ§ãËÁèä´é¨Ò¡ªèǧ ``â¤Ã§ÊÃéÒ§áÅÐÇÔ¸Õ¡ÒÃÍèÒ¹
+   FAQ.''}
+ 
++
+ \end{document}
+ 
+ 


Property changes on: cjk/trunk/debian/patches/04_extend_examplefiles.diff
___________________________________________________________________
Added: svn:executable
   + *

Deleted: cjk/trunk/debian/patches/04_extend_examplefiles.dpatch
===================================================================
--- cjk/trunk/debian/patches/04_extend_examplefiles.dpatch	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/patches/04_extend_examplefiles.dpatch	2009-12-13 02:04:52 UTC (rev 4446)
@@ -1,515 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_extend_examplefiles.dpatch by  <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Improve some of the example files, and put extra comments if
-## DP: extra packages need to be installed.
-
- at DPATCH@
-
-diff -Nbaurw cjk-4.7.0/examples/Big5.tex cjk-current/examples/Big5.tex
---- cjk-4.7.0/examples/Big5.tex	2007-04-08 23:00:19.556336401 +0200
-+++ cjk-current/examples/Big5.tex	2007-05-09 05:57:20.691664812 +0200
-@@ -8,15 +8,33 @@
- %
- % process this file with bg5latex
- 
--\documentclass[12pt]{article} 
-+\documentclass[12pt]{scrartcl}
-+%\documentclass[12pt]{scrreprt}
-+%\documentclass[12pt]{scrbook}
- 
- \usepackage{CJK}
- 
- 
- \begin{document}
- 
--\begin{CJK*}{Bg5}{bsmi}
-+\begin{CJK*}{Bg5}{bkai}
- \CJKtilde
-+% Traditional Chinese captions
-+\CJKcaption{Bg5}
-+
-+\tableofcontents
-+%\newpage
-+\part{``Part'' in Chinese}
-+
-+%\chapter{blabla}
-+
-+\section{Some more commands}
-+\today~is the date in Chinese.
-+
-+\subsection{¯SÀ°¡I}
-+w00t!  A subsection title in Chinese!
-+
-+\section{¤¤¤å}
- 
- \noindent ¥»±`°Ý°Ýµª¶°~(FAQ list)~¬O±q¤@¨Ç¸g±`³Q°Ý¨ìªº°ÝÃD¤Î¨ä¾A·íªº¸Ñ
- µª¤¤¡A¥H¤è«Kªº§Î¦¡ºK­n¦Ó¥Xªº¡C¸ò¤W¤@ª©¤£¦Pªº¬O¡A¨ä½s±Æµ²ºc¤w¹ý©³§ïÅÜ¡C
-@@ -31,5 +50,5 @@
- %%% coding: big5
- %%% mode: latex
- %%% TeX-master: t
--%%% TeX-command-default: "CJKLaTeX"
-+%%% TeX-command-default: "LaTeX"
- %%% End:
-diff -Nbaurw cjk-4.7.0/examples/CEF_test.tex cjk-current/examples/CEF_test.tex
---- cjk-4.7.0/examples/CEF_test.tex	2007-04-08 23:00:19.564336437 +0200
-+++ cjk-current/examples/CEF_test.tex	2007-05-09 05:57:20.799664976 +0200
-@@ -5,6 +5,10 @@
- %
- % process this text with ceflatex
- 
-+% CEF doesn't work on Debian, because I haven't packaged the HBF
-+% (bitmap fonts) yet.
-+%   Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
-+
- \documentclass[12pt]{article}
- 
- \usepackage[global]{CJK}
-diff -Nbaurw cjk-4.7.0/examples/CJKbabel.tex cjk-current/examples/CJKbabel.tex
---- cjk-4.7.0/examples/CJKbabel.tex	2007-04-08 23:00:19.576336490 +0200
-+++ cjk-current/examples/CJKbabel.tex	2007-05-09 05:57:20.835665031 +0200
-@@ -5,26 +5,32 @@
- % written by Werner Lemberg <wl at gnu.org>
- %
- % Version 4.8.2 (29-Dec-2008)
--
--% You need Emacs 20 to process this file!
-+%
-+% Read cjk-enc.txt for more details.
- 
- % You should load this file into Emacs (C-x C-f) and call
--% `cjk-write-file' (M-x cjk-write-file).  Then run LaTeX on the file
--% `CJKbabel.cjk'.
-+% `cjk-write-file' (M-x cjk-write-file).  `cjk-write-file' has a
-+% shortcut: C-c SPC C-x.  Then run LaTeX on the file `CJKbabel.cjk'.
- %
- % `cjk-write-file' will be available after loading cjk-enc.el into
--% Emacs 20 with the commands load-file or load-library.
-+% Emacs with the commands load-file or load-library.
-+% If you didn't touch the default Debian installation, then this is
-+% already taken care of.
-+
-+% To get all the languages working on Debian, make sure you read the
-+% comments a few lines below.
- %
--% Vietnamese support for Babel comes with the VnTeX package.
-+% Korean text works in an emule-encoded TeX file on Debian, but you'll
-+% need to have "hlatex-fonts-base" installed as well.
- %
--% Read cjk-enc.txt for more details.
-+%   Danai SAE-HAN (’´Ú’ã’ÂÑ) <danai.sae-han at edpnet.be>
- 
- \documentclass[12pt]{article}
- 
- \usepackage{inputenc}               % load it without argument
-                                     % to avoid Babel warnings
- 
--\usepackage[10pt]{type1ec}          % use only 10pt fonts
-+%\usepackage[10pt]{type1ec}          % use only 10pt fonts
- \usepackage[T1]{fontenc}
- 
- \usepackage[german,
-@@ -33,6 +39,11 @@
-             greek,                  % LGR font encoding
-             vietnam,                % T5 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
-+% line accordingly, and comment out the corresponding language block
-+% beneath.
- 
- \usepackage[overlap, CJK]{ruby}
- \usepackage{CJKulem}
-@@ -109,9 +120,9 @@
- \end{otherlanguage}
- 
- \begin{otherlanguage}{thaicjk}
--  …Ã…Ò…Â…¡…Ò…Ã FAQ €¥¹¥Õ¥é…Ê€¥Ã¥é…Ò…§€¥¢¥Ö¥é…¹…à€¥¾¥×¥è…Í…Ê€¥Ã¥Ø…»…¤…Ó…¶…Ò…Á€¥·¥Õ¥è…¶…Ò…Á€¥¡¥Ñ…¹€¥º¥è…Í…Â…¤€¥Ã¥Ñ¥é…§…á…Å…Ð…¤…Ó…µ…Í…º…¤…Ó…¶…Ò…Á…ã…¹€¥Ã¥Ù…»…á…º…º€¥·¥Õ…Ê…Ð…´…Ç…¡.
--  \uline{…â…¤…Ã…§…Ê€¥Ã¥é…Ò…§…¢…Í…§…Ã…Ò…Â…¡…Ò…Ã FAQ €¥¹¥Õ¥é…à…»€¥Å¥Õ¥è…Â…¹…ä…»…Á…Ò…¡€¥µ¥Ñ¥é…§…ဥµ¥è€¥Ã¥Ø¥è…¹€¥·¥Õ¥è…ဥťé…Ç.}
--  \textbf{€¥´¥Ù…Ã…Ò…Â…Å…Ð…à€¥Í¥Õ…Â…´…Ê…Ó…Ë€¥Ã¥Ñ…º…â…¤…Ã…§…Ê€¥Ã¥é…Ò…§…ã…Ë€¥Á¥è…䀥´¥é…¨…Ò…¡€¥ª¥è…Ç…§ ``…â…¤…Ã…§…Ê€¥Ã¥é…Ò…§…á…ŅЀ¥Ç¥Ô€¥¸¥Õ…¡…҅À¥Í¥è…Ò…¹
-+  …Ã…Ò…Â…¡…Ò…Ã FAQ €ò¤£…¹…Õ…é…Ê€ò¤¢…Ã…é…Ò…§€ò¤£…¢…Ö…é…¹…à€ò¤£…¾…×…è…Í…Ê€ò¤¢…Ã…Ø…»…¤…Ó…¶…Ò…Á€ò¤£…·…Õ…è…¶…Ò…Á€ò¤¢…¡…Ñ…¹€ò¤¢…º…è…Í…Â…¤€ò¤£…Ã…Ñ…é…§…á…Å…Ð…¤…Ó…µ…Í…º…¤…Ó…¶…Ò…Á…ã…¹€ò¤¢…Ã…Ù…»…á…º…º€ò¤¢…·…Õ…Ê…Ð…´…Ç…¡.
-+  \uline{…â…¤…Ã…§…Ê€ò¤¢…Ã…é…Ò…§…¢…Í…§…Ã…Ò…Â…¡…Ò…Ã FAQ €ò¤£…¹…Õ…é…à…»€ò¤£…Å…Õ…è…Â…¹…ä…»…Á…Ò…¡€ò¤£…µ…Ñ…é…§…á€ò¤¢…µ…è€ò¤£…Ã…Ø…è…¹€ò¤£…·…Õ…è…á€ò¤¢…Å…é…Ç.}
-+  \textbf{€ò¤¢…´…Ù…Ã…Ò…Â…Å…Ð…à€ò¤¢…Í…Õ…Â…´…Ê…Ó…Ë€ò¤¢…Ã…Ñ…º…â…¤…Ã…§…Ê€ò¤¢…Ã…é…Ò…§…ã…Ë€ò¤¢…Á…è…ä€ò¤¢…´…é…¨…Ò…¡€ò¤¢…ª…è…Ç…§ ``…â…¤…Ã…§…Ê€ò¤¢…Ã…é…Ò…§…á…ŅЀò¤¢…Ç…Ô€ò¤¢…¸…Õ…¡…҅Àò¤¢…Í…è…Ò…¹
-     FAQ.''}
- \end{otherlanguage}
- 
-diff -Nbaurw cjk-4.7.0/examples/CJKmixed.tex cjk-current/examples/CJKmixed.tex
---- cjk-4.7.0/examples/CJKmixed.tex	2007-04-08 23:00:19.644336792 +0200
-+++ cjk-current/examples/CJKmixed.tex	2007-05-09 05:57:20.851665056 +0200
-@@ -4,8 +4,11 @@
- % written by Werner Lemberg <wl at gnu.org>
- %
- % Version 4.8.2 (29-Dec-2008)
-+
-+% To get Vietnamese working on Debian, make sure you have
-+% "texlive-lang-vietnamese" installed.
- %
--% Vietnamese support for Babel comes with the VnTeX package.
-+%   Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
- 
- \documentclass[12pt]{article}
- 
-diff -Nbaurw cjk-4.7.0/examples/CJKutf8.tex cjk-current/examples/CJKutf8.tex
---- cjk-4.7.0/examples/CJKutf8.tex	2007-04-08 23:00:19.648336810 +0200
-+++ cjk-current/examples/CJKutf8.tex	2007-05-09 05:57:20.859665068 +0200
-@@ -4,18 +4,36 @@
- % written by Werner Lemberg <wl at gnu.org>
- %
- % Version 4.8.2 (29-Dec-2008)
--
--% 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
-+% comments a few lines below.
-+%
-+% Also install the "cm-super" package if you want LaTeX fonts to be
-+% scaled to any size you want.  Uncomment the "type1ec" line below.
-+%
-+%   Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
-+
- \documentclass[12pt]{article}
- 
--\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}
-+% 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
-+% line accordingly, and comment out the corresponding language block
-+% beneath.
-+% 
-+% With regard to Korean, I have yet to package the Unicode fonts for
-+% Debian.  Don't hold your breath though.  If you want an easy
-+% Makefile that creates and installs everything automatically, don't
-+% 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[overlap, CJK]{ruby}
- \usepackage{CJKulem}
-@@ -45,12 +63,12 @@
- 
- \begin{CJK}{UTF8}{}
- 
--\begin{Korean}
--  이 FAQ 은 자주 반복되는 질문과 그에 대한 대답을 간단명료한 양식으로
--  모아 엮어졌습니다. \uline{이 FAQ 의 구조는 지난 판에 비하여
--    획기적으로 변경되었습니다.}  \textbf{상세한 것은 ``이 FAQ 을 어떻게
--    읽을 것인가'' 라는 대목을 참조하시기 바랍니다.}
--\end{Korean}
-+%\begin{Korean}
-+%  이 FAQ 은 자주 반복되는 질문과 그에 대한 대답을 간단명료한 양식으로
-+%  모아 엮어졌습니다. \uline{이 FAQ 의 구조는 지난 판에 비하여
-+%    획기적으로 변경되었습니다.}  \textbf{상세한 것은 ``이 FAQ 을 어떻게
-+%    읽을 것인가'' 라는 대목을 참조하시기 바랍니다.}
-+%\end{Korean}
- 
- \begin{otherlanguage}{german}
-   Dieses FAQ wurde erstellt, um häufig gestellte Fragen und ihre
-diff -Nbaurw cjk-4.7.0/examples/KS-hlatex.tex cjk-current/examples/KS-hlatex.tex
---- cjk-4.7.0/examples/KS-hlatex.tex	1970-01-01 01:00:00.000000000 +0100
-+++ cjk-current/examples/KS-hlatex.tex	2007-05-09 05:57:20.971665238 +0200
-@@ -0,0 +1,187 @@
-+% This is a testfile of the CJK Debian package to test Korean.
-+% Please install hlatex-fonts-base (perhaps -extra as well).
-+%
-+% written by Danai SAE-HAN (韓達耐) <danai.sae-han at edpnet.be>
-+%
-+ % Version 4.8.2 (29-Dec-2008)
-+
-+\documentclass[12pt]{article}
-+
-+\usepackage{CJK}
-+\usepackage{pshan}
-+
-+
-+\begin{document}
-+
-+\begin{CJK}[HL]{KS}{}
-+
-+\newcommand{\testpar}{\noindent ÀÌ FAQ Àº ÀÚÁÖ ¹Ýº¹µÇ´Â Áú¹®°ú ±×¿¡
-+  ´ëÇÑ ´ë´äÀ» °£´Ü¸í·áÇѾç½ÄÀ¸·Î ¸ð¾Æ ¿«¾îÁ³½À´Ï´Ù. ÀÌ FAQ ÀÇ ±¸Á¶´Â
-+  Áö³­ ÆÇ¿¡ ºñÇÏ¿©È¹±âÀûÀ¸·Î º¯°æµÇ¾ú½À´Ï´Ù.  \textbf{»ó¼¼ÇÑ °ÍÀº ``ÀÌ
-+    FAQ À» ¾î¶»°ÔÀÐÀ» °ÍÀΰ¡'' ¶ó´Â ´ë¸ñÀ» ÂüÁ¶ÇϽñ⠹ٶø´Ï´Ù.}}
-+
-+\section{Myoungjo (default)}
-+%\CJKfamily{}
-+\mj
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+
-+\section{Bom}
-+%\CJKfamily{}
-+\bm
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+
-+\section{Dinaru}
-+%\CJKfamily{}
-+\dn
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Graphic}
-+%\CJKfamily{}
-+\gr
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Gothic}
-+%\CJKfamily{}
-+\gt
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Jamo Gothic}
-+%\CJKfamily{}
-+\jgt
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Jamo Myoungjo}
-+%\CJKfamily{}
-+\jmj
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Jamo Novel}
-+%\CJKfamily{}
-+\jnv
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Jamo Sora}
-+%\CJKfamily{}
-+\jsr
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Pilgi}
-+%\CJKfamily{}
-+\pg
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Pilgia}
-+%\CJKfamily{}
-+\pga
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Pen Heulim}
-+%\CJKfamily{}
-+\ph
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Pen}
-+%\CJKfamily{}
-+\pn
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Shinmun Myoungjo}
-+%\CJKfamily{}
-+\sh
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Typewriter (Taza)}
-+%\CJKfamily{}
-+\tz
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Vada}
-+%\CJKfamily{}
-+\vd
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+\section{Yetgul}
-+%\CJKfamily{}
-+\yt
-+\rm
-+\testpar
-+
-+\sl
-+\testpar
-+
-+
-+\end{CJK}
-+
-+\end{document}
-+
-+%%% Local Variables:
-+%%% coding: euc-korea
-+%%% mode: latex
-+%%% TeX-master: t
-+%%% End:
-diff -Nbaurw cjk-4.7.0/examples/muletest.tex cjk-current/examples/muletest.tex
---- cjk-4.7.0/examples/muletest.tex	2007-04-08 23:00:19.664336881 +0200
-+++ cjk-current/examples/muletest.tex	2007-05-09 05:57:21.015665305 +0200
-@@ -4,26 +4,31 @@
- % written by Werner Lemberg <wl at gnu.org>
- %
- % Version 4.8.2 (29-Dec-2008)
--
--% You need Emacs 20 (or Mule 2.3) to process this file!
-+%
-+% Read cjk-enc.txt for more details.
- 
- % You should load this file into Mule with `*internal*' encoding scheme
- % (C-u C-x C-f) and call `cjk-write-file' (M-x cjk-write-file).
-+% `cjk-write-file' has a shortcut: C-c SPC C-x.
- % Then run LaTeX on the file `muletest.cjk'.
- %
- % Under Emacs 20 type `C-x C-f muletest.tex' to load this file.
- %
- % `cjk-write-file' will be available after loading cjk-enc.el into Mule
- % (Emacs 20) with the commands load-file or load-library.
-+% If you didn't touch the default Debian installation, then this is
-+% already taken care of.
- %
--% If you don't have german.sty, comment out the `\usepackage{german}'
--% line.
-+% To get all the languages working on Debian, make sure you read the
-+% comments a few lines below.
- %
--% The T5 encoding is part of the VnTeX package (available at CTAN) which
--% contains Vietnamese fonts and other support files for both TeX and
--% LaTeX.
-+% Korean text works in an emule-encoded TeX file on Debian, but you'll
-+% need to have "hlatex-fonts-base" installed as well.
- %
--% Read cjk-enc.txt for more details.
-+% Also install the "cm-super" package if you want LaTeX fonts to be
-+% scaled to any size you want.  Uncomment the "type1ec" line below.
-+%
-+%   Danai SAE-HAN (’´Ú’ã’ÂÑ) <danai.sae-han at edpnet.be>
- 
- \documentclass[12pt]{article}
- 
-diff -Nbaurw cjk-4.7.0/examples/rubytest.tex cjk-current/examples/rubytest.tex
---- cjk-4.7.0/examples/rubytest.tex	2007-04-08 23:00:19.664336881 +0200
-+++ cjk-current/examples/rubytest.tex	2007-05-09 05:57:21.071665391 +0200
-@@ -5,16 +5,15 @@
- %
- % Version 4.8.2 (29-Dec-2008)
- 
--% You need Emacs 20 (or Mule 2.3) to process this file!
--
- % You should load this file into Mule with `*internal*' encoding scheme
- % (C-u C-x C-f) and call `cjk-write-file' (M-x cjk-write-file).
-+% `cjk-write-file' has a shortcut: C-c SPC C-x.
- % Then run LaTeX on the created file `rubytest.cjk'.
- %
--% Under Emacs 20 type `C-x C-f rubytest.tex' to load this file.
--%
- % `cjk-write-file' will be available after loading cjk-enc.el into Mule
- % (Emacs 20) with the commands load-file or load-library.
-+% If you didn't touch the default Debian installation, then this is
-+% already taken care of.
- 
- \documentclass[12pt]{article}
- 
-diff -Nbaurw cjk-4.7.0/examples/thai.tex cjk-current/examples/thai.tex
---- cjk-4.7.0/examples/thai.tex	2007-04-08 23:00:19.668336899 +0200
-+++ cjk-current/examples/thai.tex	2007-05-09 05:57:21.091665421 +0200
-@@ -11,21 +11,34 @@
- %   . 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.
- 
- \documentclass[12pt]{article}
-+\usepackage[USenglish,thaicjk]{babel} % Last entry is the default.
- 
--\usepackage[thaicjk]{babel}
--
-+\usepackage{CJK}
- 
- \begin{document}
- 
-+%Currently using:
-+%\font\thai = ftnr8z
-+
-+\section{Norasi}
-+ÃÒ¡Òà FAQ ¹ÕéÊÃéÒ§¢Öé¹à¾×èÍÊÃØ»¤Ó¶ÒÁ·Õè¶ÒÁ¡Ñ¹ºèͤÃÑé§áÅФӵͺ¤Ó¶ÒÁã¹ÃٻẺ·ÕÊдǡ.
-+â¤Ã§ÊÃéÒ§¢Í§ÃÒ¡Òà FAQ ¹Õéà»ÅÕè¹ä»ÁÒ¡µÑé§áµèÃØè¹·ÕèáÅéÇ.
-+\textbf{´ÙÃÒÂÅÐàÍÕ´ÊÓËÃѺâ¤Ã§ÊÃéÒ§ãËÁèä´é¨Ò¡ªèǧ ``â¤Ã§ÊÃéÒ§áÅÐÇÔ¸Õ¡ÒÃÍèÒ¹
-+  FAQ.''}
-+
-+
-+\section{Garuda}
-+\tt
- ÃÒ¡Òà FAQ ¹ÕéÊÃéÒ§¢Öé¹à¾×èÍÊÃØ»¤Ó¶ÒÁ·Õè¶ÒÁ¡Ñ¹ºèͤÃÑé§áÅФӵͺ¤Ó¶ÒÁã¹ÃٻẺ·ÕÊдǡ.
- â¤Ã§ÊÃéÒ§¢Í§ÃÒ¡Òà FAQ ¹Õéà»ÅÕè¹ä»ÁÒ¡µÑé§áµèÃØè¹·ÕèáÅéÇ.
- \textbf{´ÙÃÒÂÅÐàÍÕ´ÊÓËÃѺâ¤Ã§ÊÃéÒ§ãËÁèä´é¨Ò¡ªèǧ ``â¤Ã§ÊÃéÒ§áÅÐÇÔ¸Õ¡ÒÃÍèÒ¹
-   FAQ.''}
- 
-+
- \end{document}
- 
- 

Added: cjk/trunk/debian/patches/05_fix_examplefiles.diff
===================================================================
--- cjk/trunk/debian/patches/05_fix_examplefiles.diff	                        (rev 0)
+++ cjk/trunk/debian/patches/05_fix_examplefiles.diff	2009-12-13 02:04:52 UTC (rev 4446)
@@ -0,0 +1,22 @@
+## 05_fix_examplefiles.diff by <danai at debian.org>
+##
+## Fix examples/CJK.tex: firstly, change from CJK to CJKutf8, and
+## secondly, change from cyberb to cyberbit.
+
+--- cjk-20060714/examples/UTF8.tex	2006-07-22 22:10:53.000000000 +0200
++++ new/examples/UTF8.tex	2006-09-05 10:30:33.150336108 +0200
+@@ -7,7 +7,7 @@
+ 
+ \documentclass[12pt]{article}
+ 
+-\usepackage{CJK}
++\usepackage{CJKutf8}
+ \usepackage[T1]{fontenc}
+ 
+ 
+@@ -23,5 +23,5 @@
+ % we want the Unicode font for normal text also
+ \DeclareFontFamily{T1}{song}{}
+-\DeclareFontShape{T1}{song}{m}{n}{<-> cyberb00}{}
++\DeclareFontShape{T1}{song}{m}{n}{<-> cyberbit00}{}
+ \renewcommand\rmdefault{song}


Property changes on: cjk/trunk/debian/patches/05_fix_examplefiles.diff
___________________________________________________________________
Added: svn:executable
   + *

Deleted: cjk/trunk/debian/patches/05_fix_examplefiles.dpatch
===================================================================
--- cjk/trunk/debian/patches/05_fix_examplefiles.dpatch	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/patches/05_fix_examplefiles.dpatch	2009-12-13 02:04:52 UTC (rev 4446)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_fix_examplefiles.dpatch by  <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix examples/CJK.tex: firstly, change from CJK to CJKutf8, and
-## DP: secondly, change from cyberb to cyberbit.
-
- at DPATCH@
-
---- cjk-20060714/examples/UTF8.tex	2006-07-22 22:10:53.000000000 +0200
-+++ new/examples/UTF8.tex	2006-09-05 10:30:33.150336108 +0200
-@@ -7,7 +7,7 @@
- 
- \documentclass[12pt]{article}
- 
--\usepackage{CJK}
-+\usepackage{CJKutf8}
- \usepackage[T1]{fontenc}
- 
- 
-@@ -23,5 +23,5 @@
- % we want the Unicode font for normal text also
- \DeclareFontFamily{T1}{song}{}
--\DeclareFontShape{T1}{song}{m}{n}{<-> cyberb00}{}
-+\DeclareFontShape{T1}{song}{m}{n}{<-> cyberbit00}{}
- \renewcommand\rmdefault{song}

Added: cjk/trunk/debian/patches/06_extend_JIS_example.diff
===================================================================
--- cjk/trunk/debian/patches/06_extend_JIS_example.diff	                        (rev 0)
+++ cjk/trunk/debian/patches/06_extend_JIS_example.diff	2009-12-13 02:04:52 UTC (rev 4446)
@@ -0,0 +1,51 @@
+## 06_extend_JIS_example.diff by  <danai at debian.org>
+##
+## Add extra goodies in the JIS example file.
+
+--- cjk-20060714/examples/JIS.tex	2007-02-05 01:40:40.878024813 +0100
++++ new/examples/JIS.tex	2007-02-05 02:28:49.951124178 +0100
+@@ -5,24 +5,40 @@
+ %
+ % Version 4.8.2 (29-Dec-2008)
+ 
+-\documentclass[12pt]{article}
++\documentclass[12pt]{scrartcl}
+ 
+ \usepackage{CJK}
+ \usepackage[CJK, overlap]{ruby}
+ 
+ \renewcommand{\rubysep}{-0.2ex}
+ 
+-
+ \begin{document}
+ 
+ \begin{CJK*}[dnp]{JIS}{min}
+ \CJKtilde
++% CJKcaption works only with KOMA-script classes such as "scrartcl".
++\CJKcaption{JIS}
++\title{A Japanese example file for CJK in JIS}
++\author{Danai SAE-HAN¡Ê´ÚãÂÑ¡Ë}
++\maketitle
++\tableofcontents
+ 
+-\noindent ¤³¤Î~FAQ~¥ê¥¹¥È¤Ï¡¢¤è¤¯¤¢¤ë¼ÁÌä¤È¤½¤ÎÅú¤ò½¸¤á¡¢Ìò¤ËΩ¤Ä¤è¤¦
++\newcommand{\testpar}{¤³¤Î~FAQ~¥ê¥¹¥È¤Ï¡¢¤è¤¯¤¢¤ë¼ÁÌä¤È¤½¤ÎÅú¤ò½¸¤á¡¢Ìò¤ËΩ¤Ä¤è¤¦
+ ¤Ë¤·¤¿¤â¤Î¤Ç¤¹¡£¤³¤Î~FAQ~¥ê¥¹¥È¤Î¹½Â¤¤Ï¡¢°ÊÁ°¤Î¤â¤Î¤ÈÈæ¤Ù¤ÆÂçÉý¤ËÊѹ¹
+ ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\textbf{\ruby{¿·}{¤¢¤¿¤é}¤·¤¤¹½Â¤¤Ë´Ø¤·¤Æ¤Ï¡¢¡Ö¤³¤Î~FAQ~
+ ¤ÎÆɤßÊý¤È¤½¤Î¹½Â¤¡×¤Î¹àÌܤò\ruby{»²}{¤µ¤ó}\ruby{¾È}{¤·¤ç¤¦}¤·¤Æ²¼¤µ
+-¤¤¡£}
++¤¤¡£}}
++
++\section{Wadalab Mincho ÌÀÄ«}
++\testpar
++
++\section{Wadalab Gothic ¥´¥·¥Ã¥¯}
++\CJKfamily{goth}
++\testpar
++
++\section{Wadalab Maru ´Ý}
++\CJKfamily{maru}
++\testpar
+ 
+ \end{CJK*}
+ 


Property changes on: cjk/trunk/debian/patches/06_extend_JIS_example.diff
___________________________________________________________________
Added: svn:executable
   + *

Deleted: cjk/trunk/debian/patches/06_extend_JIS_example.dpatch
===================================================================
--- cjk/trunk/debian/patches/06_extend_JIS_example.dpatch	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/patches/06_extend_JIS_example.dpatch	2009-12-13 02:04:52 UTC (rev 4446)
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_extend_JIS_example.dpatch by  <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add extra goodies in the JIS example file.
-
- at DPATCH@
-
---- cjk-20060714/examples/JIS.tex	2007-02-05 01:40:40.878024813 +0100
-+++ new/examples/JIS.tex	2007-02-05 02:28:49.951124178 +0100
-@@ -5,24 +5,40 @@
- %
- % Version 4.8.2 (29-Dec-2006)
- 
--\documentclass[12pt]{article}
-+\documentclass[12pt]{scrartcl}
- 
- \usepackage{CJK}
- \usepackage[CJK, overlap]{ruby}
- 
- \renewcommand{\rubysep}{-0.2ex}
- 
--
- \begin{document}
- 
- \begin{CJK*}[dnp]{JIS}{min}
- \CJKtilde
-+% CJKcaption works only with KOMA-script classes such as "scrartcl".
-+\CJKcaption{JIS}
-+\title{A Japanese example file for CJK in JIS}
-+\author{Danai SAE-HAN¡Ê´ÚãÂÑ¡Ë}
-+\maketitle
-+\tableofcontents
- 
--\noindent ¤³¤Î~FAQ~¥ê¥¹¥È¤Ï¡¢¤è¤¯¤¢¤ë¼ÁÌä¤È¤½¤ÎÅú¤ò½¸¤á¡¢Ìò¤ËΩ¤Ä¤è¤¦
-+\newcommand{\testpar}{¤³¤Î~FAQ~¥ê¥¹¥È¤Ï¡¢¤è¤¯¤¢¤ë¼ÁÌä¤È¤½¤ÎÅú¤ò½¸¤á¡¢Ìò¤ËΩ¤Ä¤è¤¦
- ¤Ë¤·¤¿¤â¤Î¤Ç¤¹¡£¤³¤Î~FAQ~¥ê¥¹¥È¤Î¹½Â¤¤Ï¡¢°ÊÁ°¤Î¤â¤Î¤ÈÈæ¤Ù¤ÆÂçÉý¤ËÊѹ¹
- ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\textbf{\ruby{¿·}{¤¢¤¿¤é}¤·¤¤¹½Â¤¤Ë´Ø¤·¤Æ¤Ï¡¢¡Ö¤³¤Î~FAQ~
- ¤ÎÆɤßÊý¤È¤½¤Î¹½Â¤¡×¤Î¹àÌܤò\ruby{»²}{¤µ¤ó}\ruby{¾È}{¤·¤ç¤¦}¤·¤Æ²¼¤µ
--¤¤¡£}
-+¤¤¡£}}
-+
-+\section{Wadalab Mincho ÌÀÄ«}
-+\testpar
-+
-+\section{Wadalab Gothic ¥´¥·¥Ã¥¯}
-+\CJKfamily{goth}
-+\testpar
-+
-+\section{Wadalab Maru ´Ý}
-+\CJKfamily{maru}
-+\testpar
- 
- \end{CJK*}
- 

Deleted: cjk/trunk/debian/patches/07_remove_unnecessary_C_libs.dpatch
===================================================================
--- cjk/trunk/debian/patches/07_remove_unnecessary_C_libs.dpatch	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/patches/07_remove_unnecessary_C_libs.dpatch	2009-12-13 02:04:52 UTC (rev 4446)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_remove_unnecessary_C_libs.dpatch by <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The upstream C files include extra libraries that are not
-## DP: used at all.  Given that dpkg-shlibdeps sends dozens of
-## DP: warnings about this, we will manually remove those includes.
-
- at DPATCH@
-
-diff -Nbaurw old/utils/hbf2gf/hbf2gf.w.orig new/utils/hbf2gf/hbf2gf.w
---- old/utils/hbf2gf/hbf2gf.w.orig	2009-07-11 23:37:20.684358053 +0200
-+++ new/utils/hbf2gf/hbf2gf.w	2009-07-11 23:37:35.580358672 +0200
-@@ -411,7 +411,6 @@
- 
- @
- @<Include files@>=
--#include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-diff -Nbaurw old/utils/hbf2gf/configure.orig new/utils/hbf2gf/configure
---- old/utils/hbf2gf/configure.orig	2009-07-11 23:42:37.228357958 +0200
-+++ new/utils/hbf2gf/configure	2009-07-11 23:43:07.932357964 +0200
-@@ -3368,7 +3368,6 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <ctype.h>
- #include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-diff -Nbaurw old/utils/hbf2gf/hbf.c.orig new/utils/hbf2gf/hbf.c
---- old/utils/hbf2gf/hbf.c.orig	2009-07-11 23:12:13.244359434 +0200
-+++ new/utils/hbf2gf/hbf.c	2009-07-11 23:12:27.976357286 +0200
-@@ -60,7 +60,6 @@
- #include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
--#include <ctype.h>
- #include <string.h>
- #include "hbf.h"

Added: cjk/trunk/debian/patches/08_add_newpage_to_examples.diff
===================================================================
--- cjk/trunk/debian/patches/08_add_newpage_to_examples.diff	                        (rev 0)
+++ cjk/trunk/debian/patches/08_add_newpage_to_examples.diff	2009-12-13 02:04:52 UTC (rev 4446)
@@ -0,0 +1,227 @@
+## 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
+## sometimes fail when writing out the .toc file, even though
+## this behaviour is well documented.  This will surely prevent
+## many future errors with users.
+
+diff -Nbaurw cjk-4.8.2/examples/Big5.tex cjk-current/examples/Big5.tex
+--- cjk-4.8.2/examples/Big5.tex	2009-07-14 21:50:47.473912964 +0200
++++ cjk-current/examples/Big5.tex	2009-07-13 01:05:42.853911919 +0200
+@@ -41,6 +41,11 @@
+ \textbf{¦³Ãö·sµ²ºcªº²Ó¸`¡A¥i°Ñ¦Ò¡u¦p¦ó¾\Ū¥»°Ýµª¶°¤Î¤F¸Ñ¨ä½s±Æµ²ºc¡v¸Ó
+ ¶µ¤¤ªº»¡©ú¡C}
+
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK*}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/Big5vert.tex cjk-current/examples/Big5vert.tex
+--- cjk-4.8.2/examples/Big5vert.tex	2009-07-13 00:40:16.053915841 +0200
++++ cjk-current/examples/Big5vert.tex	2009-07-13 01:11:28.196017210 +0200
+@@ -23,6 +23,11 @@
+ \textbf{¦³Ãö·sµ²ºcªº²Ó¸`¡A¥i°Ñ¦Ò¡u¦p¦ó¾\Ū¥»°Ýµª¶°¤Î¤F¸Ñ¨ä½s±Æµ²ºc¡v¸Ó
+ ¶µ¤¤ªº»¡©ú¡C}
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK*}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/CEF_test.tex cjk-current/examples/CEF_test.tex
+--- cjk-4.8.2/examples/CEF_test.tex	2009-07-14 21:50:47.473912964 +0200
++++ cjk-current/examples/CEF_test.tex	2009-07-13 01:11:46.083118455 +0200
+@@ -40,6 +40,11 @@
+ \verb|\CJKchar[CNS7]{"5A}{"5A}| \CJKchar[CNS7]{"5A}{"5A}
+ \quad \verb|&C7-|\verb|5A5A;| &C7-5A5A;
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/CJKfntef.tex cjk-current/examples/CJKfntef.tex
+--- cjk-4.8.2/examples/CJKfntef.tex	2009-07-13 00:40:16.053915841 +0200
++++ cjk-current/examples/CJKfntef.tex	2009-07-13 01:12:09.249954713 +0200
+@@ -50,6 +50,11 @@
+ 
+ \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
++% `Possible errors'.
++\newpage
+ \end{CJK*}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/CJKmixed.tex cjk-current/examples/CJKmixed.tex
+--- cjk-4.8.2/examples/CJKmixed.tex	2009-07-14 21:50:47.477914953 +0200
++++ cjk-current/examples/CJKmixed.tex	2009-07-13 01:12:17.553911782 +0200
+@@ -73,6 +73,11 @@
+     該項中的說明。}
+ \end{TChinese}
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/CJKspace.tex cjk-current/examples/CJKspace.tex
+--- cjk-4.8.2/examples/CJKspace.tex	2009-07-13 00:40:16.053915841 +0200
++++ cjk-current/examples/CJKspace.tex	2009-07-13 01:12:25.665912216 +0200
+@@ -29,6 +29,11 @@
+   混排 \verb+anything+ 保持 \texttt{spaces} 空格 \LaTeX\ 间隔
+   \mbox{boxes} 盒子 \hbox{hbox} 中文 123456 数字.
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK*}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/CJKutf8.tex cjk-current/examples/CJKutf8.tex
+--- cjk-4.8.2/examples/CJKutf8.tex	2009-07-14 21:50:47.477914953 +0200
++++ cjk-current/examples/CJKutf8.tex	2009-07-13 01:12:35.121914369 +0200
+@@ -123,6 +123,11 @@
+     этот FAQ и его структура' объяснены детали этой новой структуры.}
+ \end{otherlanguage}
+
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/GB.tex cjk-current/examples/GB.tex
+--- cjk-4.8.2/examples/GB.tex	2009-07-13 00:40:16.053915841 +0200
++++ cjk-current/examples/GB.tex	2009-07-13 01:12:45.424137301 +0200
+@@ -20,6 +20,11 @@
+ \textbf{ÓйØнṹµÄϸ½Ú£¬¿É²Î¿¼¡¸ÈçºÎÔĶÁ±¾Îʴ𼯼°Á˽âÆä±àÅŽṹ¡¹¸Ã
+ ÏîÖеÄ˵Ã÷¡£}
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK*}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/JIS.tex cjk-current/examples/JIS.tex
+--- cjk-4.8.2/examples/JIS.tex	2009-07-14 21:50:47.489915612 +0200
++++ cjk-current/examples/JIS.tex	2009-07-13 01:12:51.839815082 +0200
+@@ -40,6 +40,11 @@
+ \CJKfamily{maru}
+ \testpar
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK*}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/KS-hlatex.tex cjk-current/examples/KS-hlatex.tex
+--- cjk-4.8.2/examples/KS-hlatex.tex	2009-07-14 21:50:47.477914953 +0200
++++ cjk-current/examples/KS-hlatex.tex	2009-07-14 21:52:20.524326127 +0200
+@@ -176,6 +176,11 @@
+ \testpar
+ 
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/KS.tex cjk-current/examples/KS.tex
+--- cjk-4.8.2/examples/KS.tex	2009-07-13 00:40:16.053915841 +0200
++++ cjk-current/examples/KS.tex	2009-07-13 01:13:14.174693396 +0200
+@@ -20,6 +20,11 @@
+ ȹ±âÀûÀ¸·Î º¯°æµÇ¾ú½À´Ï´Ù.  \textbf{»ó¼¼ÇÑ °ÍÀº ``ÀÌ FAQ À» ¾î¶»°Ô
+ ÀÐÀ» °ÍÀΰ¡'' ¶ó´Â ´ë¸ñÀ» ÂüÁ¶ÇϽñ⠹ٶø´Ï´Ù.}
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/SJIS.tex cjk-current/examples/SJIS.tex
+--- cjk-4.8.2/examples/SJIS.tex	2009-07-13 00:40:16.053915841 +0200
++++ cjk-current/examples/SJIS.tex	2009-07-13 01:13:38.509912805 +0200
+@@ -27,6 +27,11 @@
+ ‚Ì“Ç‚Ý•û‚Æ‚»‚̍\‘¢v‚̍€–Ú‚ð\ruby{ŽQ}{‚³‚ñ}\ruby{Æ}{‚µ‚傤}‚µ‚ĉº‚³
+ ‚¢B}
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK*}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/UTF8.tex cjk-current/examples/UTF8.tex
+--- cjk-4.8.2/examples/UTF8.tex	2009-07-14 21:50:47.485915020 +0200
++++ cjk-current/examples/UTF8.tex	2009-07-13 01:14:10.987838128 +0200
+@@ -37,6 +37,11 @@
+ \CJKnospace
+ \noindent こんにちは 世界
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK}
+ 
+ \end{document}
+diff -Nbaurw cjk-4.8.2/examples/xCJK.tex cjk-current/examples/xCJK.tex
+--- cjk-4.8.2/examples/xCJK.tex	2009-07-13 00:40:16.057913912 +0200
++++ cjk-current/examples/xCJK.tex	2009-07-14 21:54:39.077912204 +0200
+@@ -25,7 +25,7 @@
+ % You can also specify a font for a certain CJK family.
+ \setCJKfamilyfont{SimpChinese}[BoldFont={SimHei},
+                                ItalicFont={FZKaiTi}]{SimSun}
+-\setCJKfamilyfont{TChinese}{FZMingTiB}
++\setCJKfamilyfont{TChinese}{FZCMingTiB}
+ \setCJKfamilyfont{Japanese}{MS Gothic}
+ \setCJKfamilyfont{Korean}{Batang}
+ 
+@@ -115,6 +115,11 @@
+   변경되었습니다.}  \textbf{상세한 것은 “이 FAQ 을 어떻게 읽을
+   것인가” 라는 대목을 참조하시기 바랍니다.}
+ 
++% 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
++% `Possible errors'.
++\newpage
+ \end{CJK*}
+ 
+ \end{document}


Property changes on: cjk/trunk/debian/patches/08_add_newpage_to_examples.diff
___________________________________________________________________
Added: svn:executable
   + *

Deleted: cjk/trunk/debian/patches/08_add_newpage_to_examples.dpatch
===================================================================
--- cjk/trunk/debian/patches/08_add_newpage_to_examples.dpatch	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/patches/08_add_newpage_to_examples.dpatch	2009-12-13 02:04:52 UTC (rev 4446)
@@ -1,231 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_add_newpage_to_examples.dpatch by  <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix examples/*.tex: add \newpage in a CJK environment.  I add
-## DP: this because larger documents with \tableofcontents will
-## DP: sometimes fail when writing out the .toc file, even though
-## DP: this behaviour is well documented.  This will surely prevent
-## DP: many future errors with users.
-
- at DPATCH@
-
-diff -Nbaurw cjk-4.8.2/examples/Big5.tex cjk-current/examples/Big5.tex
---- cjk-4.8.2/examples/Big5.tex	2009-07-14 21:50:47.473912964 +0200
-+++ cjk-current/examples/Big5.tex	2009-07-13 01:05:42.853911919 +0200
-@@ -41,6 +41,11 @@
- \textbf{¦³ö·sµ²ºcªº²Ó¸`¡A¥i°Ñ¦Ò¡u¦p¦ó¾\Ū¥»°Ýµª¶°¤Î¤F¸Ñ¨ä½s±Æµ²ºc¡v¸Ó
- ¶µ¤¤ªº»¡©ú¡C}
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK*}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/Big5vert.tex cjk-current/examples/Big5vert.tex
---- cjk-4.8.2/examples/Big5vert.tex	2009-07-13 00:40:16.053915841 +0200
-+++ cjk-current/examples/Big5vert.tex	2009-07-13 01:11:28.196017210 +0200
-@@ -23,6 +23,11 @@
- \textbf{¦³ö·sµ²ºcªº²Ó¸`¡A¥i°Ñ¦Ò¡u¦p¦ó¾\Ū¥»°Ýµª¶°¤Î¤F¸Ñ¨ä½s±Æµ²ºc¡v¸Ó
- ¶µ¤¤ªº»¡©ú¡C}
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK*}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/CEF_test.tex cjk-current/examples/CEF_test.tex
---- cjk-4.8.2/examples/CEF_test.tex	2009-07-14 21:50:47.473912964 +0200
-+++ cjk-current/examples/CEF_test.tex	2009-07-13 01:11:46.083118455 +0200
-@@ -40,6 +40,11 @@
- \verb|\CJKchar[CNS7]{"5A}{"5A}| \CJKchar[CNS7]{"5A}{"5A}
- \quad \verb|&C7-|\verb|5A5A;| &C7-5A5A;
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/CJKfntef.tex cjk-current/examples/CJKfntef.tex
---- cjk-4.8.2/examples/CJKfntef.tex	2009-07-13 00:40:16.053915841 +0200
-+++ cjk-current/examples/CJKfntef.tex	2009-07-13 01:12:09.249954713 +0200
-@@ -50,6 +50,11 @@
- 
- \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
-+% `Possible errors'.
-+\newpage
- \end{CJK*}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/CJKmixed.tex cjk-current/examples/CJKmixed.tex
---- cjk-4.8.2/examples/CJKmixed.tex	2009-07-14 21:50:47.477914953 +0200
-+++ cjk-current/examples/CJKmixed.tex	2009-07-13 01:12:17.553911782 +0200
-@@ -73,6 +73,11 @@
-     該項中的說明。}
- \end{TChinese}
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/CJKspace.tex cjk-current/examples/CJKspace.tex
---- cjk-4.8.2/examples/CJKspace.tex	2009-07-13 00:40:16.053915841 +0200
-+++ cjk-current/examples/CJKspace.tex	2009-07-13 01:12:25.665912216 +0200
-@@ -29,6 +29,11 @@
-   混排 \verb+anything+ 保持 \texttt{spaces} 空格 \LaTeX\ 间隔
-   \mbox{boxes} 盒子 \hbox{hbox} 中文 123456 数字.
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK*}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/CJKutf8.tex cjk-current/examples/CJKutf8.tex
---- cjk-4.8.2/examples/CJKutf8.tex	2009-07-14 21:50:47.477914953 +0200
-+++ cjk-current/examples/CJKutf8.tex	2009-07-13 01:12:35.121914369 +0200
-@@ -123,6 +123,11 @@
-     этоÑ‚ FAQ и его структура' объясненÑ‹ деÑ‚али этой новой структуры.}
- \end{otherlanguage}
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/GB.tex cjk-current/examples/GB.tex
---- cjk-4.8.2/examples/GB.tex	2009-07-13 00:40:16.053915841 +0200
-+++ cjk-current/examples/GB.tex	2009-07-13 01:12:45.424137301 +0200
-@@ -20,6 +20,11 @@
- \textbf{ÓйØнṹµÄϸ½Ú£¬¿É²Î¿¼¡¸ÈçºÎÔĶq¾Îʴ𼯼°K½âÆä±àÅŽṹ¡¹¸Ã
- ÏîÖеÄ˵÷¡£}
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK*}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/JIS.tex cjk-current/examples/JIS.tex
---- cjk-4.8.2/examples/JIS.tex	2009-07-14 21:50:47.489915612 +0200
-+++ cjk-current/examples/JIS.tex	2009-07-13 01:12:51.839815082 +0200
-@@ -40,6 +40,11 @@
- \CJKfamily{maru}
- \testpar
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK*}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/KS-hlatex.tex cjk-current/examples/KS-hlatex.tex
---- cjk-4.8.2/examples/KS-hlatex.tex	2009-07-14 21:50:47.477914953 +0200
-+++ cjk-current/examples/KS-hlatex.tex	2009-07-14 21:52:20.524326127 +0200
-@@ -176,6 +176,11 @@
- \testpar
- 
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/KS.tex cjk-current/examples/KS.tex
---- cjk-4.8.2/examples/KS.tex	2009-07-13 00:40:16.053915841 +0200
-+++ cjk-current/examples/KS.tex	2009-07-13 01:13:14.174693396 +0200
-@@ -20,6 +20,11 @@
- ȹ±âÀû8·Î º¯°æµÇ¾ú½4Ï´Ù.  \textbf{»ó¼¼ÇÑ °Í: `` FAQ ; ¾î¶»°Ô
- ; °Í°¡'' ¶ó´Â ´ë¸ñ; ¼vÇϽñâ ¹Ù¶ø´Ï´Ù.}
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/SJIS.tex cjk-current/examples/SJIS.tex
---- cjk-4.8.2/examples/SJIS.tex	2009-07-13 00:40:16.053915841 +0200
-+++ cjk-current/examples/SJIS.tex	2009-07-13 01:13:38.509912805 +0200
-@@ -27,6 +27,11 @@
- ‚Ì“Ç‚Ý•û‚Æ‚»Â‚̍\‘¢Âv‚̍€–Ú‚ð\ruby{ÂŽQ}{‚³Â‚ñ}\ruby{Æ}{‚µÂ‚傤}‚µÂ‚ĉºÂ‚³
- ‚¢ÂB}
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK*}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/UTF8.tex cjk-current/examples/UTF8.tex
---- cjk-4.8.2/examples/UTF8.tex	2009-07-14 21:50:47.485915020 +0200
-+++ cjk-current/examples/UTF8.tex	2009-07-13 01:14:10.987838128 +0200
-@@ -37,6 +37,11 @@
- \CJKnospace
- \noindent こんにちは 世界
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK}
- 
- \end{document}
-diff -Nbaurw cjk-4.8.2/examples/xCJK.tex cjk-current/examples/xCJK.tex
---- cjk-4.8.2/examples/xCJK.tex	2009-07-13 00:40:16.057913912 +0200
-+++ cjk-current/examples/xCJK.tex	2009-07-14 21:54:39.077912204 +0200
-@@ -25,7 +25,7 @@
- % You can also specify a font for a certain CJK family.
- \setCJKfamilyfont{SimpChinese}[BoldFont={SimHei},
-                                ItalicFont={FZKaiTi}]{SimSun}
--\setCJKfamilyfont{TChinese}{FZMingTiB}
-+\setCJKfamilyfont{TChinese}{FZCMingTiB}
- \setCJKfamilyfont{Japanese}{MS Gothic}
- \setCJKfamilyfont{Korean}{Batang}
- 
-@@ -115,6 +115,11 @@
-   변경되었습니다.}  \textbf{상세한 것은 “이 FAQ 을 어떻게 읽을
-   것인가” 라는 대목을 참조하시기 바랍니다.}
- 
-+% 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
-+% `Possible errors'.
-+\newpage
- \end{CJK*}
- 
- \end{document}

Added: cjk/trunk/debian/patches/series
===================================================================
--- cjk/trunk/debian/patches/series	                        (rev 0)
+++ cjk/trunk/debian/patches/series	2009-12-13 02:04:52 UTC (rev 4446)
@@ -0,0 +1,5 @@
+03_Makefile.diff
+04_extend_examplefiles.diff
+05_fix_examplefiles.diff
+06_extend_JIS_example.diff
+08_add_newpage_to_examples.diff

Modified: cjk/trunk/debian/rules
===================================================================
--- cjk/trunk/debian/rules	2009-12-12 23:05:45 UTC (rev 4445)
+++ cjk/trunk/debian/rules	2009-12-13 02:04:52 UTC (rev 4446)
@@ -11,6 +11,8 @@
 
 SHELL = /bin/sh
 
+include /usr/share/quilt/quilt.make
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -32,8 +34,9 @@
 # dpkg-parsechangelog | sed -ne 's/^Version: *\([^+-]*\).*/\1/p'
 
 
-build: build-stamp
-build-arch: patch
+build: $(QUILT_STAMPFN) build-stamp
+#build-arch: patch
+build-arch:
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -41,7 +44,8 @@
 
 	touch build-arch-stamp
 
-build-indep: patch
+#build-indep: patch
+build-indep:
 	dh_testdir
 
 	mkdir $(build_thaifonts)
@@ -68,10 +72,10 @@
 build-stamp:
 	touch build-stamp
 
-clean: clean1 unpatch
+#clean: clean1 unpatch
 
-clean1:
-	dh_testdir doc/CJKutf8.txt examples/CJKbabel.tex
+clean: unpatch
+#	dh_testdir doc/CJKutf8.txt examples/CJKbabel.tex
 	dh_testroot
 	rm -f build-stamp build-indep-stamp build-arch-stamp
 
@@ -79,7 +83,7 @@
 
 # If a Debian dpatch has been applied on Makefile, then perform a distclean;
 # if not, do nothing.  Reason: CJK upstream has no cleaning targets.
-	if [ `grep -c distclean Makefile` -gt 0 ]; then $(MAKE) distclean; fi
+	if [ $(shell grep -c distclean Makefile) -gt 0 ]; then $(MAKE) distclean; fi
 
 	# Remove the binary files.
 	rm -rf $(build_thaifonts)
@@ -167,37 +171,22 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
-# And now the simple things for dpatch. Here we only apply/unapply the patches.
-# You can do more things with dpatch, like having patches only applied on
-# a special architecture - see the non-dh version of the sample for this!
-# Command: dpatch patch-template -p "01_cvs-20060425" "Add the latest changes from the development snapshot, up to 25 April 2006." <../cjk20060425.diff >debian/patches/01_cvs-20060425.dpatch
-patch: patch-stamp
-patch-stamp:
-#	dpatch apply 01_cvs-20060714 03_Makefile
-	dpatch apply-all
-
-	touch $@
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 get-orig-source:
 	# Cleaning
 	rm -rf cjk-$(upstream_version)
 	rm -f ../cjk_$(upstream_version).orig.tar.gz
 
 	# Download the latest GIT version and downgrade it to $(isodate).
-	git-clone git://git.sv.gnu.org/cjk.git cjk-$(upstream_version)
-	cd cjk-$(upstream_version) && git reset --hard `git rev-list --all -n 1 --before=$(unixdate)`
+	git clone git://git.sv.gnu.org/cjk.git cjk-$(upstream_version)
+	cd cjk-$(upstream_version) && git reset --hard $(shell 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)/ master | gzip -9 --no-name > ../../tarballs/cjk_$(upstream_version).orig.tar.gz
 
 	# Clean again, because we use svn-buildpackage afterwards.
 	rm -rf cjk-$(upstream_version)
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1 get-orig-source
+.PHONY: build clean binary-indep binary-arch binary install get-orig-source

More information about the Debian-tex-commits mailing list