From 489ffe219bed26ff9669f17750c08d4d9f867b60 Mon Sep 17 00:00:00 2001
Message-Id: <489ffe219bed26ff9669f17750c08d4d9f867b60.1714051010.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Mon, 9 Jan 2012 20:46:54 +0000
Subject: [PATCH] wip packaging
Organization: Straylight/Edgeware

From: Ian Jackson <ijackson@chiark.greenend.org.uk>

---
 debian/control                      |  2 +-
 debian/lintian-overrides            |  1 +
 debian/xfonts-traditional.config    |  0
 debian/xfonts-traditional.postinst  |  0
 debian/xfonts-traditional.postrm    |  0
 debian/xfonts-traditional.prerm     |  6 +++---
 debian/xfonts-traditional.templates | 14 +++++++-------
 7 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 debian/lintian-overrides
 mode change 100644 => 100755 debian/xfonts-traditional.config
 mode change 100644 => 100755 debian/xfonts-traditional.postinst
 mode change 100644 => 100755 debian/xfonts-traditional.postrm
 mode change 100644 => 100755 debian/xfonts-traditional.prerm

diff --git a/debian/control b/debian/control
index 3fc9dec..1cbfd62 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: xfonts-utils, pcf2bdf
 
 Package: xfonts-traditional
 Architecture: all
-Depends: xfonts-utils, pcf2bdf
+Depends: xfonts-utils, pcf2bdf, ${misc:Depends}, ${perl:Depends}
 Description: Traditional fixed-with fonts for X
  Provides "traditional" versions of fixed-width fonts.
  .
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..bed5102
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1 @@
+using-first-person-in-templates xfonts-traditional/remap-fixed
diff --git a/debian/xfonts-traditional.config b/debian/xfonts-traditional.config
old mode 100644
new mode 100755
diff --git a/debian/xfonts-traditional.postinst b/debian/xfonts-traditional.postinst
old mode 100644
new mode 100755
diff --git a/debian/xfonts-traditional.postrm b/debian/xfonts-traditional.postrm
old mode 100644
new mode 100755
diff --git a/debian/xfonts-traditional.prerm b/debian/xfonts-traditional.prerm
old mode 100644
new mode 100755
index a2786a6..5cb9a99
--- a/debian/xfonts-traditional.prerm
+++ b/debian/xfonts-traditional.prerm
@@ -11,7 +11,7 @@ remove)
 
 	if grep '^fixed[	 ][	 ]*-trad-'; then
 		cat >&2 <<END
-Removing xfonts-traditional would probably your X server by removing "fixed".
+Removing xfonts-traditional would break your X server by removing "fixed".
 
 You should not remove xfonts-traditional while "fixed" refers to one
 of its fonts.  You probably want to check the differences between
@@ -27,8 +27,6 @@ END
 		esac
 	fi
 
-	;;
-
 	find /usr/share/fonts/X11 /usr/local/share/fonts/X11 \
 		   -type f \
 		\( -name xfonts-traditional.log -o \
@@ -42,4 +40,6 @@ END
 		   -name trad--\*.pcf.gz \
 		-print0 | xargs -0r rm
 
+	;;
+
 esac
diff --git a/debian/xfonts-traditional.templates b/debian/xfonts-traditional.templates
index 046f926..f309757 100644
--- a/debian/xfonts-traditional.templates
+++ b/debian/xfonts-traditional.templates
@@ -14,17 +14,17 @@ Template: xfonts-traditional/remap-fixed
 Type: boolean
 Default: true
 Description: Configure system to use traditional "fixed"?
- Would you like the font alias "fixed" remapped to the traditional version?
+ You can have the font alias "fixed" remapped to the traditional version.
  .
- If you say "yes", I will edit /etc/X11/fonts/misc/xfonts-base.alias
+ If you approve, I will edit /etc/X11/fonts/misc/xfonts-base.alias
  for you, and save your old file as xfonts-base.alias.not-trad.  (Note
  that this is a conffile so you may get prompts from dpkg about it in
  the future.)  This will also make the xfonts-traditional package
  harder to safely remove.  
  .
- If you say no I will generate xfonts-base-alias.trad for you to do
- what you like with.
+ Alternatively, if you do not want me to change the default, I will
+ generate xfonts-base-alias.trad for you to do what you like with.
  .
- To revert this change, simply change the alias fixed back from
- "-trad-..."  to "-misc-...", or rename the old file back into place,
- and dpkg-reconfigure xfonts-base-traditional.
+ To revert the change to the default, simply change the alias fixed
+ back from "-trad-..."  to "-misc-...", or rename the old file back
+ into place.
-- 
[mdw]