X Strike Force X.Org X11 SVN commit: r923 - branches/modular/font/xfonts-100dpi/debian
Author: dnusinow
Date: 2005-12-06 00:14:23 -0500 (Tue, 06 Dec 2005)
New Revision: 923
Added:
branches/modular/font/xfonts-100dpi/debian/fonts.alias
branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.postinst.in
branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.postrm.in
Modified:
branches/modular/font/xfonts-100dpi/debian/rules
Log:
* Various changes to get the fonts building. Note that they still don't
update the fonts.dir correctly yet, since I don't understand that as of
right now.
* Add debian/fonts.alias which comes from the alias module of upstream. I
pulled it straight out of the 100dpi folder.
* Add a postinst.in and postrm.in which were taken directly from the
monolithic packaging. There's a lot of great solutions in there and we
should take whatever we can from them.
* Updates to xsfbs
* Pull cleanscripts target from old monolithic debian/rules packaging.
We need this so that the maintainer scripts get regenerated properly
if we do any work on them
* Comment out the posix validation stuff for the maintscripts. We
should keep this but it's potentially a lot of work...
* Update the font_update() function to use the new HFS-compliant font
location of /usr/lib/X11/fonts rather than /usr/X11R6/lib/fonts
Added: branches/modular/font/xfonts-100dpi/debian/fonts.alias
===================================================================
--- branches/modular/font/xfonts-100dpi/debian/fonts.alias 2005-12-02 19:23:28 UTC (rev 922)
+++ branches/modular/font/xfonts-100dpi/debian/fonts.alias 2005-12-06 05:14:23 UTC (rev 923)
@@ -0,0 +1,36 @@
+lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-11-80-100-100-p-69-iso8859-1
+lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-14-100-100-100-p-90-iso8859-1
+lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-17-120-100-100-p-108-iso8859-1
+lucidasans-bolditalic-14 -b&h-lucida-bold-i-normal-sans-20-140-100-100-p-127-iso8859-1
+lucidasans-bolditalic-18 -b&h-lucida-bold-i-normal-sans-25-180-100-100-p-159-iso8859-1
+lucidasans-bolditalic-24 -b&h-lucida-bold-i-normal-sans-34-240-100-100-p-215-iso8859-1
+lucidasans-bold-8 -b&h-lucida-bold-r-normal-sans-11-80-100-100-p-70-iso8859-1
+lucidasans-bold-10 -b&h-lucida-bold-r-normal-sans-14-100-100-100-p-89-iso8859-1
+lucidasans-bold-12 -b&h-lucida-bold-r-normal-sans-17-120-100-100-p-108-iso8859-1
+lucidasans-bold-14 -b&h-lucida-bold-r-normal-sans-20-140-100-100-p-127-iso8859-1
+lucidasans-bold-18 -b&h-lucida-bold-r-normal-sans-25-180-100-100-p-158-iso8859-1
+lucidasans-bold-24 -b&h-lucida-bold-r-normal-sans-34-240-100-100-p-216-iso8859-1
+lucidasans-italic-8 -b&h-lucida-medium-i-normal-sans-11-80-100-100-p-62-iso8859-1
+lucidasans-italic-10 -b&h-lucida-medium-i-normal-sans-14-100-100-100-p-80-iso8859-1
+lucidasans-italic-12 -b&h-lucida-medium-i-normal-sans-17-120-100-100-p-97-iso8859-1
+lucidasans-italic-14 -b&h-lucida-medium-i-normal-sans-20-140-100-100-p-114-iso8859-1
+lucidasans-italic-18 -b&h-lucida-medium-i-normal-sans-25-180-100-100-p-141-iso8859-1
+lucidasans-italic-24 -b&h-lucida-medium-i-normal-sans-34-240-100-100-p-192-iso8859-1
+lucidasans-8 -b&h-lucida-medium-r-normal-sans-11-80-100-100-p-63-iso8859-1
+lucidasans-10 -b&h-lucida-medium-r-normal-sans-14-100-100-100-p-80-iso8859-1
+lucidasans-12 -b&h-lucida-medium-r-normal-sans-17-120-100-100-p-96-iso8859-1
+lucidasans-14 -b&h-lucida-medium-r-normal-sans-20-140-100-100-p-114-iso8859-1
+lucidasans-18 -b&h-lucida-medium-r-normal-sans-25-180-100-100-p-142-iso8859-1
+lucidasans-24 -b&h-lucida-medium-r-normal-sans-34-240-100-100-p-191-iso8859-1
+lucidasanstypewriter-bold-8 -b&h-lucidatypewriter-bold-r-normal-sans-11-80-100-100-m-70-iso8859-1
+lucidasanstypewriter-bold-10 -b&h-lucidatypewriter-bold-r-normal-sans-14-100-100-100-m-80-iso8859-1
+lucidasanstypewriter-bold-12 -b&h-lucidatypewriter-bold-r-normal-sans-17-120-100-100-m-100-iso8859-1
+lucidasanstypewriter-bold-14 -b&h-lucidatypewriter-bold-r-normal-sans-20-140-100-100-m-120-iso8859-1
+lucidasanstypewriter-bold-18 -b&h-lucidatypewriter-bold-r-normal-sans-25-180-100-100-m-150-iso8859-1
+lucidasanstypewriter-bold-24 -b&h-lucidatypewriter-bold-r-normal-sans-34-240-100-100-m-200-iso8859-1
+lucidasanstypewriter-8 -b&h-lucidatypewriter-medium-r-normal-sans-11-80-100-100-m-70-iso8859-1
+lucidasanstypewriter-10 -b&h-lucidatypewriter-medium-r-normal-sans-14-100-100-100-m-80-iso8859-1
+lucidasanstypewriter-12 -b&h-lucidatypewriter-medium-r-normal-sans-17-120-100-100-m-100-iso8859-1
+lucidasanstypewriter-14 -b&h-lucidatypewriter-medium-r-normal-sans-20-140-100-100-m-120-iso8859-1
+lucidasanstypewriter-18 -b&h-lucidatypewriter-medium-r-normal-sans-25-180-100-100-m-150-iso8859-1
+lucidasanstypewriter-24 -b&h-lucidatypewriter-medium-r-normal-sans-34-240-100-100-m-200-iso8859-1
Modified: branches/modular/font/xfonts-100dpi/debian/rules
===================================================================
--- branches/modular/font/xfonts-100dpi/debian/rules 2005-12-02 19:23:28 UTC (rev 922)
+++ branches/modular/font/xfonts-100dpi/debian/rules 2005-12-06 05:14:23 UTC (rev 923)
@@ -74,6 +74,7 @@
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
+ install -D debian/fonts.alias debian/tmp/etc/X11/fonts/100dpi/xfonts-100dpi.alis
# Build architecture-dependent files here.
binary-arch: build install
Added: branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.postinst.in
===================================================================
--- branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.postinst.in 2005-12-02 19:23:28 UTC (rev 922)
+++ branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.postinst.in 2005-12-06 05:14:23 UTC (rev 923)
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Debian xfonts-100dpi package post-installation script
+# Copyright 1998-2001 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfonts-100dpi.postinst.in 189 2005-06-11 00:04:27Z branden $
+
+set -e
+
+THIS_PACKAGE=xfonts-100dpi
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+#DEBHELPER#
+
+FONTDIRS="100dpi"
+UPDATECMDS="update-fonts-dir update-fonts-alias"
+font_update
+
+exit 0
+
+# vim:ai:et:sts=2:sw=2:tw=0:
Added: branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.postrm.in
===================================================================
--- branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.postrm.in 2005-12-02 19:23:28 UTC (rev 922)
+++ branches/modular/font/xfonts-100dpi/debian/xfonts-100dpi.postrm.in 2005-12-06 05:14:23 UTC (rev 923)
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Debian xfonts-100dpi package post-removal script
+# Copyright 1998-2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfonts-100dpi.postrm.in 189 2005-06-11 00:04:27Z branden $
+
+set -e
+
+THIS_PACKAGE=xfonts-100dpi
+THIS_SCRIPT=postrm
+
+#INCLUDE_SHELL_LIB#
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
+ FONTDIRS="100dpi"
+ UPDATECMDS="update-fonts-dir update-fonts-alias"
+ font_update
+fi
+
+if [ "$1" = "purge" ]; then
+ for DIR in /etc/X11/fonts/100dpi /etc/X11/fonts /etc/X11; do
+ rmdir $DIR 2> /dev/null || true
+ done
+fi
+
+exit 0
+
+# vim:ai:et:sts=2:sw=2:tw=0:
Reply to: