Op 04-01-08 14:30, schreef Lucas Nussbaum:
> 
> If you are around and have a diff ready, please send it to me ; my
> computer might be faster.

I have quite a modified debian/rules, because the upstream tools have
changed their API a bit; so I'll send you a diff without correct line numbers.

In essence I've changed DH_OPTIONS with MY_DH_OPTIONS, and it seems to work
here.

At the beginning of debian/rules, your patch:

+# Support parallel builds when available.
+# Cfr. Debian bugs #209008 and #458740.
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS)
+endif


Then around @@ -196,7 +210,7 @@:

 $(clean_fonts): abbrev = $(patsubst clean_%,%,$@)
-$(clean_fonts): DH_OPTIONS = -p$(bin-package) -P$(d)
+$(clean_fonts): MY_DH_OPTIONS = -p$(bin-package) -P$(d)
 $(clean_fonts):
        @cd debian && \
            sed -e 's/@TYPEFACE@/$(typeface)/g' \


And a bit further around @@ -207,46 +221,46 @@:

                -e 's/@FAMILYNAME@/$(familyname)/g' \
                -e 's/@TYPEFACE@/$(typeface)/g' \
                copyright.in > $(bin-package).copyright
-       dh_clean $(DH_OPTIONS)
+       dh_clean $(MY_DH_OPTIONS)
        rm -f build-stamp.$(abbrev)


 install: build $(install_fonts)
 $(install_fonts): abbrev = $(patsubst install_%,%,$@)
-$(install_fonts): DH_OPTIONS = -p$(bin-package) -P$(d)
+$(install_fonts): MY_DH_OPTIONS = -p$(bin-package) -P$(d)
 $(install_fonts):
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
+       dh_testdir $(MY_DH_OPTIONS)
+       dh_testroot $(MY_DH_OPTIONS)
+       dh_clean -k  $(MY_DH_OPTIONS)
+       dh_installdirs $(MY_DH_OPTIONS)

 binary-indep: build install $(binary_fonts)
 $(binary_fonts): abbrev = $(patsubst binary_%,%,$@)
-$(binary_fonts): DH_OPTIONS = -p$(bin-package) -P$(d)
+$(binary_fonts): MY_DH_OPTIONS = -p$(bin-package) -P$(d)
 $(binary_fonts):
-       dh_testdir $(DH_OPTIONS)
-       dh_testroot $(DH_OPTIONS)
-       dh_installchangelogs $(DH_OPTIONS)
-       dh_installdocs $(DH_OPTIONS)
-       dh_installexamples $(DH_OPTIONS)
-       dh_install $(DH_OPTIONS) $(builddir)/*.afm $(dest_afmpath)/
-       dh_install $(DH_OPTIONS) $(builddir)/$(uninamestem)*.tfm 
$(dest_uni-tfmpath)/
-       dh_install $(DH_OPTIONS) $(builddir)/$(sfdnamestem)*.tfm 
$(dest_sfd-tfmpath)/
-       dh_install $(DH_OPTIONS) $(builddir)/*.pfb $(dest_type1path)/
-       dh_install $(DH_OPTIONS) $(builddir)/*.vf $(dest_vfpath)/
-       dh_install $(DH_OPTIONS) $(builddir)/$(uninamestem).map
/usr/share/texmf/fonts/map/dvips/arphic/
-       dh_install $(DH_OPTIONS)
$(builddir)/c$(nfss_fontencoding)$(namestem).fd{,x} $(dest_fd)/
-       dh_install $(DH_OPTIONS) $(builddir)/c70$(namestem).fd{,x}
usr/share/texmf/tex/latex/CJK/UTF8/
-       dh_link $(DH_OPTIONS)
-       dh_installtex $(DH_OPTIONS) --flavor=map:config_for_all_maps
map=Map,$(uninamestem).map
-       dh_strip $(DH_OPTIONS)
-       dh_compress $(DH_OPTIONS)
-       dh_fixperms $(DH_OPTIONS)
-       dh_perl $(DH_OPTIONS)
-       dh_installdeb $(DH_OPTIONS)
-       dh_gencontrol $(DH_OPTIONS)
-       dh_md5sums $(DH_OPTIONS)
-       dh_builddeb $(DH_OPTIONS)
+       dh_testdir $(MY_DH_OPTIONS)
+       dh_testroot $(MY_DH_OPTIONS)
+       dh_installchangelogs $(MY_DH_OPTIONS)
+       dh_installdocs $(MY_DH_OPTIONS)
+       dh_installexamples $(MY_DH_OPTIONS)
+       dh_install $(MY_DH_OPTIONS) $(builddir)/*.afm $(dest_afmpath)/
+       dh_install $(MY_DH_OPTIONS) $(builddir)/$(uninamestem)*.tfm
$(dest_uni-tfmpath)/
+       dh_install $(MY_DH_OPTIONS) $(builddir)/$(sfdnamestem)*.tfm
$(dest_sfd-tfmpath)/
+       dh_install $(MY_DH_OPTIONS) $(builddir)/*.pfb $(dest_type1path)/
+       dh_install $(MY_DH_OPTIONS) $(builddir)/*.vf $(dest_vfpath)/
+       dh_install $(MY_DH_OPTIONS) $(builddir)/$(uninamestem).map
/usr/share/texmf/fonts/map/dvips/arphic/
+       dh_install $(MY_DH_OPTIONS)
$(builddir)/c$(nfss_fontencoding)$(namestem).fd{,x} $(dest_fd)/
+       dh_install $(MY_DH_OPTIONS) $(builddir)/c70$(namestem).fd{,x}
usr/share/texmf/tex/latex/CJK/UTF8/
+       dh_link $(MY_DH_OPTIONS)
+       dh_installtex $(MY_DH_OPTIONS) --flavor=map:config_for_all_maps
map=Map,$(uninamestem).map
+       dh_strip $(MY_DH_OPTIONS)
+       dh_compress $(MY_DH_OPTIONS)
+       dh_fixperms $(MY_DH_OPTIONS)
+       dh_perl $(MY_DH_OPTIONS)
+       dh_installdeb $(MY_DH_OPTIONS)
+       dh_gencontrol $(MY_DH_OPTIONS)
+       dh_md5sums $(MY_DH_OPTIONS)
+       dh_builddeb $(MY_DH_OPTIONS)


I hope this works.

Best regards


-- 
Danai SAE-HAN (韓達耐)

題目:《初入淮河》(選一)
作者:楊萬里(1127-1206)

船離洪澤岸頭沙,人到淮河意不佳。
何必桑乾方是遠,中流以北即天涯!

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to