From b21cda49ac24014e6fa19f89e75271340f1f0b71 Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Fri, 29 Nov 2024 09:36:17 +0000
Subject: [PATCH] Make a package of X bitmap fonts

---
 debian/clean                   |  2 ++
 debian/control                 | 16 +++++++++++++++-
 debian/rules                   | 15 ++++++++++++++-
 debian/xfonts-bedstead.alias   |  3 +++
 debian/xfonts-bedstead.install |  2 ++
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 debian/xfonts-bedstead.alias
 create mode 100644 debian/xfonts-bedstead.install

diff --git a/debian/clean b/debian/clean
index 768079b..65abc89 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,4 @@
+*.pcf
+*.pcf.gz
 *.psf
 *.psf.gz
diff --git a/debian/control b/debian/control
index 88da6aa..28cc3c3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: bedstead
 Maintainer: Ben Harris <bjh21@bjh21.me.uk>
 Section: non-free/fonts
 Priority: optional
-Build-Depends: fonttools, ghostscript, bdf2psf, debhelper-compat (= 13)
+Build-Depends: fonttools, ghostscript, xfonts-utils, bdf2psf,
+ debhelper-compat (= 13)
 Standards-Version: 4.7.0
 Homepage: https://bjh21.me.uk/bedstead/
 Rules-Requires-Root: no
@@ -29,6 +30,19 @@ Description: monospaced fonts inspired by SAA5050 character generator
  weights (medium and bold) and six widths (ultra condensed, extra
  condensed, condensed, semi condensed, normal, and extended).
 
+Package: xfonts-bedstead
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: console fonts inspired by SAA5050 character generator
+ Bedstead is a family of angular monospaced fonts based on the
+ characters produced by the Mullard SAA5050 series of Teletext
+ Character Generators as used in the BBC Microcomputer.
+ .
+ This packages contains bitmap fonts suitable for use with the
+ X Window System.  It includes 10-pixel and 20-pixel medium fonts
+ and a 20-pixel bold font.
+
 Package: consolefonts-bedstead
 Architecture: all
 Multi-Arch: foreign
diff --git a/debian/rules b/debian/rules
index 9bb1e0b..3b82fff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,18 @@
 override_dh_compress:
 	dh_compress -X.pdf
 
+### Build X fonts from upstream BDFs.
+
+PCFGZS = bedstead-10.pcf.gz bedstead-20.pcf.gz bedstead-bold-20.pcf.gz
+
+%.pcf: %.bdf
+	bdftopcf -t -o $@ $<
+
+%.pcf.gz: %.pcf
+	gzip -9nk $<
+
+### Build console fonts from upstream BDFs.
+
 # We restrict ourselves to codesets that are reasonably well-covered
 # by Bedstead.
 
@@ -44,5 +56,6 @@ symbols = $(B2PDIR)/ascii.set+$(B2PDIR)/linux.set+$(fontset)+:$(B2PDIR)/useful.s
 %.psf.gz: %.psf
 	gzip -9nk $<
 
-execute_after_dh_auto_build: $(PSFGZS)
+
+execute_after_dh_auto_build: $(PCFGZS) $(PSFGZS)
 	true
diff --git a/debian/xfonts-bedstead.alias b/debian/xfonts-bedstead.alias
new file mode 100644
index 0000000..9d1452b
--- /dev/null
+++ b/debian/xfonts-bedstead.alias
@@ -0,0 +1,3 @@
+bedstead-10      -bjh21-Bedstead-Medium-R-Normal--*-10-*-*-C-*-ISO10646-1
+bedstead-20      -bjh21-Bedstead-Medium-R-Normal--*-20-*-*-C-*-ISO10646-1
+bedstead-bold-20 -bjh21-Bedstead-Bold-R-Normal--*-20-*-*-C-*-ISO10646-1
diff --git a/debian/xfonts-bedstead.install b/debian/xfonts-bedstead.install
new file mode 100644
index 0000000..4ff1435
--- /dev/null
+++ b/debian/xfonts-bedstead.install
@@ -0,0 +1,2 @@
+*.pcf.gz /usr/share/fonts/X11/misc
+debian/xfonts-bedstead.alias /etc/X11/fonts/misc
-- 
2.30.2