Package: unifont Version: 1:5.1.20080914-1.2 Severity: normal Tags: patch pending
Dear maintainer,
I've prepared an NMU for unifont (versioned as 1:5.1.20080914-1.3). The diff
is attached to this message.
This just fixes up debian/rules from the last NMU so that:
1. "debian/rules binary-arch" doesn't end up running the
"build-indep" rule (which made "dpkg-buildpackage -B" fail, which
made the buildds fail -- thankfully, they failed quickly)
2. attempts to build in parallel (i.e. "dpkg-buildpackage -j2")
don't fail or do strange things
3. the font files aren't built twice (may or may not be part of #2)
#1 is pretty embarrassing for me, since that's the one type of build
that I can actually do locally.
If these patches aren't terribly convenient for you, you might try:
git clone https://github.com/SamB/debian-unifont.git
(For best results, use with git-buildpackage. See also
<http://www.debian.org/doc/developers-reference/best-pkging-practices.html#bpp-vcs>.)
Regards.
--
Hi! I'm a .signature virus! Copy me into your ~/.signature to help me spread!
diff -u unifont-5.1.20080914/debian/changelog unifont-5.1.20080914/debian/changelog --- unifont-5.1.20080914/debian/changelog +++ unifont-5.1.20080914/debian/changelog @@ -1,3 +1,15 @@ +unifont (1:5.1.20080914-1.3) unstable; urgency=low + + * Non-maintainer upload. + * debian/rules: Split and inline "install" target into "binary-arch" and + "binary-indep" and adjust dependencies. (Without this, + "dpkg-buildpackage -B" ends up running the build-indep rules and dying + on the buildds.) + * debian/rules: Also fix so dpkg-buildpackage -j works, and only builds + the font files once. + + -- Samuel Bronson <[email protected]> Sat, 12 Jan 2013 13:09:44 -0500 + unifont (1:5.1.20080914-1.2) unstable; urgency=low [ Samuel Bronson ] diff -u unifont-5.1.20080914/debian/rules unifont-5.1.20080914/debian/rules --- unifont-5.1.20080914/debian/rules +++ unifont-5.1.20080914/debian/rules @@ -14,7 +14,8 @@ build-stamp-indep: build-stamp-arch dh_testdir rm -f font/precompiled/unifont* - $(MAKE) -C font + # Parallel builds are broken, so we need -j1 here + $(MAKE) -C font -j1 cp font/compiled/unifont-*.bdf.gz font/precompiled/unifont.bdf.gz rm -f font/compiled/unifontfull-jp-*.hex cp font/compiled/unifontfull-*.hex font/precompiled/unifontfull.hex @@ -35,20 +36,22 @@ rm -f font/precompiled/unifont* rm -f build-stamp-arch build-stamp-indep -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - dh_install --sourcedir=debian/tmp + +DESTDIR=$(CURDIR)/debian/tmp +PREFIX=$(DESTDIR)/usr # # The font files are architecture independent. # -binary-indep: build install +binary-indep: build-indep dh_testdir -i dh_testroot -i +# <install> + dh_clean -i + dh_installdirs -i + $(MAKE) -C font install PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) + dh_install -i --sourcedir=debian/tmp +# </install> dh_installdocs -i dh_installchangelogs -i dh_installxfonts -i @@ -64,9 +67,16 @@ # # Architecture-specific files here -- unifont-bin # -binary-arch: build install +binary-arch: build-arch dh_testdir -a dh_testroot -a +# <install> + dh_clean -k -a + dh_installdirs -a + $(MAKE) -C src install PREFIX=$(PREFIX) + $(MAKE) -C man install PREFIX=$(PREFIX) + dh_install -a --sourcedir=debian/tmp +# </install> dh_installdocs -a dh_installchangelogs -a dh_installman -a @@ -86 +96 @@ -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build-indep build-arch build clean binary-indep binary-arch binary
signature.asc
Description: Digital signature
