From 9b70484c5fbbaa5b73ba7ba24cb2d0c1de5281cd Mon Sep 17 00:00:00 2001
From: Paul Hardy <unifoundry@unifoundry.com>
Date: Wed, 18 Dec 2013 04:09:34 +0000
Subject: [PATCH] unifont-6.3.20131217.tar.gz

* doc/Makefile: removed redirection of texi2pdf output.
* doc/unifont.pdf: rebuilt file.
* font/Makefile:
  - Don't modify PCF fonts with FontForge, which alters them
    so grub-mkfont can't read them.
  - In font/compiled, insert $(VERSION) into unifont.sfd name.
* font/ttfsrc/Makefile (clean): remove *.bdf, so unifont_sample.bdf
  is removed.
* README: removed date stamp at top of file.
---
 ChangeLog            | 12 ++++++++++++
 Makefile             |  2 +-
 NEWS                 | 12 ++++++++++++
 README               |  3 ---
 doc/Makefile         |  2 +-
 font/Makefile        | 16 +++-------------
 font/ttfsrc/Makefile |  3 ++-
 hangul/Makefile      |  2 +-
 8 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 32892cf..81f6df7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-12-27  Paul Hardy  <unifoundry@unifoundry.com>
+
+	* doc/Makefile: removed redirection of texi2pdf output.
+	* doc/unifont.pdf: rebuilt file.
+	* font/Makefile:
+	  - Don't modify PCF fonts with FontForge, which alters them
+	    so grub-mkfont can't read them.
+	  - In font/compiled, insert $(VERSION) into unifont.sfd name.
+	* font/ttfsrc/Makefile (clean): remove *.bdf, so unifont_sample.bdf
+	  is removed.
+	* README: removed date stamp at top of file.
+
 2013-12-15  Paul Hardy  <unifoundry@unifoundry.com>
 
 	* src/unihex2png: new program to convert unifont.hex to PNG image.
diff --git a/Makefile b/Makefile
index e625de0..556f5a6 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
 SHELL = /bin/sh
 INSTALL = install
 
-DATE = 20131215
+DATE = 20131217
 MAJORVERSION = 6.3
 VERSION = $(MAJORVERSION).$(DATE)
 
diff --git a/NEWS b/NEWS
index 1f44a5d..daec938 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+2013-12-17: Release 6.3.20131217
+
+   This fixes three bugs:
+
+        * doc/Makefile: removed redirection of texi2pdf output.
+        * font/Makefile: don't modify PCF fonts with FontForge,
+          which alters them so grub-mkfont can't read them.
+        * font/ttfsrc/Makefile: remove *.bdf so unifont_sample.bdf
+          gets deleted.
+
+   Also includes a few formatting changes; see ChangeLog.
+
 2013-12-15: Release 6.3.20131215
 
    This version introduces unihex2png and unipng2hex, two Perl scripts
diff --git a/README b/README
index 31c700d..231fe63 100644
--- a/README
+++ b/README
@@ -1,7 +1,4 @@
 
-Subject: Unifont package version 6.3.20131215
-
-
 OVERVIEW
 --------
 GNU Unifont is an official GNU package.  It is a dual-width
diff --git a/doc/Makefile b/doc/Makefile
index b68a539..3b836cc 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -16,7 +16,7 @@ OUTPUT_FILES = unifont.info unifont.txt unifont.pdf
 	$(MAKEINFO) --plaintext $< -o $@
 
 .texi.pdf:
-	$(TEXI2PDF) $< > $@
+	$(TEXI2PDF) $<
 
 #
 # Comment out the "all:" line to make the documents.  The default is
diff --git a/font/Makefile b/font/Makefile
index f7e1fb0..7499bd9 100644
--- a/font/Makefile
+++ b/font/Makefile
@@ -18,7 +18,7 @@ FONTFORGE = fontforge
 # assembly date of this version
 #
 MAJORVERSION = 6.3
