X Strike Force X.Org X11 SVN commit: r1432 - branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian
Author: dnusinow
Date: 2006-03-12 13:18:32 -0500 (Sun, 12 Mar 2006)
New Revision: 1432
Added:
branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/fonts.scale
Modified:
branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/rules
branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.install
branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.postinst.in
branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.postrm.in
Log:
Fix packaging for scalable fonts rather than standard X11 fonts. This pulls from trunk.
Added: branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/fonts.scale
===================================================================
--- branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/fonts.scale 2006-03-12 18:00:39 UTC (rev 1431)
+++ branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/fonts.scale 2006-03-12 18:18:32 UTC (rev 1432)
@@ -0,0 +1,34 @@
+33
+c0419bt_.pfb -bitstream-courier 10 pitch-medium-r-normal--0-0-0-0-m-0-adobe-standard
+c0419bt_.pfb -bitstream-courier 10 pitch-medium-r-normal--0-0-0-0-m-0-ascii-0
+c0419bt_.pfb -bitstream-courier 10 pitch-medium-r-normal--0-0-0-0-m-0-iso10646-1
+c0419bt_.pfb -bitstream-courier 10 pitch-medium-r-normal--0-0-0-0-m-0-iso8859-1
+c0582bt_.pfb -bitstream-courier 10 pitch-medium-i-normal--0-0-0-0-m-0-adobe-standard
+c0582bt_.pfb -bitstream-courier 10 pitch-medium-i-normal--0-0-0-0-m-0-ascii-0
+c0582bt_.pfb -bitstream-courier 10 pitch-medium-i-normal--0-0-0-0-m-0-iso10646-1
+c0582bt_.pfb -bitstream-courier 10 pitch-medium-i-normal--0-0-0-0-m-0-iso8859-1
+c0583bt_.pfb -bitstream-courier 10 pitch-bold-r-normal--0-0-0-0-m-0-adobe-standard
+c0583bt_.pfb -bitstream-courier 10 pitch-bold-r-normal--0-0-0-0-m-0-ascii-0
+c0583bt_.pfb -bitstream-courier 10 pitch-bold-r-normal--0-0-0-0-m-0-iso10646-1
+c0583bt_.pfb -bitstream-courier 10 pitch-bold-r-normal--0-0-0-0-m-0-iso8859-1
+c0611bt_.pfb -bitstream-courier 10 pitch-bold-i-normal--0-0-0-0-m-0-adobe-standard
+c0611bt_.pfb -bitstream-courier 10 pitch-bold-i-normal--0-0-0-0-m-0-ascii-0
+c0611bt_.pfb -bitstream-courier 10 pitch-bold-i-normal--0-0-0-0-m-0-iso10646-1
+c0611bt_.pfb -bitstream-courier 10 pitch-bold-i-normal--0-0-0-0-m-0-iso8859-1
+c0632bt_.pfb -bitstream-bitstream charter-bold-r-normal--0-0-0-0-p-0-adobe-standard
+c0632bt_.pfb -bitstream-bitstream charter-bold-r-normal--0-0-0-0-p-0-ascii-0
+c0632bt_.pfb -bitstream-bitstream charter-bold-r-normal--0-0-0-0-p-0-iso10646-1
+c0632bt_.pfb -bitstream-bitstream charter-bold-r-normal--0-0-0-0-p-0-iso8859-1
+c0633bt_.pfb -bitstream-bitstream charter-bold-i-normal--0-0-0-0-p-0-adobe-standard
+c0633bt_.pfb -bitstream-bitstream charter-bold-i-normal--0-0-0-0-p-0-ascii-0
+c0633bt_.pfb -bitstream-bitstream charter-bold-i-normal--0-0-0-0-p-0-iso10646-1
+c0633bt_.pfb -bitstream-bitstream charter-bold-i-normal--0-0-0-0-p-0-iso8859-1
+c0648bt_.pfb -bitstream-bitstream charter-medium-r-normal--0-0-0-0-p-0-adobe-standard
+c0648bt_.pfb -bitstream-bitstream charter-medium-r-normal--0-0-0-0-p-0-ascii-0
+c0648bt_.pfb -bitstream-bitstream charter-medium-r-normal--0-0-0-0-p-0-iso10646-1
+c0648bt_.pfb -bitstream-bitstream charter-medium-r-normal--0-0-0-0-p-0-iso8859-1
+c0649bt_.pfb -bitstream-bitstream charter-medium-i-normal--0-0-0-0-p-0-adobe-standard
+c0649bt_.pfb -bitstream-bitstream charter-medium-i-normal--0-0-0-0-p-0-ascii-0
+c0649bt_.pfb -bitstream-bitstream charter-medium-i-normal--0-0-0-0-p-0-iso10646-1
+c0649bt_.pfb -bitstream-bitstream charter-medium-i-normal--0-0-0-0-p-0-iso8859-1
+cursor.pfa -xfree86-cursor-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific
Modified: branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/rules
===================================================================
--- branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/rules 2006-03-12 18:00:39 UTC (rev 1431)
+++ branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/rules 2006-03-12 18:18:32 UTC (rev 1432)
@@ -65,6 +65,8 @@
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ install -D -m644 debian/fonts.scale \
+ debian/tmp/etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale
# Build architecture-dependent files here.
binary-arch: build install
Modified: branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.install
===================================================================
--- branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.install 2006-03-12 18:00:39 UTC (rev 1431)
+++ branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.install 2006-03-12 18:18:32 UTC (rev 1432)
@@ -1 +1,2 @@
-usr/lib/X11/fonts/Type1/*
+etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale
+usr/lib/X11/fonts/Type1/* usr/share/fonts/X11/Type1
Modified: branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.postinst.in
===================================================================
--- branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.postinst.in 2006-03-12 18:00:39 UTC (rev 1431)
+++ branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.postinst.in 2006-03-12 18:18:32 UTC (rev 1432)
@@ -17,7 +17,15 @@
#DEBHELPER#
FONTDIRS="Type1"
-UPDATECMDS="update-fonts-dir update-fonts-alias"
+UPDATECMDS="update-fonts-scale update-fonts-alias"
+
+if which defoma-app >/dev/null 2>&1 && \
+ [ -e /usr/share/defoma/scripts/fontconfig.defoma ]; then
+ defoma-app update fontconfig
+else
+ UPDATECMDS="$UPDATECMDS fc-cache"
+fi
+
font_update
exit 0
Modified: branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.postrm.in
===================================================================
--- branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.postrm.in 2006-03-12 18:00:39 UTC (rev 1431)
+++ branches/modular/font/font-bitstream-type1-X11R7.0-1.0.0/debian/xfonts-scalable.postrm.in 2006-03-12 18:18:32 UTC (rev 1432)
@@ -18,12 +18,20 @@
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="Type1"
- UPDATECMDS="update-fonts-dir update-fonts-alias"
+ UPDATECMDS="update-fonts-scale update-fonts-alias"
+
+ if which defoma-app >/dev/null 2>&1 && \
+ [ -e /usr/share/defoma/scripts/fontconfig.defoma ]; then
+ defoma-app update fontconfig
+ else
+ UPDATECMDS="$UPDATECMDS fc-cache"
+ fi
+
font_update
fi
if [ "$1" = "purge" ]; then
- for DIR in /etc/X11/fonts/Type1 /etc/X11/fonts /etc/X11; do
+ for DIR in /etc/X11/fonts/Type1 /etc/X11/fonts /etc/X11 /etc/X11/fonts/X11R7/Type1; do
rmdir $DIR 2> /dev/null || true
done
fi
Reply to: