Dear Danai,
since these two RC bugs are open since quite some time I took the
liberty to prepare an NMU.
It basically takes the patch for parallel build fix from the bug log,
and for the other includes the SFD files simply into debian/sfd, so no
build-dependency over freetype1-tools.
I have built the packages without any problems (but the time ;-) and did
install and did also some test runs.
I don't see a problem with resepct to kpathsea/dh_installtex as you
mentioned it in the one bug log.
I attach the debdiff of the current package to the one I plan to upload.
Note that the debdiff does NOT (!!!) contain the sfd files, I removed
that, since otherwise the diff would be so big.
Please give your remarks, otherwise I plan to upload this package to the
N-DELAYED queue (I still have to check which one it should got to for RC
bugs).
Thanks a lot and all the best
Norbert
-------------------------------------------------------------------------------
Dr. Norbert Preining <[EMAIL PROTECTED]> Vienna University of Technology
Debian Developer <[EMAIL PROTECTED]> Debian TeX Group
gpg DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
-------------------------------------------------------------------------------
OSBASTON (n.)
A point made for the seventh time to somebody who insists that they
know exactly what you mean but clearly hasn't got the faintest idea.
--- Douglas Adams, The Meaning of Liff
diff -Nru latex-cjk-chinese-arphic-1.18/debian/changelog latex-cjk-chinese-arphic-1.18+nmu1/debian/changelog
--- latex-cjk-chinese-arphic-1.18/debian/changelog 2008-01-30 11:49:47.000000000 +0100
+++ latex-cjk-chinese-arphic-1.18+nmu1/debian/changelog 2008-06-05 12:34:48.000000000 +0200
@@ -1,3 +1,14 @@
+latex-cjk-chinese-arphic (1.18+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload to fix 2 RC bugs
+ * Fix problem in the $(clean_fonts) rule when running debian/rules clean
+ with -j: some debian/control entries could be missing. Closes: #465635.
+ (Fix done by Lucas Nussbaum <[EMAIL PROTECTED]>)
+ * Ship the sfd files from freetype1-tools in debian/sfd so we can drop
+ the build-dep on freetype1-tools. Closes: #484081
+
+ -- Norbert Preining <[EMAIL PROTECTED]> Thu, 05 Jun 2008 12:30:15 +0200
+
latex-cjk-chinese-arphic (1.18) unstable; urgency=low
* The "I love vertical writing" release.
diff -Nru latex-cjk-chinese-arphic-1.18/debian/control latex-cjk-chinese-arphic-1.18+nmu1/debian/control
--- latex-cjk-chinese-arphic-1.18/debian/control 2008-02-08 13:10:03.000000000 +0100
+++ latex-cjk-chinese-arphic-1.18+nmu1/debian/control 2008-06-06 10:41:10.000000000 +0200
@@ -3,32 +3,32 @@
Priority: optional
Maintainer: Danai SAE-HAN (ééè) <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 6)
-Build-Depends-Indep: fontforge (>= 0.0.20050717), freetype1-tools (>= 1.4pre.20050518-0.3), texlive-font-utils, ttf-arphic-bsmi00lp, ttf-arphic-bkai00mp, ttf-arphic-gbsn00lp, ttf-arphic-gkai00mp
+Build-Depends-Indep: fontforge (>= 0.0.20050717), texlive-font-utils, ttf-arphic-bsmi00lp, ttf-arphic-bkai00mp, ttf-arphic-gbsn00lp, ttf-arphic-gkai00mp
Standards-Version: 3.7.3
-Package: latex-cjk-chinese-arphic-bsmi00lp
+Package: latex-cjk-chinese-arphic-bkai00mp
Architecture: all
-Suggests: ttf-arphic-bsmi00lp
-Provides: tfm-arphic-bsmi00lp
+Suggests: ttf-arphic-bkai00mp
+Provides: tfm-arphic-bkai00mp
Depends: tex-common (>= 0.19)
Description: traditional Chinese KaiTi fonts for CJK
This package installs all necessary fonts (PFB, AFM, TFM, etc.) to get
the KaiTi Arphic fonts working with the LaTeX macro "CJK" in Big5, MULE
and UTF-8 environments.
.
- The full name of the font is Arphic "AR PL Mingti2L Big5".
+ The full name of the font is Arphic "AR PL KaitiM Big5".
-Package: latex-cjk-chinese-arphic-bkai00mp
+Package: latex-cjk-chinese-arphic-bsmi00lp
Architecture: all
-Suggests: ttf-arphic-bkai00mp
-Provides: tfm-arphic-bkai00mp
+Suggests: ttf-arphic-bsmi00lp
+Provides: tfm-arphic-bsmi00lp
Depends: tex-common (>= 0.19)
Description: traditional Chinese KaiTi fonts for CJK
This package installs all necessary fonts (PFB, AFM, TFM, etc.) to get
the KaiTi Arphic fonts working with the LaTeX macro "CJK" in Big5, MULE
and UTF-8 environments.
.
- The full name of the font is Arphic "AR PL KaitiM Big5".
+ The full name of the font is Arphic "AR PL Mingti2L Big5".
Package: latex-cjk-chinese-arphic-gbsn00lp
Architecture: all
diff -Nru latex-cjk-chinese-arphic-1.18/debian/control.stem.in latex-cjk-chinese-arphic-1.18+nmu1/debian/control.stem.in
--- latex-cjk-chinese-arphic-1.18/debian/control.stem.in 2008-01-28 18:29:32.000000000 +0100
+++ latex-cjk-chinese-arphic-1.18+nmu1/debian/control.stem.in 2008-06-05 12:38:33.000000000 +0200
@@ -3,5 +3,5 @@
Priority: optional
Maintainer: Danai SAE-HAN (ééè) <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 6)
-Build-Depends-Indep: fontforge (>= 0.0.20050717), freetype1-tools (>= 1.4pre.20050518-0.3), texlive-font-utils, ttf-arphic-bsmi00lp, ttf-arphic-bkai00mp, ttf-arphic-gbsn00lp, ttf-arphic-gkai00mp
+Build-Depends-Indep: fontforge (>= 0.0.20050717), texlive-font-utils, ttf-arphic-bsmi00lp, ttf-arphic-bkai00mp, ttf-arphic-gbsn00lp, ttf-arphic-gkai00mp
Standards-Version: 3.7.3
diff -Nru latex-cjk-chinese-arphic-1.18/debian/rules latex-cjk-chinese-arphic-1.18+nmu1/debian/rules
--- latex-cjk-chinese-arphic-1.18/debian/rules 2008-01-30 11:50:37.000000000 +0100
+++ latex-cjk-chinese-arphic-1.18+nmu1/debian/rules 2008-06-05 12:29:53.000000000 +0200
@@ -93,7 +93,9 @@
dest_docpath = usr/share/doc/texmf/fonts/$(fonttype)/$(supplier)
dest_fd = $($(encoding)_texinput)
builddir = build/$(typeface)
-sfddir = /$(texmf)/fonts/sfd
+#sfddir = /$(texmf)/fonts/sfd
+whereami = $(shell pwd)
+sfddir = $(whereami)/debian/sfd
ERR = cat log && echo "Errare humanum! Please have a look at $(builddir)/log." && exit 1
@@ -198,7 +200,9 @@
touch $@
-clean: pre-clean $(clean_fonts)
+clean: $(clean_fonts)
+ cat debian/control.stem.in debian/control.font.* > debian/control
+ rm debian/control.font.*
dh_testdir debian/font.fd.in debian/latex-cjk/subfonts.pe
dh_testroot
rm -f build-stamp
@@ -206,17 +210,16 @@
dh_clean
rm -rf build/
-pre-clean:
- cd debian && cp control.stem.in control
-
$(clean_fonts): abbrev = $(patsubst clean_%,%,$@)
$(clean_fonts): MY_DH_OPTIONS = -p$(bin-package) -P$(d)
-$(clean_fonts):
- @cd debian && \
+$(clean_fonts):
+ # there was a possible race condition here when running with make -j,
+ # with >> control. We append to seperate files instead.
+ cd debian && \
sed -e 's/@TYPEFACE@/$(typeface)/g' \
-e 's/@FAMILYNAME@/$(familyname)/g' \
- control.leaf.in >> control
- @cd debian && \
+ control.leaf.in >> control.font.$(bin-package)
+ cd debian && \
sed -e 's/@ABBREV@/$(abbrev)/g' \
-e 's/@FAMILYNAME@/$(familyname)/g' \
-e 's/@TYPEFACE@/$(typeface)/g' \
@@ -269,4 +272,4 @@
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install \
- $(fonts) $(install_fonts) $(binary_fonts) $(clean_fonts) pre-clean
+ $(fonts) $(install_fonts) $(binary_fonts) $(clean_fonts)