-DATE = 20131215
+DATE = 20131217
 VERSION = $(MAJORVERSION).$(DATE)
 
 COPYRIGHT = "Copyright (C) 2013 Roman Czyborra, Paul Hardy, et al.  \
@@ -149,19 +149,9 @@ bdf: hex
 pcf: bdf
 	bdftopcf <$(COMPILED_DIR)/unifont-$(VERSION).bdf \
 	         >$(COMPILED_DIR)/unifont-$(VERSION).pcf
-	$(FONTFORGE) -lang=ff -c \
-	   'Open($$1); \
-	    SetFontNames("UnifontMedium", "GNU", "Unifont", "Medium", $(COPYRIGHT), "$(VERSION)"); \
-	    Save($$1)' \
-	   $(COMPILED_DIR)/unifont-$(VERSION).pcf
 	gzip -f -9 $(COMPILED_DIR)/unifont-$(VERSION).pcf
 	bdftopcf <$(COMPILED_DIR)/unifont_sample-$(VERSION).bdf \
 	         >$(COMPILED_DIR)/unifont_sample-$(VERSION).pcf
-	$(FONTFORGE) -lang=ff -c \
-	   'Open($$1); \
-	    SetFontNames("UnifontSampleMedium", "GNU", "Unifont Sample", "Medium", $(COPYRIGHT), "$(VERSION)"); \
-	    Save($$1)' \
-	   $(COMPILED_DIR)/unifont_sample-$(VERSION).pcf
 	gzip -f -9 $(COMPILED_DIR)/unifont_sample-$(VERSION).pcf
 
 #
@@ -228,12 +218,12 @@ ttf:
 		$(COMPILED_DIR)/unifont_sample-$(VERSION).bdf \
 		$(TTFSRC)/unifont_sample.bdf
 	cd $(TTFSRC) ; make && make clean
-	mv $(TTFSRC)/unifont.sfd $(COMPILED_DIR)/unifont.sfd 
+	mv $(TTFSRC)/unifont.sfd $(COMPILED_DIR)/unifont-$(VERSION).sfd 
 	mv $(TTFSRC)/unifont.ttf \
 		$(COMPILED_DIR)/unifont-$(VERSION).ttf 
 	mv $(TTFSRC)/unifont_sample.ttf \
 		$(COMPILED_DIR)/unifont_sample-$(VERSION).ttf 
-	gzip -f -9 $(COMPILED_DIR)/unifont.sfd 
+	gzip -f -9 $(COMPILED_DIR)/unifont-$(VERSION).sfd 
 
 #
 # Copy the newly created files from $(COMPILED_DIR) to the precompiled/
diff --git a/font/ttfsrc/Makefile b/font/ttfsrc/Makefile
index a0b3728..945dde7 100644
--- a/font/ttfsrc/Makefile
+++ b/font/ttfsrc/Makefile
@@ -9,7 +9,7 @@ COPYRIGHT = "Copyright (C) 2013 Roman Czyborra, Paul Hardy, et al.  \
 Licensed under the GNU General Public License; either version 2, or \
 (at your option) a later version, with the GNU Font Embedding Exception."
 
-VERSION = 6.3.20131215
+VERSION = 6.3.20131217
 
 #
 # How to build unifont.ttf from GNU Unifont's unifont.hex
@@ -100,6 +100,7 @@ sbit:
 clean:
 	\rm -f [0-9A-F].hex
 	\rm -f [0-9A-F].sfd
+	\rm -f *.bdf
 
 distclean: clean
 	\rm -f unifont.bdf
diff --git a/hangul/Makefile b/hangul/Makefile
index 87af3b2..e3f0fcf 100644
--- a/hangul/Makefile
+++ b/hangul/Makefile
@@ -7,7 +7,7 @@ BINDIR = ../bin
 # assembly date of this version
 #
 MAJORVERSION = 6.3
-DATE = 20131215
+DATE = 20131217
 VERSION = $(MAJORVERSION).$(DATE)
 
 COPYRIGHT = "Copyright (C) 2013 Paul Hardy.  \
-- 
2.30.0