X Strike Force X.Org X11 SVN commit: r926 - branches/modular/font/xfonts-misc/debian
Author: dnusinow
Date: 2005-12-06 01:25:38 -0500 (Tue, 06 Dec 2005)
New Revision: 926
Added:
branches/modular/font/xfonts-misc/debian/fonts.alias
Modified:
branches/modular/font/xfonts-misc/debian/
branches/modular/font/xfonts-misc/debian/rules
branches/modular/font/xfonts-misc/debian/xfonts-misc.install
Log:
* Packaging fixes for xfonts-misc
* use prepare (to get genscripts) and xsfclean targets
* install alias file
* Pull in xsfbs
Property changes on: branches/modular/font/xfonts-misc/debian
___________________________________________________________________
Name: svn:externals
+ xsfbs svn://necrotic.deadbeast.net/xorg-x11/trunk/xsfbs
Added: branches/modular/font/xfonts-misc/debian/fonts.alias
===================================================================
--- branches/modular/font/xfonts-misc/debian/fonts.alias 2005-12-06 05:32:57 UTC (rev 925)
+++ branches/modular/font/xfonts-misc/debian/fonts.alias 2005-12-06 06:25:38 UTC (rev 926)
@@ -0,0 +1,77 @@
+! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
+fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
+variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
+5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
+5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
+6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
+6x10 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
+6x12 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
+6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
+6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
+7x13 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
+7x13bold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
+7x13euro -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15
+7x13eurobold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15
+7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+7x14bold -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
+8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
+8x13bold -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
+8x16 -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
+9x15 -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
+9x15bold -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
+10x20 -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
+12x24 -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
+nil2 -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
+
+heb6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
+heb8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
+
+k14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0
+a14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1
+r14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
+rk14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
+r16 -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0
+rk16 -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0
+r24 -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0
+rk24 -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0
+kana14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
+8x16kana -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
+8x16romankana -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
+12x24kana -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+12x24romankana -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+kanji16 -jis-fixed-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0
+kanji24 -jis-fixed-medium-r-normal--24-*-*-*-*-*-jisx0208.1983-0
+
+hanzigb16st "-isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"
+hanzigb24st "-isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0"
+hanzigb16fs "-isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"
+
+olcursor "-sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1"
+olglyph-10 "-sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1"
+olglyph-12 "-sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1"
+olglyph-14 "-sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1"
+olglyph-19 "-sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1"
+
+-misc-fixed-medium-r-normal--7-50-100-100-c-50-iso8859-1 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
+-misc-fixed-medium-r-normal--8-60-100-100-c-50-iso8859-1 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
+-misc-fixed-medium-r-normal--9-80-100-100-c-60-iso8859-1 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
+-misc-fixed-medium-r-normal--10-70-100-100-c-60-iso8859-1 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
+-misc-fixed-medium-r-semicondensed--12-90-100-100-c-60-iso8859-1 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
+-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
+-misc-fixed-bold-r-semicondensed--13-100-100-100-c-60-iso8859-1 -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
+-misc-fixed-medium-r-normal--13-100-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
+-misc-fixed-bold-r-normal--13-100-100-100-c-70-iso8859-1 -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
+-misc-fixed-medium-r-normal--13-100-100-100-c-80-iso8859-1 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
+-misc-fixed-bold-r-normal--13-100-100-100-c-80-iso8859-1 -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
+-misc-fixed-medium-r-normal--14-110-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+-misc-fixed-medium-r-normal--15-120-100-100-c-90-iso8859-1 -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
+-misc-fixed-bold-r-normal--15-120-100-100-c-90-iso8859-1 -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
+-misc-fixed-medium-r-normal--20-140-100-100-c-100-iso8859-1 -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
+-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-8 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
+-misc-fixed-medium-r-normal--13-100-100-100-c-80-iso8859-8 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
+-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1 -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
+-sony-fixed-medium-r-normal--16-150-75-75-c-80-jisx0201.1976-0 -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
+-sony-fixed-medium-r-normal--24-230-75-75-c-120-iso8859-1 -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
+-sony-fixed-medium-r-normal--24-230-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+-jis-fixed-medium-r-normal--16-110-100-100-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
+-jis-fixed-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
Modified: branches/modular/font/xfonts-misc/debian/rules
===================================================================
--- branches/modular/font/xfonts-misc/debian/rules 2005-12-06 05:32:57 UTC (rev 925)
+++ branches/modular/font/xfonts-misc/debian/rules 2005-12-06 06:25:38 UTC (rev 926)
@@ -36,7 +36,7 @@
endif
-build: build-stamp
+build: prepare build-stamp
build-stamp:
dh_testdir
for FILE in "$(SUBDIRS)"; do \
@@ -51,7 +51,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
@@ -74,7 +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/misc/xfonts-misc.alis
+ install -D debian/fonts.alias debian/tmp/etc/X11/fonts/misc/xfonts-misc.alias
# Build architecture-dependent files here.
binary-arch: build install
Modified: branches/modular/font/xfonts-misc/debian/xfonts-misc.install
===================================================================
--- branches/modular/font/xfonts-misc/debian/xfonts-misc.install 2005-12-06 05:32:57 UTC (rev 925)
+++ branches/modular/font/xfonts-misc/debian/xfonts-misc.install 2005-12-06 06:25:38 UTC (rev 926)
@@ -1,3 +1,4 @@
+etc/X11/fonts/misc/xfonts-misc.alias
usr/lib/X11/fonts/misc/arabic24.pcf.gz
usr/lib/X11/fonts/misc/fonts.scale
usr/lib/X11/fonts/misc/cursor.pcf.gz
Reply to: