[Debian-tex-commits] SVN CJK commit + diffs: r4483 - cjk/trunk/debian

Danai Sae-Han danai at alioth.debian.org
Mon Dec 21 22:35:02 UTC 2009


Author: danai
Date: 2009-12-21 22:35:01 +0000 (Mon, 21 Dec 2009)
New Revision: 4483

Modified:
   cjk/trunk/debian/changelog
   cjk/trunk/debian/control
   cjk/trunk/debian/rules
Log:
Fix bug #561789, switch to tex-common (>=2.03) and finalise
cjk (4.8.2+git20090105-3).


Modified: cjk/trunk/debian/changelog
===================================================================
--- cjk/trunk/debian/changelog	2009-12-21 22:31:24 UTC (rev 4482)
+++ cjk/trunk/debian/changelog	2009-12-21 22:35:01 UTC (rev 4483)
@@ -1,3 +1,21 @@
+cjk (4.8.2+git20090105-3) unstable; urgency=low
+
+  * The "Christmas present" release.
+  * [control,rules,patches/*] Switch from dpatch to quilt to comply with
+    the 3.0 (quilt) source format.
+  * [rules] Switch from "language=" to "hyphen=" after dh_installtex.
+  * [control]
+     - Depend and Build-Depend on tex-common (>= 2.03) due to syntax
+       changes with dh_installtex;
+     - only use one email address in the "Maintainer" field: move the
+       Debian TeX ML address to "Uploaders" instead and remove my own
+       email address from the "Uploaders" field.  This should fix bug
+       "Erroneous Maintainer field" (Closes: #561789); thanks to Florian
+       Ernst for the bug report.
+  * Rebuild against libkpathsea-dev as it has bumped to v5.
+
+ -- Danai SAE-HAN (韓達耐) <danai at debian.org>  Mon, 21 Dec 2009 23:33:45 +0100
+
 cjk (4.8.2+git20090105-2) unstable; urgency=medium
 
   * The "Doh, wrong version" release.

Modified: cjk/trunk/debian/control
===================================================================
--- cjk/trunk/debian/control	2009-12-21 22:31:24 UTC (rev 4482)
+++ cjk/trunk/debian/control	2009-12-21 22:35:01 UTC (rev 4483)
@@ -1,10 +1,10 @@
 Source: cjk
-Build-Depends: debhelper (>= 7), quilt, 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 (>= 2.03)
 Build-Depends-Indep: texlive-base-bin, perl-base (>= 5.8.0), texlive-font-utils, sharutils, thailatex
 Section: tex
 Priority: optional
-Maintainer: Debian TeX maintainers <debian-tex-maint at lists.debian.org>, Danai SAE-HAN (韓達耐) <danai at debian.org>
-Uploaders: Danai SAE-HAN (韓達耐) <danai at debian.org>
+Maintainer: Danai SAE-HAN (韓達耐) <danai at debian.org>
+Uploaders: Debian TeX maintainers <debian-tex-maint at lists.debian.org>
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/debian-tex/cjk/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-tex/cjk/trunk/
@@ -12,7 +12,7 @@
 
 Package: latex-cjk-common
 Architecture: any
-Depends: texlive-latex-base, texlive-font-utils (>= 2007.dfsg.2-1), tex-common (>= 1.20), ${misc:Depends}, ${shlibs:Depends}
+Depends: texlive-latex-base, texlive-font-utils (>= 2007.dfsg.2-1), tex-common (>= 2.03), ${misc:Depends}, ${shlibs:Depends}
 Recommends: latex-cjk-xcjk
 Conflicts: cjk-latex (<= 4.5.1), latex-cjk
 Replaces: cjk-latex
@@ -31,7 +31,7 @@
 
 Package: latex-cjk-xcjk
 Architecture: all
-Depends: latex-cjk-common (>= ${source:Version}), texlive-xetex, tex-common (>= 1.20), ${misc:Depends}
+Depends: latex-cjk-common (>= ${source:Version}), texlive-xetex, tex-common (>= 2.03), ${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
 Conflicts: cjk-latex (<= 4.5.1)
 Description: XeTeX module of LaTeX CJK
@@ -51,7 +51,7 @@
 
 Package: latex-cjk-chinese
 Architecture: any
-Depends: latex-cjk-common (= ${binary:Version}), tex-common (>= 1.20), ${misc:Depends}, ${shlibs:Depends}
+Depends: latex-cjk-common (= ${binary:Version}), tex-common (>= 2.03), ${misc:Depends}, ${shlibs:Depends}
 Recommends: latex-cjk-chinese-arphic-bsmi00lp, latex-cjk-chinese-arphic-bkai00mp, latex-cjk-chinese-arphic-gbsn00lp, latex-cjk-chinese-arphic-gkai00mp
 Suggests: hbf-cns40-b5, hbf-jfs56
 Conflicts: cjk-latex (<= 4.5.1), tfm-arphic-bsmi00lp (<= 2.11.2-0.1), tfm-arphic-bkai00mp (<= 2.11.2-0.1), tfm-arphic-gbsn00lp (<= 2.11.2-0.1), tfm-arphic-gkai00mp (<= 2.11.2-0.1)
@@ -69,7 +69,7 @@
 Package: latex-cjk-japanese
 Architecture: any
 Recommends: latex-cjk-japanese-wadalab
-Depends: latex-cjk-common (= ${binary:Version}), tex-common (>= 1.20), ${misc:Depends}, ${shlibs:Depends}
+Depends: latex-cjk-common (= ${binary:Version}), tex-common (>= 2.03), ${misc:Depends}, ${shlibs:Depends}
 Suggests: hbf-kanji48
 Conflicts: cjk-latex (<= 4.5.1)
 Description: Japanese module of LaTeX CJK
@@ -84,7 +84,7 @@
 Package: latex-cjk-korean
 Architecture: all
 Recommends: ko.tex-extra-hlfont
-Depends: latex-cjk-common (>= ${source:Version}), tex-common (>= 1.20), ${misc:Depends}
+Depends: latex-cjk-common (>= ${source:Version}), tex-common (>= 2.03), ${misc:Depends}
 Conflicts: cjk-latex (<= 4.5.1)
 Description: Korean module of LaTeX CJK
  CJK is a macro package for LaTeX.  This package gives you the possibility
@@ -92,7 +92,7 @@
 
 Package: latex-cjk-thai
 Architecture: all
-Depends: latex-cjk-common (>= ${source:Version}), texlive-latex-base, tex-common (>= 1.20), thailatex (>= 0.4.2), ${misc:Depends}
+Depends: latex-cjk-common (>= ${source:Version}), texlive-latex-base, tex-common (>= 2.03), thailatex (>= 0.4.2), ${misc:Depends}
 Conflicts: cjk-latex (<= 4.5.1)
 Description: Thai module of LaTeX CJK
  CJK is a macro package for LaTeX.  This package gives you the possibility

Modified: cjk/trunk/debian/rules
===================================================================
--- cjk/trunk/debian/rules	2009-12-21 22:31:24 UTC (rev 4482)
+++ cjk/trunk/debian/rules	2009-12-21 22:35:01 UTC (rev 4483)
@@ -35,7 +35,6 @@
 
 
 build: $(QUILT_STAMPFN) build-stamp
-#build-arch: patch
 build-arch:
 	dh_testdir
 
@@ -44,7 +43,6 @@
 
 	touch build-arch-stamp
 
-#build-indep: patch
 build-indep:
 	dh_testdir
 
@@ -81,7 +79,7 @@
 
 	# Add here commands to clean up after the build process.
 
-# If a Debian dpatch has been applied on Makefile, then perform a distclean;
+# If a Debian patch has been applied on Makefile, perform a distclean;
 # if not, do nothing.  Reason: CJK upstream has no cleaning targets.
 	if [ $(shell grep -c distclean Makefile) -gt 0 ]; then $(MAKE) distclean; fi
 
@@ -101,7 +99,6 @@
 
 	dh_clean
 
-
 install:
 	dh_testdir
 	dh_testroot
@@ -110,7 +107,6 @@
 	# Add here commands to install the package into debian/tmp.
 	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
 
-
 # Build architecture-independent files here.
 binary-indep: build-indep
 	dh_testdir -i
@@ -147,7 +143,6 @@
 
 	chmod +x debian/latex-cjk-common/usr/share/latex-cjk-common/utils/subfonts/*.pl
 
-
 	dh_link -platex-cjk-chinese usr/share/doc/latex-cjk-common usr/share/doc/latex-cjk-chinese
 	dh_link -platex-cjk-japanese usr/share/doc/latex-cjk-common usr/share/doc/latex-cjk-japanese
 
@@ -155,7 +150,7 @@
 	dh_link -platex-cjk-common usr/share/doc/latex-cjk-common usr/share/doc/texmf/latex/latex-cjk
 
 	dh_installtex -platex-cjk-common -platex-cjk-japanese
-	dh_installtex -platex-cjk-chinese --priority=20 language=pinyin,pyhyph.tex
+	dh_installtex -platex-cjk-chinese --priority=20 hyphen=pinyin,pyhyph.tex
 
 	dh_installdocs -platex-cjk-common
 	dh_installexamples -platex-cjk-common




More information about the Debian-tex-commits mailing list