From fb8fab66edb76e10899adb7b54c3fb296ec42504 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Jan 2012 21:33:29 +0000
Subject: [PATCH] fixes

---
 .gitignore                       | 1 +
 Makefile                         | 2 +-
 debian/xfonts-traditional.postrm | 4 +++-
 debian/xfonts-traditional.prerm  | 8 ++++----
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3cdc9b..e290cfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ debian/debhelper.log
 debian/xfonts-traditional
 debian/xfonts-traditional.substvars
 debian/xfonts-traditional.debhelper.log
+debian/xfonts-traditional.*.debhelper
diff --git a/Makefile b/Makefile
index b914bd5..75c9eb8 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ install:
 		<$(utility) >$(utility).sedded
 	$(install) -m755 -d $(DESTDIR)$(prefix)/{bin,share/{man/man8,$(package)/rules}}
 	$(install) -m755 $(utility).sedded $(DESTDIR)$(prefix)/bin/$(utility)
-	$(install) -m755 $(utility).8 $(DESTDIR)$(prefix)/man/man8/.
+	$(install) -m755 $(utility).8 $(DESTDIR)$(prefix)/share/man/man8/.
 	$(install) -m644 rules/* $(DESTDIR)$(prefix)/share/$(package)/rules/
 
 clean:
diff --git a/debian/xfonts-traditional.postrm b/debian/xfonts-traditional.postrm
index e6d6bed..303188e 100755
--- a/debian/xfonts-traditional.postrm
+++ b/debian/xfonts-traditional.postrm
@@ -1,9 +1,11 @@
 #!/bin/sh
 set -e
 . /usr/share/debconf/confmodule
+
+#DEBHELPER#
+
 case "$1" in
 purge)
-	db_purge || true
 	aliasfile=/etc/X11/fonts/misc/xfonts-base.alias
 	rm -f $aliasfile.trad
 	;;
diff --git a/debian/xfonts-traditional.prerm b/debian/xfonts-traditional.prerm
index 5cb9a99..8b1ed6b 100755
--- a/debian/xfonts-traditional.prerm
+++ b/debian/xfonts-traditional.prerm
@@ -7,10 +7,10 @@ case "$1" in
 
 remove)
 
-	echo 'Checking that "fixed" is not from xfonts-traditional..."
+	echo 'Checking that "fixed" is not from xfonts-traditional...'
 
 	if grep '^fixed[	 ][	 ]*-trad-'; then
-		cat >&2 <<END
+		cat >&2 <<'END'
 Removing xfonts-traditional would break your X server by removing "fixed".
 
 You should not remove xfonts-traditional while "fixed" refers to one
@@ -33,12 +33,12 @@ END
 		   -name xfonts-traditional.done -o 
 		   -name xfonts-traditional.done.new -o 
 		   -name trad--\*.pcf.gz.new \) \
-		-print0 | xargs -0r rm
+		-print0 | xargs -0r rm --
 
 	find /usr/share/fonts/X11 /usr/local/share/fonts/X11 \
 		   -type f \
 		   -name trad--\*.pcf.gz \
-		-print0 | xargs -0r rm
+		-print0 | xargs -0r rm --
 
 	;;
 
-- 
2.11.0