Bug#730870: pu: unifont -- RoM; NMU Version in Stable Undoes Ubuntu Fix
Adam,
reverted:
--- unifont-5.1.20080914/debian/TODO
+++ unifont-5.1.20080914.orig/debian/TODO
@@ -1,11 +0,0 @@
-
-* Determine optimal X-FontName for debian/ttf-unifont.defoma-hints.
- In particular, determine if huge TrueType fonts must still be listed
- as charcell ("-c-") or if they can be listed as proportional ("-p-")
- without incurring a huge penalty from rasterizing the entire font
- upon loading:
-
- X-FontName = -gnu-unifont-medium-r-normal--0-0-0-0-p-0-iso10646-1
-
-
- -- Paul Hardy <unifoundry@unifoundry.com> Fri, 8 Aug 2008 07:27:23 -0700
reverted:
--- unifont-5.1.20080914/debian/ttf-unifont.postrm
+++ unifont-5.1.20080914.orig/debian/ttf-unifont.postrm
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
- dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-unifont.hints 1:5.1.20080914-1 -- "$@"
-fi
-
-#DEBHELPER#
-
reverted:
--- unifont-5.1.20080914/debian/ttf-unifont.preinst
+++ unifont-5.1.20080914.orig/debian/ttf-unifont.preinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
- dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-unifont.hints 1:5.1.20080914-1 -- "$@"
-fi
-
-#DEBHELPER#
-
diff -u unifont-5.1.20080914/debian/README.Debian unifont-5.1.20080914/debian/README.Debian
--- unifont-5.1.20080914/debian/README.Debian
+++ unifont-5.1.20080914/debian/README.Debian
@@ -1,8 +1,7 @@
unifont for Debian
------------------
-This package was first built and tested under Debian 4.0r3 (Etch,
-the current stable release).
+This package was first built and tested under Debian 4.0r3 (Etch).
The "unifont" package replaces the old "unifont" package, which
just installed a gzipped PCF font. This new version installs the
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
@@ -1,16 +1,16 @@
Source: unifont
-Section: x11
+Section: fonts
Priority: optional
Maintainer: Paul Hardy <unifoundry@unifoundry.com>
-Uploaders: Anthony Fok <foka@debian.org>
-Build-Depends: debhelper (>= 5.0.31)
+Build-Depends: debhelper (>= 8.1.0~)
Build-Depends-Indep: fontforge, xfonts-utils
-Standards-Version: 3.8.0
+Standards-Version: 3.9.4
Homepage: http://unifoundry.com
Package: unifont
+Section: fonts
Architecture: all
-Depends: xfonts-unifont, ttf-unifont
+Depends: xfonts-unifont, ttf-unifont, xfonts-utils, ${misc:Depends}
Replaces: unifont-bin (<< 1:5.1.20080706-1)
Suggests: unifont-bin
Description: font with a glyph for each visible Unicode 5.1 Plane 0 character
@@ -31,8 +31,9 @@
is better than an empty box for a unknown glyph.
Package: xfonts-unifont
+Section: fonts
Architecture: all
-Depends: ${misc:Depends}
+Depends: xfonts-utils, ${misc:Depends}
Replaces: unifont (<< 1:5.1.20080706)
Conflicts: unifont (<< 1:5.1.20080706)
Suggests: ttf-unifont
@@ -52,7 +53,9 @@
that version is scalable to any point size.
Package: ttf-unifont
+Section: fonts
Architecture: all
+Depends: xfonts-utils, ${misc:Depends}
Description: TrueType version of the GNU Unifont
This is a bitmap font converted into a scalable TrueType outline
font. Each pixel in the original bitmap font is represented as
@@ -68,9 +71,11 @@
is better than an empty box for a unknown glyph.
Package: unifont-bin
+Section: x11
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Suggests: unifont, xfonts-utils, fontforge
+Depends: xfonts-utils, fontforge,
+ ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Suggests: unifont
Description: utilities for manipulating the GNU Unifont
This is a set of Perl scripts, C programs, and FontForge scripts
to manipulate Roman Czyborra's GNU Unifont ".hex" format font
diff -u unifont-5.1.20080914/debian/watch unifont-5.1.20080914/debian/watch
--- unifont-5.1.20080914/debian/watch
+++ unifont-5.1.20080914/debian/watch
@@ -7,3 +7,3 @@
# Examine a Webserver directory
-http://www.unifoundry.com/pub/debian/unifont-(.*)\.tar\.gz
+ftp://ftp.gnu.org/gnu/unifont/unifont-([\d\.]+)/unifont-([\d\.]+)\.tar\.gz
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,62 @@
+unifont (1:5.1.20080914-4) unstable; urgency=low
+
+ * debian/control changes:
+ - Updated packaging to conform to Debian Policy version 3.9.4.
+ - Section tag is listed for each package; unifont-bin is in
+ Section x11, and all other packages are in fonts.
+ - Added explicit Depends entry for xfonts-utils for each package,
+ as per Debian Policy Manual 3.9.4 Section 11.8.5, "Packages
+ providing fonts", item 9.
+ - Added Depends for fontforge to unifont-bin; removed weaker
+ Suggests for fontforge from unifont-bin.
+ * debian/rules - CPPFLAGS is now declared and used, for hardening.
+
+ -- Paul Hardy <unifoundry@unifoundry.com> Thu, 14 Nov 2013 05:16:42 -0800
+
+unifont (1:5.1.20080914-3) unstable; urgency=low
+
+ * Changed debian/control unifont Section entry from "x11" to "fonts".
+ * Changed debian/control Depends entries for unifont and ttf-unifont
+ to add "Depends: ${misc:Depends}".
+ * Corrected changelog entries for 1:5.1.20080914-2.
+ * debian/rules uses dpkg-buildflags to set CFLAGS & LDFLAGS, for
+ hardening.
+
+ -- Paul Hardy <unifoundry@unifoundry.com> Sun, 10 Nov 2013 19:55:48 -0800
+
+unifont (1:5.1.20080914-2) unstable; urgency=low
+
+ [ Colin Watson ]
+ * Use maintscript support in dh_installdeb rather than writing out
+ dpkg-maintscript-helper commands by hand. We now simply Pre-Depend on a
+ new enough version of dpkg rather than using 'dpkg-maintscript-helper
+ supports' guards, leading to more predictable behaviour on upgrades.
+ (Closes: #659730)
+
+ [ Paul Hardy ]
+ * Applied above changes that Colin Watson provided in bug report,
+ simplifying debian/ file structure and making the Unifont package
+ more suitable for Ubuntu. The one exception is I didn't create
+ the ttf-unifont.maintscript file, because /etc/defoma/ no longer
+ exists on Debian or Ubuntu.
+ * debian/copyright - updated copyright and licensing information to
+ reflect the latest source code changes and license agreements.
+ * debian/README.Debian - minor change now that Etch is no longer
+ the current release.
+ * README - updated documentation to cover font modifications and the
+ latest license agreements.
+ * Corrected changelog entries for 1:5.1.20080808-1 and 1:5.1.20080914-1.2.
+ * debian/control changes:
+ - Build-Depends: debhelper (>= 8.1.0~), per Colin Watson's above changes.
+ - No separate uploaders.
+ * Created debian/source/format file.
+ * Removed debian/TODO file as it referred to defoma, which is no longer used.
+ * debian/watch now looks at ftp.gnu.org for upstream releases.
+ * Accept NMU of Christian Perrier. (Closes: #634981)
+ * Accept NMUs of Paul Wise and Samuel Bronson. (Closes: #697999, #698067)
+
+ -- Paul Hardy <unifoundry@unifoundry.com> Fri, 01 Nov 2013 18:39:56 -0700
+
unifont (1:5.1.20080914-1.3) unstable; urgency=low
* Non-maintainer upload.
@@ -16,7 +75,7 @@
* 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
+ * Don't include glyphs for unallocated (as of Unicode 5.1) or
private-use characters. (Closes: #584672)
[ Paul Wise ]
@@ -101,7 +160,7 @@
- unibmp2hex.c: forced double-wide glyphs where appropriate in
U+FFxx range
- uniunmask.c: increased buffer size & hard-coded "wide" variable
- to avoid accidentally invoking a half-implemented extended
+ to avoid accidentally invoking half-implemented extended
character widths
- unihex2bmp.c: same changes as in uniunmask.c
* Added to existing documentation
diff -u unifont-5.1.20080914/debian/copyright unifont-5.1.20080914/debian/copyright
--- unifont-5.1.20080914/debian/copyright
+++ unifont-5.1.20080914/debian/copyright
@@ -16,15 +16,16 @@
Additions to complete Unicode 5.1 Plane 0, C programs,
modifications to original programs, & GNU/Linux packaging:
(c) 2007-2008 Paul Hardy
- Mods to debian/ directory and Makefiles for Debian packaging:
- (c) 2008 Anthony Fok & Paul Hardy
+ debian/ control files:
+ (c) 2008 Paul Hardy and Anthony Fok
+ (c) 2013 Paul Wise and Samuel Bronson
+ debian/ text files:
+ (c) 2008-2013 Paul Hardy
Hangul Syllables glyphs (U+AC00..U+D7A3):
(c) 1986-2002 Jeong-Hwan Kim
-License for this package (all software by Paul Hardy, including GNU/Linux
-packaging, all software by Luis Gonzalez Miranda, and Debian modifications
-by Anthony Fok):
+License for all non-font source code in this package:
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -43,55 +44,16 @@
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-The Debian packaging is (C) 2008, Paul Hardy <unifoundry@unifoundry.com>
-and is licensed under the GPL. See above.
+The Debian packaging is (C) 2008, Paul Hardy <unifoundry@unifoundry.com>,
+(C) 2012, Colin Watson, and (C) 2013 Paul Wise and Samuel Bronson.
-License for Roman Czyborra's work (including all Perl scripts in this
-package except "hex2sfd", and all .hex font files except "wqy-cjk.hex"
-and "blanks.hex"):
-
- The following is taken from http://czyborra.com/
-
- All of my works you find here are freeware. You may freely copy,
- use, quote, modify or redistribute them as long as you properly
- attribute my contribution and have given a quick thought about
- whether Roman might perhaps be interested to read what you did
- with his stuff. Horizontal rules don't apply.
-
-
-License for the Wen Quan Yi fonts (used in file "wqy-cjk.hex",
-which is merged with other .hex files to build the default BDF,
-PCF, and TrueType fonts):
-
- The Unibit and other Wen Quan Yi fonts are released under the
- terms of the GNU General Public License (GPL) version 2, with
- the exception that embedding the font in a document does not
- by itself bind that document to the terms of the GNU GPL. The
- following paragraphs are taken from the Wen Quan Yi distribution:
-
- ** GPL v2.0 license with font embedding exception:
-
- As a special exception, if you create a document which
- uses this font, and embed this font or unaltered portions
- of this font into the document, this font does not by
- itself cause the resulting document to be covered by
- the GNU General Public License. This exception does not
- however invalidate any other reasons why the document
- might be covered by the GNU General Public License.
- If you modify this font, you may extend this exception
- to your version of the font, but you are not obligated
- to do so. If you do not wish to do so, delete this
- exception statement from your version.
-
- See http://wqy.sourceforge.net/cgi-bin/enindex.cgi (English)
- or http://wenq.org (Chinese) for more information on Wen Quan Yi.
-
+LICENSE - FONT
+--------------
License for "blanks.hex":
- Paul Hardy has previously released "blanks.hex" into the public domain.
-
+ Paul Hardy has released the "blanks.hex" file into the public domain.
License for the Hangul Syllables (U+AC00..U+D7A3) portion of the font:
@@ -118,2 +80,21 @@
+License for other font files:
+
+ All other glyphs are released under the GNU General Public License
+ (GPL) version 2 or (at your option) a later version, with the GNU
+ font embedding exception:
+
+ ** GPL v2.0 license with font embedding exception:
+
+ As a special exception, if you create a document which
+ uses this font, and embed this font or unaltered portions
+ of this font into the document, this font does not by
+ itself cause the resulting document to be covered by
+ the GNU General Public License. This exception does not
+ however invalidate any other reasons why the document
+ might be covered by the GNU General Public License.
+ If you modify this font, you may extend this exception
+ to your version of the font, but you are not obligated
+ to do so. If you do not wish to do so, delete this
+ exception statement from your version.
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
@@ -1,12 +1,15 @@
#!/usr/bin/make -f
-CFLAGS = -g -O2 -Wall
+# CFLAGS = -g -O2 -Wall
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = -Wall $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS = -Wall $(shell dpkg-buildflags --get LDFLAGS)
build-arch: build-stamp-arch
build-stamp-arch:
dh_testdir
- $(MAKE) CFLAGS='$(CFLAGS)'
+ $(MAKE) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)'
touch $@
build-indep: build-stamp-indep
reverted:
--- unifont-5.1.20080914/debian/ttf-unifont.postinst
+++ unifont-5.1.20080914.orig/debian/ttf-unifont.postinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
- dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-unifont.hints 1:5.1.20080914-1 -- "$@"
-fi
-
-#DEBHELPER#
-
reverted:
--- unifont-5.1.20080914/font/Makefile
+++ unifont-5.1.20080914.orig/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.
#
only in patch2:
unchanged:
--- unifont-5.1.20080914.orig/debian/source/format
+++ unifont-5.1.20080914/debian/source/format
@@ -0,0 +1 @@
+1.0
Reply to: