tags 398370 + patch
tags 395796 + patch
tags 362388 + patch
thanks
I've updated the xfont-knickers package to hopefully current standards.
See top of patch (debian/changelog) for full change descriptions.
Patch attached.
--
Regards,
Andreas Henriksson
diff -ur xfonts-knickers-0.0.1.orig/debian/changelog
xfonts-knickers-0.0.1/debian/changelog
--- xfonts-knickers-0.0.1.orig/debian/changelog 2006-11-16 16:31:00.000000000
+0100
+++ xfonts-knickers-0.0.1/debian/changelog 2006-11-16 17:00:58.000000000
+0100
@@ -1,3 +1,16 @@
+xfonts-knickers (0.0.1-4) unstable; urgency=medium
+
+ * NMU
+ * Add dependency on xfonts-utils, remove xbase-clients (Closes: #398370)
+ * Change font paths to /usr/share/font/X11/misc everywhere (Closes: #362388)
+ * Safeguard mkfontsdir and update-fonts-alias in postrm as we can't rely on
+ xfonts-utils being available at that time.
+ * Build-dep on debhelper >= 5.0.29 as suggested by joeyh in #362388.
+ * Raise DH_COMPAT to 5.
+ * Fix spelling error in debian/rules, buld -> build. (Closes: #395796)
+
+ -- Andreas Henriksson <[EMAIL PROTECTED]> Thu, 16 Nov 2006 16:52:40 +0100
+
xfonts-knickers (0.0.1-3) unstable; urgency=low
* debian/control (Standards-Version): bump to 3.6.1.0.
diff -ur xfonts-knickers-0.0.1.orig/debian/control
xfonts-knickers-0.0.1/debian/control
--- xfonts-knickers-0.0.1.orig/debian/control 2006-11-16 16:31:00.000000000
+0100
+++ xfonts-knickers-0.0.1/debian/control 2006-11-16 16:58:36.000000000
+0100
@@ -2,12 +2,12 @@
Section: x11
Priority: optional
Maintainer: Jon Bernard <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.0.1), xutils
+Build-Depends-Indep: debhelper (>= 5.0.29), xutils
Standards-Version: 3.6.1.0
Package: xfonts-knickers
Architecture: all
-Depends: xbase-clients
+Depends: xfonts-utils
Description: Knickers font for X
A sans-serif, fixed width font with iso8859 encoding.
Only available as 10 point with medium weight.
diff -ur xfonts-knickers-0.0.1.orig/debian/README.Debian
xfonts-knickers-0.0.1/debian/README.Debian
--- xfonts-knickers-0.0.1.orig/debian/README.Debian 2006-11-16
16:31:00.000000000 +0100
+++ xfonts-knickers-0.0.1/debian/README.Debian 2006-11-16 16:50:40.000000000
+0100
@@ -1,7 +1,7 @@
To make use of knickers right away you may need to restart your X server
or you can issue the following command:
-$ xset -fp /usr/lib/X11/fonts/misc
-$ xset +fp /usr/lib/X11/fonts/misc
+$ xset -fp /usr/share/fonts/X11/misc
+$ xset +fp /usr/share/fonts/X11/misc
Enjoy!
diff -ur xfonts-knickers-0.0.1.orig/debian/rules
xfonts-knickers-0.0.1/debian/rules
--- xfonts-knickers-0.0.1.orig/debian/rules 2006-11-16 16:31:00.000000000
+0100
+++ xfonts-knickers-0.0.1/debian/rules 2006-11-16 16:59:50.000000000 +0100
@@ -2,12 +2,12 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-export DH_COMPAT=4
+export DH_COMPAT=5
#export DH_VERBOSE=1
package=xfonts-knickers
-buld: build-stamp
+build: build-stamp
build-stamp:
dh_testdir
@@ -27,7 +27,7 @@
install -m644 debian/xfonts-knickers.alias \
$(CURDIR)/debian/$(package)/etc/X11/fonts/misc/xfonts-knickers.alias
bdftopcf knickers.bdf | gzip --best > \
-
$(CURDIR)/debian/$(package)/usr/X11R6/lib/X11/fonts/misc/knickers.pcf.gz
+
$(CURDIR)/debian/$(package)/usr/share/fonts/X11/misc/knickers.pcf.gz
dh_installdocs debian/permission
binary-indep: build install
diff -ur xfonts-knickers-0.0.1.orig/debian/xfonts-knickers.dirs
xfonts-knickers-0.0.1/debian/xfonts-knickers.dirs
--- xfonts-knickers-0.0.1.orig/debian/xfonts-knickers.dirs 2006-11-16
16:31:00.000000000 +0100
+++ xfonts-knickers-0.0.1/debian/xfonts-knickers.dirs 2006-11-16
16:36:10.000000000 +0100
@@ -1,2 +1,2 @@
-usr/X11R6/lib/X11/fonts/misc
+usr/share/fonts/X11/misc
etc/X11/fonts/misc
diff -ur xfonts-knickers-0.0.1.orig/debian/xfonts-knickers.postinst
xfonts-knickers-0.0.1/debian/xfonts-knickers.postinst
--- xfonts-knickers-0.0.1.orig/debian/xfonts-knickers.postinst 2006-11-16
16:31:00.000000000 +0100
+++ xfonts-knickers-0.0.1/debian/xfonts-knickers.postinst 2006-11-16
16:40:22.000000000 +0100
@@ -3,8 +3,8 @@
set -e
if [ "$1" = "configure" ]; then
- ( cd /usr/X11R6/lib/X11/fonts/misc ; /usr/X11R6/bin/mkfontdir )
- update-fonts-alias misc
+ ( cd /usr/share/fonts/X11/misc && mkfontdir )
+ update-fonts-alias misc
fi
#DEBHELPER#
diff -ur xfonts-knickers-0.0.1.orig/debian/xfonts-knickers.postrm
xfonts-knickers-0.0.1/debian/xfonts-knickers.postrm
--- xfonts-knickers-0.0.1.orig/debian/xfonts-knickers.postrm 2006-11-16
16:31:00.000000000 +0100
+++ xfonts-knickers-0.0.1/debian/xfonts-knickers.postrm 2006-11-16
16:42:57.000000000 +0100
@@ -2,10 +2,16 @@
set -e
+FONTDIR="/usr/share/fonts/X11/misc"
-if test -d /usr/X11R6/lib/X11/fonts/misc; then
- ( cd /usr/X11R6/lib/X11/fonts/misc ; /usr/X11R6/bin/mkfontdir )
- update-fonts-alias misc
+if test -d $FONTDIR; then
+ if which mkfontdir >/dev/null 2>&1 ; then
+ ( cd $FONTDIR && mkfontdir )
+ fi
+
+ if which update-fonts-alias >/dev/null 2>&1 ; then
+ update-fonts-alias misc
+ fi
fi
#DEBHELPER#
