Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package unifont

The new version fixes two important bugs:

Bug #584672, in which the font contained bogus glyphs for codepoints
either (a) not defined in Unicode 5.1 or (b) in the Private Use Area.

Bug #697902, in which the font files weren't built at package build
time.  This was needed to fix the previous bug (since we can hardly
patch the binaries that are included in the upstream tarball), and is
also the easiest way to stay in compliance with with Policy §2.2.1 and
DFSG §3 <https://lists.debian.org/debian-devel/2010/08/msg00095.html>.

I apologize for how messy the changes are, but it was the best I could
manage given the state of the build systems involved (both
debian/rules and the "upstream" Makefiles).

unblock unifont/1:5.1.20080914-1.3

-- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-4-686-pae (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
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,29 @@
+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 <naes...@gmail.com>  Sat, 12 Jan 2013 13:09:44 -0500
+
+unifont (1:5.1.20080914-1.2) unstable; urgency=low
+
+  [ Samuel Bronson ]
+  * Non-maintainer upload.
+  * Actually build the font files, using build-arch and build-indep to
+    avoid killing any buildds. (Closes: #697902)
+  * Don't include bogus glyphs for unallocated (as of Unicode 5.1) or
+    private-use characters. (Closes: #584672)
+
+  [ Paul Wise ]
+  * Place the newly compiled fonts in precompiled dir after build.
+
+ -- Samuel Bronson <naes...@gmail.com>  Thu, 10 Jan 2013 20:15:33 -0500
+
 unifont (1:5.1.20080914-1.1) unstable; urgency=low
 
   * Non-maintainer upload to achieve release goal of getting rid
diff -u unifont-5.1.20080914/debian/control unifont-5.1.20080914/debian/control
--- unifont-5.1.20080914/debian/control
+++ unifont-5.1.20080914/debian/control
@@ -4,6 +4,7 @@
 Maintainer: Paul Hardy <unifoun...@unifoundry.com>
 Uploaders: Anthony Fok <f...@debian.org>
 Build-Depends: debhelper (>= 5.0.31)
+Build-Depends-Indep: fontforge, xfonts-utils
 Standards-Version: 3.8.0
 Homepage: http://unifoundry.com
 
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
@@ -2,34 +2,56 @@
   
 CFLAGS = -g -O2 -Wall
 
-build: build-stamp
+build-arch: build-stamp-arch
 
-build-stamp:
+build-stamp-arch:
 	dh_testdir
 	$(MAKE) CFLAGS='$(CFLAGS)'
-	touch build-stamp
+	touch $@
+
+build-indep: build-stamp-indep
+
+build-stamp-indep: build-stamp-arch
+	dh_testdir
+	rm -f font/precompiled/unifont*
+	# 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
+	rm -f font/compiled/unifont-jp-*.hex
+	cp font/compiled/unifont-*.hex font/precompiled/unifont.hex
+	cp font/compiled/unifont-*.pcf.gz font/precompiled/unifont.pcf.gz
+	cp font/compiled/unifont-*.ttf font/precompiled/unifont.ttf
+	cp font/compiled/unifont-*.bdf.gz font/precompiled/unifont.bdf.gz
+	touch $@
+
+build: build-indep
 
 clean:
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
-	rm -f build-stamp
+	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
@@ -45,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
@@ -67 +96 @@
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build-indep build-arch build clean binary-indep binary-arch binary
only in patch2:
unchanged:
--- unifont-5.1.20080914.orig/font/Makefile
+++ unifont-5.1.20080914/font/Makefile
@@ -44,15 +44,15 @@
 # Wen Quan Yi CJK ideographs.  This version provides complete coverage
 # of the Unicode 5.1 Basic Multilingual Plane.
 #
-UNIFILES = $(HEXDIR)/blanks.hex $(HEXDIR)/rc-base.hex $(HEXDIR)/wqy-cjk.hex \
-	$(HEXDIR)/rc-hangul.hex $(HEXDIR)/rc-priv.hex
+UNIFILES = $(HEXDIR)/rc-base.hex $(HEXDIR)/wqy-cjk.hex \
+	$(HEXDIR)/rc-hangul.hex
 #
 # These are the files for building GNU Unifont with Roman Czyborra's
 # original Japanese public domain CJK ideographs.  This version is not
 # complete, as it is missing thousands of CJK ideographs.
 #
-UNIORIGFILES = $(HEXDIR)/blanks.hex $(HEXDIR)/rc-base.hex \
-	$(HEXDIR)/rc-cjk.hex $(HEXDIR)/rc-hangul.hex $(HEXDIR)/rc-priv.hex
+UNIORIGFILES = $(HEXDIR)/rc-base.hex \
+	$(HEXDIR)/rc-cjk.hex $(HEXDIR)/rc-hangul.hex
 #
 # Location of  TTF source directory, where TTF font is built.
 #

Reply via email to