From 272e57235cd60a2e65ac8258d96a02eb3939b687 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 25 Mar 2011 10:41:05 +0000 Subject: git update until 25 Mar 2011 xserver fontconfig glproto libXau libXft libXmu libfontenc libxcb mesa mkfontscale pixman randrproto xkeyboard-config xtrans xwininfo updated following packages: xproto-7.0.21 xineramaproto-1.2.1 libXt-1.1.1 libxkbfile-1.0.7 libXpm-3.5.9 libXfont-1.4.3 libXaw-1.0.9 bdftopcf-1.0.3 encodings-1.0.4 fixesproto-5.0 font-adobe-100dpi-1.0.3 font-adobe-75dpi-1.0.3 font-adobe-utopia-100dpi-1.0.4 font-adobe-utopia-75dpi-1.0.4 font-adobe-utopia-type1-1.0.4 font-alias-1.0.3 font-arabic-misc-1.0.3 font-bh-100dpi-1.0.3 font-bh-75dpi-1.0.3 font-bh-lucidatypewriter-100dpi-1.0.3 font-bh-lucidatypewriter-75dpi-1.0.3 font-bh-ttf-1.0.3 font-bh-type1-1.0.3 font-bitstream-100dpi-1.0.3 font-bitstream-75dpi-1.0.3 font-bitstream-speedo-1.0.2 font-bitstream-type1-1.0.3 font-cronyx-cyrillic-1.0.3 font-cursor-misc-1.0.3 font-daewoo-misc-1.0.3 font-dec-misc-1.0.3 font-ibm-type1-1.0.3 font-isas-misc-1.0.3 font-jis-misc-1.0.3 font-micro-misc-1.0.3 font-misc-cyrillic-1.0.3 font-misc-ethiopic-1.0.3 font-misc-meltho-1.0.3 font-misc-misc-1.1.2 font-mutt-misc-1.0.3 font-schumacher-misc-1.1.2 font-screen-cyrillic-1.0.4 font-sony-misc-1.0.3 font-sun-misc-1.0.3 font-util-1.2.0 font-winitzki-cyrillic-1.0.3 font-xfree86-type1-1.0.4 --- xorg-server/fonts.src/TTF/42-luxi-mono.conf | 12 ++++++++++++ xorg-server/fonts.src/TTF/Makefile.am | 18 ++++++++++++++---- xorg-server/fonts.src/TTF/configure.ac | 11 +++++++---- 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 xorg-server/fonts.src/TTF/42-luxi-mono.conf (limited to 'xorg-server/fonts.src/TTF') diff --git a/xorg-server/fonts.src/TTF/42-luxi-mono.conf b/xorg-server/fonts.src/TTF/42-luxi-mono.conf new file mode 100644 index 000000000..7babe825f --- /dev/null +++ b/xorg-server/fonts.src/TTF/42-luxi-mono.conf @@ -0,0 +1,12 @@ + + + + + + + Luxi Mono + + 100 + + diff --git a/xorg-server/fonts.src/TTF/Makefile.am b/xorg-server/fonts.src/TTF/Makefile.am index 6dc2eb694..a36f565c4 100644 --- a/xorg-server/fonts.src/TTF/Makefile.am +++ b/xorg-server/fonts.src/TTF/Makefile.am @@ -36,24 +36,34 @@ FONT_FILES = \ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) +actualconfigdir = $(FC_CONFDIR)/conf.d +availconfigdir = $(FC_CONFDIR)/conf.avail +dist_availconfig_DATA = 42-luxi-mono.conf + EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH +MAINTAINERCLEANFILES = ChangeLog INSTALL + install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + mkdir -p $(DESTDIR)$(actualconfigdir) + @rm -f $(DESTDIR)$(actualconfigdir)/$(dist_availconfig_DATA) + ln -s ../conf.avail/$(dist_availconfig_DATA) $(DESTDIR)$(actualconfigdir) @RUN_FCCACHE@ distuninstallcheck: @: -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/xorg-server/fonts.src/TTF/configure.ac b/xorg-server/fonts.src/TTF/configure.ac index 0d8528744..4d834f871 100644 --- a/xorg-server/fonts.src/TTF/configure.ac +++ b/xorg-server/fonts.src/TTF/configure.ac @@ -22,7 +22,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-bh-ttf, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-ttf) +AC_INIT([font-bh-ttf], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [font-bh-ttf]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -34,12 +36,13 @@ XORG_DEFAULT_OPTIONS AC_PROG_INSTALL -# Require X.Org's font util macros 1.1 or later +# Require X.Org's font util macros 1.2 or later m4_ifndef([XORG_FONT_MACROS_VERSION], - [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) -XORG_FONT_MACROS_VERSION(1.1) + [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.2) XORG_FONTDIR([TTF]) XORG_FONT_SCALED_UTILS +XORG_FONT_FC_CONFDIR AC_OUTPUT([Makefile]) -- cgit v1.2.3