From dc2e06ab0707f8e2ffd5fe5c1d2db38dd594b551 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 3 Mar 2005 01:59:28 +0000 Subject: [PATCH] Ignore more build detritus Add debian package construction stuff. Update to newer versions of these tools Get library manuals to build again (we love automake). Update debian build system to switch maintainers and deal with 2.3 functionality --- .cvsignore | 7 + ChangeLog | 53 ++ Makefile.am | 50 +- conf.d/.cvsignore | 2 + config/config.guess | 848 ++++++++++++++++-------------- config/config.sub | 449 +++++++++++----- debian/README.Debian | 44 ++ debian/autohint.conf | 9 + debian/changelog | 661 +++++++++++++++++++++++ debian/compat | 1 + debian/control | 78 +++ debian/copyright | 29 + debian/fontconfig-udeb.install | 3 + debian/fontconfig.config | 10 + debian/fontconfig.defoma | 162 ++++++ debian/fontconfig.dirs | 1 + debian/fontconfig.install | 6 + debian/fontconfig.postinst | 139 +++++ debian/fontconfig.postrm | 26 + debian/fontconfig.templates | 51 ++ debian/libfontconfig1-dev.install | 7 + debian/libfontconfig1.install | 1 + debian/local.conf.md5sum | 18 + debian/no-sub-pixel.conf | 12 + debian/po/POTFILES.in | 1 + debian/po/cs.po | 154 ++++++ debian/po/da.po | 174 ++++++ debian/po/de.po | 157 ++++++ debian/po/es.po | 198 +++++++ debian/po/fr.po | 194 +++++++ debian/po/ja.po | 180 +++++++ debian/po/nl.po | 158 ++++++ debian/po/pt.po | 145 +++++ debian/po/pt_BR.po | 183 +++++++ debian/po/templates.pot | 120 +++++ debian/po/tr.po | 150 ++++++ debian/po/zh_CN.po | 148 ++++++ debian/rules | 39 ++ debian/unhinted.conf | 9 + doc/.cvsignore | 1 + doc/Makefile.am | 13 +- 41 files changed, 4172 insertions(+), 519 deletions(-) create mode 100644 conf.d/.cvsignore create mode 100644 debian/README.Debian create mode 100644 debian/autohint.conf create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/fontconfig-udeb.install create mode 100755 debian/fontconfig.config create mode 100644 debian/fontconfig.defoma create mode 100644 debian/fontconfig.dirs create mode 100644 debian/fontconfig.install create mode 100755 debian/fontconfig.postinst create mode 100644 debian/fontconfig.postrm create mode 100644 debian/fontconfig.templates create mode 100644 debian/libfontconfig1-dev.install create mode 100644 debian/libfontconfig1.install create mode 100644 debian/local.conf.md5sum create mode 100644 debian/no-sub-pixel.conf create mode 100644 debian/po/POTFILES.in create mode 100644 debian/po/cs.po create mode 100644 debian/po/da.po create mode 100644 debian/po/de.po create mode 100644 debian/po/es.po create mode 100644 debian/po/fr.po create mode 100644 debian/po/ja.po create mode 100644 debian/po/nl.po create mode 100644 debian/po/pt.po create mode 100644 debian/po/pt_BR.po create mode 100644 debian/po/templates.pot create mode 100644 debian/po/tr.po create mode 100644 debian/po/zh_CN.po create mode 100755 debian/rules create mode 100644 debian/unhinted.conf diff --git a/.cvsignore b/.cvsignore index fc2fcc9..3eb8520 100644 --- a/.cvsignore +++ b/.cvsignore @@ -25,3 +25,10 @@ fontconfig-*.tar.gz ltmain.sh autom4te.cache ChangeLog-* +*.deb +*.dsc +*.changes +*.build +*.tar.gz +*.diff.gz +*.udeb diff --git a/ChangeLog b/ChangeLog index 7caf76a..4c3145d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,56 @@ +2005-03-02 Keith Packard + + * .cvsignore: + * conf.d/.cvsignore: + * doc/.cvsignore: + Ignore more build detritus + + * Makefile.am: + Add debian package construction stuff. + + * config/config.guess: + * config/config.sub: + Update to newer versions of these tools + + * doc/Makefile.am: + Get library manuals to build again (we love automake). + + * debian/README.Debian: + * debian/autohint.conf: + * debian/changelog: + * debian/compat: + * debian/control: + * debian/copyright: + * debian/fontconfig-udeb.install: + * debian/fontconfig.config: + * debian/fontconfig.defoma: + * debian/fontconfig.dirs: + * debian/fontconfig.install: + * debian/fontconfig.postinst: + * debian/fontconfig.postrm: + * debian/fontconfig.templates: + * debian/libfontconfig1-dev.install: + * debian/libfontconfig1.install: + * debian/local.conf.md5sum: + * debian/no-sub-pixel.conf: + * debian/po/POTFILES.in: + * debian/po/cs.po: + * debian/po/da.po: + * debian/po/de.po: + * debian/po/es.po: + * debian/po/fr.po: + * debian/po/ja.po: + * debian/po/nl.po: + * debian/po/pt.po: + * debian/po/pt_BR.po: + * debian/po/templates.pot: + * debian/po/tr.po: + * debian/po/zh_CN.po: + * debian/rules: + * debian/unhinted.conf: + Update debian build system to switch maintainers and + deal with 2.3 functionality + 2005-03-01 Keith Packard * README: diff --git a/Makefile.am b/Makefile.am index 44a506d..3acadd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,13 +25,49 @@ DOCSRC=@DOCSRC@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \ fc-cache fc-list fc-match conf.d $(DOCSRC) test +DEBIAN = \ + debian/changelog \ + debian/compat \ + debian/control \ + debian/copyright \ + debian/fontconfig.config \ + debian/fontconfig.defoma \ + debian/fontconfig.dirs \ + debian/fontconfig.install \ + debian/fontconfig.postinst \ + debian/fontconfig.postrm \ + debian/fontconfig.templates \ + debian/fontconfig-udeb.install \ + debian/libfontconfig1-dev.install \ + debian/libfontconfig1.install \ + debian/local.conf.md5sum \ + debian/README.Debian \ + debian/rules \ + debian/autohint.conf \ + debian/no-sub-pixel.conf \ + debian/unhinted.conf \ + debian/po/POTFILES.in \ + debian/po/templates.pot \ + debian/po/cs.po \ + debian/po/da.po \ + debian/po/de.po \ + debian/po/es.po \ + debian/po/fr.po \ + debian/po/ja.po \ + debian/po/nl.po \ + debian/po/pt_BR.po \ + debian/po/pt.po \ + debian/po/tr.po \ + debian/po/zh_CN.po + EXTRA_DIST = \ fontconfig.pc.in \ fonts.conf.in \ fonts.dtd \ fontconfig.spec.in \ fontconfig.spec \ - fontconfig-zip.in + fontconfig-zip.in \ + $(DEBIAN) pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA = fontconfig.pc @@ -81,3 +117,15 @@ uninstall-local: rm -f $(DESTDIR)$(configdir)/fonts.conf; \ fi; \ fi; fi + +debuild debuild-signed: debuild-dirs + (cd $(distdir)/debian && debuild) + +debuild-unsigned: debuild-dirs + (cd $(distdir)/debian && debuild -us -uc) + +debuild-dirs: distdir + rm -f $(PACKAGE)_$(VERSION).orig.tar.gz + rm -rf $(distdir).orig + cp -a $(distdir) $(distdir).orig + rm -rf $(distdir).orig/debian diff --git a/conf.d/.cvsignore b/conf.d/.cvsignore new file mode 100644 index 0000000..282522d --- /dev/null +++ b/conf.d/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/config/config.guess b/config/config.guess index 9b77b57..8229471 100644 --- a/config/config.guess +++ b/config/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2001-02-13' +timestamp='2004-11-12' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,8 +24,9 @@ timestamp='2001-02-13' # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# Please send patches to . +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -52,7 +53,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -87,33 +88,45 @@ if test $# != 0; then exit 1 fi +trap 'exit 1' 1 2 15 -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. -# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c - for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 - if test $? = 0 ; then - CC_FOR_BUILD="$c"; break - fi - done - rm -f $dummy.c $dummy.o $dummy.rel + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found + CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 8/24/94.) +# (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi @@ -127,29 +140,31 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null then @@ -165,70 +180,123 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -242,33 +310,21 @@ EOF Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -286,6 +342,13 @@ EOF NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -314,7 +377,7 @@ EOF echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -328,9 +391,6 @@ EOF aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -357,17 +417,8 @@ EOF *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} @@ -385,6 +436,7 @@ EOF echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ @@ -406,12 +458,20 @@ EOF exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -459,7 +519,7 @@ EOF ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i?86:AIX:*:*) + i*86:AIX:*:*) echo i386-ibm-aix exit 0 ;; ia64:AIX:*:*) @@ -472,6 +532,7 @@ EOF exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include @@ -483,8 +544,7 @@ EOF exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -493,7 +553,7 @@ EOF fi exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -533,10 +593,8 @@ EOF 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -545,12 +603,13 @@ EOF case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - sed 's/^ //' << EOF >$dummy.c + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -583,11 +642,21 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -595,6 +664,7 @@ EOF echo ia64-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int @@ -620,8 +690,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -630,7 +699,7 @@ EOF 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; - *9??*:MPE/iX:*:*) + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) @@ -639,7 +708,7 @@ EOF hp8??:OSF1:*:*) echo hppa1.0-hp-osf exit 0 ;; - i?86:OSF1:*:*) + i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else @@ -649,9 +718,6 @@ EOF parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -670,42 +736,39 @@ EOF C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; sparc*:BSD/OS:*:*) @@ -717,9 +780,6 @@ EOF *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; @@ -729,11 +789,17 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin @@ -745,39 +811,94 @@ EOF echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - cat >$dummy.c < /* for printf() prototype */ -int main (int argc, char *argv[]) { -#else -int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __MIPSEB__ - printf ("%s-unknown-linux-gnu\n", argv[1]); -#endif -#ifdef __MIPSEL__ - printf ("%sel-unknown-linux-gnu\n", argv[1]); -#endif - return 0; -} + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit 0 ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level @@ -790,187 +911,84 @@ EOF parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu exit 0 ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; - *:Linux:*:*) + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit 0 ;; + i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_supported_emulations=`cd /; ld --help 2>&1 \ - | sed -ne '/supported emulations:/!d + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g - s/.*supported emulations: *// + s/.*supported targets: *// s/ .*// p'` - case "$ld_supported_emulations" in - i?86linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 - ;; - elf_i?86) + case "$ld_supported_targets" in + elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - i?86coff) + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 ;; + coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 - ;; - sparclinux) - echo "${UNAME_MACHINE}-unknown-linux-gnuaout" - exit 0 - ;; - elf32_sparc) - echo "${UNAME_MACHINE}-unknown-linux-gnu" - exit 0 - ;; - armlinux) - echo "${UNAME_MACHINE}-unknown-linux-gnuaout" - exit 0 - ;; - elf32arm*) - echo "${UNAME_MACHINE}-unknown-linux-gnuoldld" - exit 0 - ;; - armelf_linux*) - echo "${UNAME_MACHINE}-unknown-linux-gnu" - exit 0 - ;; - m68klinux) - echo "${UNAME_MACHINE}-unknown-linux-gnuaout" - exit 0 - ;; - elf32ppc | elf32ppclinux) - # Determine Lib Version - cat >$dummy.c < -#if defined(__GLIBC__) -extern char __libc_version[]; -extern char __libc_release[]; -#endif -main(argc, argv) - int argc; - char *argv[]; -{ -#if defined(__GLIBC__) - printf("%s %s\n", __libc_version, __libc_release); -#else - printf("unkown\n"); -#endif - return 0; -} -EOF - LIBC="" - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null - if test "$?" = 0 ; then - ./$dummy | grep 1\.99 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f $dummy.c $dummy - echo powerpc-unknown-linux-gnu${LIBC} - exit 0 - ;; + exit 0 ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit 0 ;; esac - - if test "${UNAME_MACHINE}" = "alpha" ; then - cat <$dummy.s - .data - \$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main - main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - LIBC="" - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) UNAME_MACHINE="alpha" ;; - 1-0) UNAME_MACHINE="alphaev5" ;; - 1-1) UNAME_MACHINE="alphaev56" ;; - 1-101) UNAME_MACHINE="alphapca56" ;; - 2-303) UNAME_MACHINE="alphaev6" ;; - 2-307) UNAME_MACHINE="alphaev67" ;; - esac - - objdump --private-headers $dummy | \ - grep ld.so.1 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 - else - # Either a pre-BFD a.out linker (linux-gnuoldld) - # or one that does not give us useful --help. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - test -z "$ld_supported_emulations" \ - && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - - case "${UNAME_MACHINE}" in - i?86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; - esac - # Determine whether the default compiler is a.out or elf - cat >$dummy.c < -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); -#endif - return 0; -} -EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - fi ;; -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions -# are messed up and put the nodename in both sysname and nodename. - i?86:DYNIX/ptx:4*:*) + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 exit 0 ;; - i?86:UNIX_SV:4.2MP:2.*) + i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, @@ -978,7 +996,27 @@ EOF # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; - i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} @@ -986,36 +1024,32 @@ EOF echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; - i?86:*:5:7*) - # Fixed at (any) Pentium or better - UNAME_MACHINE=i586 - if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then - echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} - fi + i*86:*:5:[78]*) + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} exit 0 ;; - i?86:*:3.2:*) + i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i?86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1039,9 +1073,15 @@ EOF # "miniframe" echo m68010-convergent-sysv exit 0 ;; - M68*:*:R3V[567]*:*) + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1052,22 +1092,19 @@ EOF 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:*) + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; SM[BE]S:UNIX_SV:*:*) @@ -1087,8 +1124,8 @@ EOF echo ns32k-sni-sysv fi exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) @@ -1100,6 +1137,10 @@ EOF # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; @@ -1128,6 +1169,9 @@ EOF SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; @@ -1135,18 +1179,25 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + *86) UNAME_PROCESSOR=i686 ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[KW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1169,11 +1220,6 @@ EOF fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i?86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; @@ -1192,11 +1238,28 @@ EOF *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +eval $set_cc_for_build cat >$dummy.c < @@ -1311,8 +1374,7 @@ main () } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. diff --git a/config/config.sub b/config/config.sub index b7d9794..0f84ac2 100644 --- a/config/config.sub +++ b/config/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2001-02-13' +timestamp='2004-11-30' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -29,7 +29,8 @@ timestamp='2001-02-13' # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Please send patches to . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -69,7 +70,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -117,7 +118,8 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -143,7 +145,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -157,6 +159,14 @@ case $os in os=-vxworks basic_machine=$1 ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; @@ -215,24 +225,50 @@ esac case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ - | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ - | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 \ - | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | hppa64 \ - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ - | alphaev6[78] \ - | we32k | ns16k | clipper | i370 | sh | sh[34] \ - | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp10 | pdp11 \ - | mips16 | mips64 | mipsel | mips64el \ - | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el | mcore \ - | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ - | thumb | d10v | d30v | fr30 | avr | openrisc) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | msp430 \ + | ns16k | ns32k \ + | openrisc | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -240,13 +276,13 @@ case $basic_machine in basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[234567]86 | x86_64) + i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -255,29 +291,62 @@ case $basic_machine in exit 1 ;; # Recognize the basic CPU types with company name. - # FIXME: clean up the formatting here. - vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ - | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ - | xmp-* | ymp-* \ - | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | hppa2.0n-* | hppa64-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ - | alphaev6[78]-* \ - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ - | clipper-* | orion-* \ - | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* | mcore-* \ - | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \ - | bs2000-* | tic54x-* | c54x-* | x86_64-*) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ + | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | msp430-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -295,6 +364,9 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -309,6 +381,12 @@ case $basic_machine in basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -340,6 +418,10 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -360,30 +442,45 @@ case $basic_machine in basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp ;; - [cjt]90) - basic_machine=${basic_machine}-cray - os=-unicos + cr16c) + basic_machine=cr16c-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -392,6 +489,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -504,19 +605,19 @@ case $basic_machine in basic_machine=i370-ibm ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[34567]86v32) + i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[34567]86v4*) + i*86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[34567]86v) + i*86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[34567]86sol2) + i*86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; @@ -564,28 +665,20 @@ case $basic_machine in basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos @@ -665,6 +758,14 @@ case $basic_machine in basic_machine=hppa1.1-oki os=-proelf ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -687,42 +788,58 @@ case $basic_machine in pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; @@ -740,10 +857,26 @@ case $basic_machine in rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -751,7 +884,10 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -818,22 +954,42 @@ case $basic_machine in os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -855,8 +1011,8 @@ case $basic_machine in os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -877,13 +1033,17 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; - xmp) - basic_machine=xmp-cray - os=-unicos + xbox) + basic_machine=i686-pc + os=-mingw32 ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -904,16 +1064,12 @@ case $basic_machine in op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -930,13 +1086,16 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv9) + sh64) + basic_machine=sh64-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -951,9 +1110,8 @@ case $basic_machine in pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff + *-unknown) + # Make sure to match an already-canonicalized machine name. ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 @@ -1007,28 +1165,35 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) case $basic_machine in - x86-* | i[34567]86-*) + x86-* | i*86-*) ;; *) os=-nto$os ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ @@ -1037,6 +1202,9 @@ case $os in -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1049,6 +1217,9 @@ case $os in -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1067,14 +1238,23 @@ case $os in -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1086,6 +1266,9 @@ case $os in -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1113,8 +1296,17 @@ case $os in -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe ;; -none) ;; @@ -1147,10 +1339,14 @@ case $basic_machine in arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1177,6 +1373,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1189,6 +1388,9 @@ case $basic_machine in *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1240,19 +1442,19 @@ case $basic_machine in *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1321,10 +1523,16 @@ case $basic_machine in -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) @@ -1339,6 +1547,9 @@ case $basic_machine in -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..17231df --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,44 @@ +*** IMPORTANT *** + +Recently, fontconfig changed to not include bitmapped fonts in the +default font path. There is now a Debconf question about this. + +If you wish to enable bitmapped fonts manually, please edit +/etc/fonts/local.conf, and uncomment the portion with: + +/usr/X11R6/lib/X11/fonts + +in between the and . + +***************** + + +How fonts are handled in Debian: +-------------------------------- + +Fontconfig is a library which handles font configuration and access at +the system level. It is the foundation for a new font handling in X +applications (but can also be useful without X). + +Applications not using fontconfig are accessing their fonts through +the X server. Font packages for these applications are named xfonts-*. +You can also use TrueType fonts with these applications if you install +the x-ttcidfont-conf package, which connects the X server to defoma: +fonts included in ttf-* packages or added manually using dfontmgr can +then be used in these programs. +A few of these applications, using Xft1, can benefit of antialiasing +with vector fonts, but it is deprecated. + +The new font renderer in XFree86 is called freetype2, and applications +using it access fonts on the client side. Most of them (including all +GTK2/GNOME2 and KDE3 applications) do it using fontconfig, which +provides listing and matching facilities for all fonts installed on the +system. Any font installed in /usr/share/fonts or ~/.fonts will be +accessible to these applications. This is now also true for fonts added +using defoma. +These programs can all benefit from antialiasing, autohinting and +sub-pixel rendering. You can configure it through fontconfig, using +debconf (dpkg-reconfigure fontconfig), or by editing +/etc/fonts/local.conf by hand. + + -- Josselin Mouette Wed, 8 Oct 2003 21:51:35 +0200 diff --git a/debian/autohint.conf b/debian/autohint.conf new file mode 100644 index 0000000..5406f4e --- /dev/null +++ b/debian/autohint.conf @@ -0,0 +1,9 @@ + + + + + + + true + + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..4afe366 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,661 @@ +fontconfig (2.3.0-1) unstable; urgency=low + + * Change of maintainer + * New upstream release + + -- Keith Packard Wed, 2 Mar 2005 00:03:56 -0800 + +fontconfig (2.2.3-4) unstable; urgency=low + + * New translations of debconf templates: + + Brazilian + + Simplified Chinese (closes: #279326) + + Dutch (closes: #280657) + + German (closes: #281077) + + Danish (closes: #282094) + * fontconfig.defoma: patch from SU Yong for missing + tags (closes: #280560). + + -- Josselin Mouette Sat, 20 Nov 2004 15:38:00 +0100 + +fontconfig (2.2.3-3) unstable; urgency=low + + * fontconfig.templates: merge the autohinter and subpixel rendering + questions in a single "select" template. + * fontconfig.config, fontconfig.postinst: update accordingly. + * debian/po/*.po: updated translations (closes: #277927). + * fontconfig.postinst: default to use the bytecode interpreter when the + subpixel rendering is activated (closes: #277874, #277883, #278211). + * fontconfig.config: try to get the answer to deXconf's LCD question to set + the default. + + -- Josselin Mouette Thu, 28 Oct 2004 20:27:49 +0200 + +fontconfig (2.2.3-2) unstable; urgency=low + + * debian/po/pt_BR.po: updated translation from Gustavo Franco + (closes: #276693). + * debian/po/fr.po: correct subpixel rendering question. + * fontconfig.config: change question ordering. + * fontconfig.templates: default the autohinter to "true", but keep the + subpixel rendering to "false". This is because the bytecode interpreter + (previous default) renders very badly on TFT screens, and the subpixel + rendering looks bad on non-RGBA screens (closes: #268321). + * fontconfig.postinst: always enable the autohinter if the subpixel + rendering is activated (otherwise it doesn't work). + + -- Josselin Mouette Thu, 21 Oct 2004 22:59:51 +0200 + +fontconfig (2.2.3-1) unstable; urgency=low + + * New upstream release. + * 00maintainer_mode.patch, autoreconf.patch: removed, obsoleted upstream. + * German translation of debconf templates (closes: #252723). + * Turkish translation of debconf templates (closes: #246080). + * objcopy now works correctly on alpha: + - libfontconfig1-dbg.install.alpha: removed. + - rules: use --dbg-package on all arches. + * shlibs.local: removed. + + -- Josselin Mouette Tue, 13 Jul 2004 11:32:02 +0200 + +fontconfig (2.2.2-2) unstable; urgency=low + + * added debian/patches/00maintainer_mode.patch: introduce + AM_MAINTAINER_MODE to avoid brain damage. + * added debian/patches/autoreconf.patch: this is the result of + libtoolize --force --copy; aclocal; autoheader; automake -acf; + autoconf with libtool 1.5.4 (closes: #218441). + * debian/po/nl.po: added Dutch debconf translation (closes: #237813). + * debian/po/da.po: updated Danish translation (closes: #241123). + + -- Josselin Mouette Wed, 7 Apr 2004 14:28:05 +0200 + +fontconfig (2.2.2-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + + only require libfontconfig1 2.2.1 for dh_makeshlibs. + * debian/control: + + build-depend on binutils 2.12.90.0.9 for dh_strip (closes: #237417). + + build-depend on freetype 2.1.7, ditto for -dev depends. + + fontconfig now conflicts with libfontconfig1-dev << 2.2.2. + * Added debian/po/cs.po (closes: #236275). + * Added debian/po/pt_BR.po (closes: #235465). + * Removed freetype-build.patch. + * fontconfig.install: install fonts-conf.5. + * libfontconfig1-dev.install: only install manpages in section 3. + + -- Josselin Mouette Thu, 11 Mar 2004 14:17:58 +0100 + +fontconfig (2.2.1-16) unstable; urgency=low + + * Use the new debconf interface for ucf: + + fontconfig.postinst: use --debconf-ok option for ucf. + + fontconfig.postinst: remove the hack to get back stdio from debconf. + + control: depend on ucf 0.29. + * Work around objcopy breakage on alpha: + + libfontconfig1-dbg.install.alpha: copy the library to the debug + directory. + + rules: don't use --dbg-package on alpha. + + -- Josselin Mouette Sun, 22 Feb 2004 17:02:47 +0100 + +fontconfig (2.2.1-15) unstable; urgency=low + + * Make the dependencies back to ${misc:Depends} now debhelper was updated. + * Spanish debconf templates (closes: #232211). + * Danish debconf templates (closes: #233071). + + -- Josselin Mouette Fri, 20 Feb 2004 16:27:21 +0100 + +fontconfig (2.2.1-14) unstable; urgency=low + + * Rebuild with up to date cdbs (closes: #230357). + * Build-depend on docbook-utils 0.6.13. + * Make a libfontconfig1-dbg package, requiring debhelper 4.1.76. + * Remove po/ru.po (closes: #223349). + * Depend on debconf | debconf-2.0 (closes: #230520). + + -- Josselin Mouette Tue, 3 Feb 2004 13:16:29 +0100 + +fontconfig (2.2.1-13) unstable; urgency=low + + * patches/freetype-build.patch: include correctly freetype header + files (closes: #222680). + + -- Josselin Mouette Sat, 6 Dec 2003 15:32:30 +0100 + +fontconfig (2.2.1-12) unstable; urgency=low + + * fontconfig.postrm: support the case where /usr/local/share/fonts + doesn't exist (closes: #219992). + + -- Josselin Mouette Tue, 11 Nov 2003 10:42:24 +0100 + +fontconfig (2.2.1-11) unstable; urgency=low + + * fontconfig.postinst: support the case where /usr/local is mounted + read-only (closes: #219684). + + -- Josselin Mouette Sat, 8 Nov 2003 09:44:56 +0100 + +fontconfig (2.2.1-10) unstable; urgency=low + + * shlibs.local: require libfreetype6 2.1.5-3 to avoid the + gsfonts-other bug (closes: #218662). + * fontconfig.{config,postinst}: remove bashism. + * fontconfig.post{inst,rm}: really create /usr/local/share/fonts, + and remove it if non-empty on purge. + * po/ru.po: updated translation (closes: #219265). + * culmus-support.patch: removed, see below. + * fonts-conf-aliases.patch: patch from CVS, still add Culmus support, + now also support ttf-freefont (closes: #218924). + + -- Josselin Mouette Fri, 7 Nov 2003 17:02:37 +0100 + +fontconfig (2.2.1-9) unstable; urgency=low + + * rules: add /usr/local/share/fonts to the list of directories to + search for fonts. + * po/fr.po: update (closes: #218301). + * po/ja.po: update (closes: #217420). + * README.Debian: correct typo. + * patches/culmus-support.patch: support Culmus fonts for Hebrew + systems (closes: #198374). + + -- Josselin Mouette Sun, 2 Nov 2003 18:32:11 +0100 + +fontconfig (2.2.1-8) unstable; urgency=low + + * fontconfig.postinst: revert changes from 2.2.1-7 and just get back + stdin back from debconf before running ucf. Thanks a lot to Samuel + Hocevar for finding out this trick. + + -- Josselin Mouette Mon, 20 Oct 2003 15:36:03 +0200 + +fontconfig (2.2.1-7) unstable; urgency=low + + * fontconfig.postinst: when ucf fails (most likely due to being on + an autobuilder with no /dev/tty), just create local.conf if it is + not here, otherwise do nothing. + + -- Josselin Mouette Mon, 20 Oct 2003 13:45:20 +0200 + +fontconfig (2.2.1-6) unstable; urgency=low + + * Use ucf for local.conf handling (closes: #186730): + + fontconfig.{config,postinst}: remove debconf handling of + local.conf overwriting. + + fontconfig.postrm: new file. + + templates: remove overwrite_existing_local_conf. + + control: fontconfig depends on ucf 0.25. + + local.conf.md5sum: new file, containing all possible md5sums + for local.conf generated with debconf in the previous versions. + * Apply defoma patch from Angus Lees (closes: #206532, #204771): + + fontconfig.defoma: new file. + + control: build-depend and depend on defoma. + + rules: + - Run dh_installdefoma. + - Remove x-ttcidfont-conf stuff. + + README.Debian: document that fontconfig can now use defoma fonts. + + fontconfig.postinst: + - Remove old cache files in /var/lib/defoma/x-ttcidfont-conf.d + subdirectories. + - Include the defoma-generated file in local.conf. + + fontconfig.postrm: remove /var/lib/defoma/fontconfig.d. + * fonts-conf-ordering.patch: patches fonts.conf to include local.conf + before ~/.fonts.conf (closes: #215356). + * control: + + Remove po-debconf dependency, all autobuilders have a working + version now and it never made it to testing. + + Make libfontconfig1-dev depend on libfontconfig1 instead of + fontconfig. + + libfontconfig1-dev depends on libexpat1-dev. + + Make fontconfig require one of the 4 most widely used font + packages, as anyway all packages using fontconfig should + (closes: #189883). Also remove Suggests and Recommends. + * fontconfig.postrm: remove old fonts.cache-1 files in /usr/share/fonts + and /usr/X11R6/lib/X11/fonts on purge. + * No more scripts in fontconfig-udeb (closes: #216132): + + fontconfig-udeb.postinst: removed. + + rules: make dh_makeshlibs not run on fontconfig-udeb. + + -- Josselin Mouette Sun, 19 Oct 2003 11:04:35 +0200 + +fontconfig (2.2.1-5) unstable; urgency=low + + * debian/control: + + Build-depend on po-debconf 0.8.1 (closes: #214973). + + Remove trailing lines, by request of Ralf Nolden. + + -- Josselin Mouette Wed, 15 Oct 2003 21:05:45 +0200 + +fontconfig (2.2.1-4) unstable; urgency=low + + * Russian debconf templates (closes: #214337). + * French debconf templates (closes: #213141). + * Update manpages. + * Patch fc-cache to handle correctly -s (closes: #214091). + * Remove defoma comment in README.Debian. + * Ask whether to enable the autohinter (closes: #188829). + * Add a general documentation about font handling in README.Debian + (closes: #186944). + + -- Josselin Mouette Wed, 8 Oct 2003 22:23:41 +0200 + +fontconfig (2.2.1-3) unstable; urgency=low + + * New maintainer. + * fontconfig.postinst: nitpick output improvement. + * Standards-version is 3.6.1. + * Switch to po-debconf. + * Include japanese debconf templates (closes: #210733). + * Move libfontconfig1-dev to libdevel. + * Provide manpages for fc-list and fc-cache (closes: #191467). + + -- Josselin Mouette Tue, 16 Sep 2003 18:31:18 +0200 + +fontconfig (2.2.1-2) unstable; urgency=low + + * debian/control: + - Build-Depend on the latest cdbs to fix a udeb build error + (Closes: #205062) + + -- Colin Walters Tue, 26 Aug 2003 22:54:24 -0400 + +fontconfig (2.2.1-1) unstable; urgency=low + + * New upstream release. + - Eliminates italic_angle check for PS fonts + (Closes: #196739, #194832). + * debian/rules: + - Work around dh_installman bug and put fonts-conf.5 in section 5 + (Closes: #191026). + + -- Colin Walters Mon, 9 Jun 2003 20:40:57 -0400 + +fontconfig (2.2.0-5) unstable; urgency=low + + * debian/rules: + - Tighten up shlibs versioning again (Closes: #195118). + + -- Colin Walters Wed, 28 May 2003 18:53:21 -0400 + +fontconfig (2.2.0-4) unstable; urgency=low + + * debian/rules: + - Ensure fontconfig is built after libfontconfig1 (Closes: #194960). + + -- Colin Walters Tue, 27 May 2003 18:39:23 -0400 + +fontconfig (2.2.0-3) unstable; urgency=low + + * debian/control: + - Bump Standards-Version: 3.5.10, no changes required. + - Build-Depend on cdbs. + * debian/rules: + - Convert to cdbs. + * debian/rocks: + - Removed. + + -- Colin Walters Sun, 25 May 2003 04:42:10 -0400 + +fontconfig (2.2.0-2) unstable; urgency=low + + * The "Society For Creative Anachronism Seizes Control Of Russia" + release. + * debian/control: + - Recommend ttf-bitstream-vera, since it is the default fallback font + now. Plus it does look pretty nice. (Closes: #190675). + - Suggest: ttf-freefont, my favorite font. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Tue, 6 May 2003 02:55:40 -0400 + +fontconfig (2.2.0-1) unstable; urgency=low + + * The "Harsh Light Of Morning Falls On One Night Stand's DVD Collection" + release. + * New upstream release. + + -- Colin Walters Wed, 23 Apr 2003 20:39:54 -0400 + +fontconfig (2.1.94-1) unstable; urgency=low + + * The "I speak better English than this villian Bush" release. + (Courtesy of Mohammed Saeed al-Sahaf). + * New upstream (pre)release. + * README.Debian: + - Remove experimental notice. + * debian/patches/fonts-conf-cleanup.patch: + - Update. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Thu, 17 Apr 2003 00:13:37 -0400 + +fontconfig (2.1.93-1) unstable; urgency=low + + * The "Saddam Speech Suspiciously Mentions Nelly Song From Last Summer" + release. + * New upstream (pre)release. + - Actually puts some bytes in fontconfig-user.html (Closes: #185065) + - Handles "same" font binding (Closes: #184353) + - Handles aliases better (Closes: #179416) + - Will handle xfonts-terminus, although it's kinda ugly + (Closes: #176690) + * debian/control: + - Bump Standards-Version to 3.5.9, no changes required. + - Minor description fixes. + * debian/rocks: + - Add --enable-docs to DEB_CONFIGURE_EXTRA_FLAGS. + * debian/patches/fontconfig_pc_in-fix-version-var.patch: + - Deleted; fix was incorporated upstream. + * debian/patches/mono-font-enable.patch: + - Deleted; a better fix was incorporated upstream. + + -- Colin Walters Mon, 7 Apr 2003 22:16:52 -0400 + +fontconfig (2.1.92-5) unstable; urgency=low + + * The "Wingslinger's is definitely a mafia front" release. + * debian/control: + - Add back Depends line for fontconfig-udeb, and put libexpat1-udeb, + libfreetype6-udeb, zlib1g-udeb there. + + -- Colin Walters Sun, 6 Apr 2003 14:07:58 -0400 + +fontconfig (2.1.92-4) unstable; urgency=low + + * debian/control: + - Remove Depends for fontconfig-udeb (Closes: #187833). + * debian/fontconfig-udeb.postinst: + - New file, hacked up from fontconfig.postinst. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Sun, 6 Apr 2003 13:18:06 -0400 + +fontconfig (2.1.92-3) unstable; urgency=low + + * debian/control: + - Merge libfontconfig1 and fontconfig packages (Closes: #185466). + - Turn libfontconfig1 and libfontconfig1-dev into dummy packages. + - Generate new fontconfig-udeb package (Closes: #183822). + * debian/patches/mono-font-enable.patch: + - New patch; enables marking fonts as monospaced again (Closes: #185239). + * debian/rocks: + - Remove old cruft like deb-common-build target. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Fri, 28 Mar 2003 16:16:38 -0500 + +fontconfig (2.1.92-2) unstable; urgency=low + + * The "I should take up Tae Kwon Do again as a stress reliever" release. + * debian/README.Debian: + - Update with warning about bitmapped fonts. + * debian/fontconfig.templates: + - New question about overwriting existing local.conf. + * debian/fontconfig.config: + - Place into the public domain. + - Support new question about overwriting existing local.conf. + * debian/fontconfig.postinst: + - Place into the public domain. + - Support new question about overwriting existing local.conf. + - Rewrite so that we always write out the bits for bitmapped fonts and + subpixel rendering, but if they're disabled, then comment them out. + This will allow people to easily see the code so they can enable it by + hand. + - Add -v to fc-cache invocation so /var/log/fontconfig.log is a bit + more useful. + + -- Colin Walters Sun, 9 Mar 2003 14:40:43 -0500 + +fontconfig (2.1.92-1) unstable; urgency=low + + * The "I wish upstream actually used ChangeLog" release. + * New upstream (pre)release. + * debian/libfontconfig1-dev.install: + - Install upstream development HTML and text documentation. + - Install upstream development manpages. + * debian/fontconfig.install: + - Install upstream user HTML and text documentation. + - Don't include local.conf in package. D'oh! + * debian/control: + - Minor description improvements. + * debian/fontconfig.config,debian/fontconfig.postinst, + debian/fontconfig.templates: + - New debconf question about enabling bitmapped fonts. + + -- Colin Walters Fri, 7 Mar 2003 17:23:42 -0500 + +fontconfig (2.1.91-2) unstable; urgency=low + + * debian/control: + - Bump Build-Depends (and Depends for libfontconfig1-dev) on + libfreetype6-dev to the latest. This, in combination with this + version of fontconfig, will hopefully fix a lot of outstanding bugs. + - Drop Build-Depends on xlibs-dev and ed. + * debian/rocks: + - Hardcode font path here, and include + /var/lib/defoma/x-ttcidfont-conf.d/dirs in default font path + (Closes: #183342, #176020). + + -- Colin Walters Thu, 6 Mar 2003 22:00:13 -0500 + +fontconfig (2.1.91-1) unstable; urgency=low + + * New upstream (pre)release. + * debian/patches/fontconfig_pc_in-fix-version-var.patch: + - New patch (Closes: #183418). + + -- Colin Walters Wed, 5 Mar 2003 01:02:17 -0500 + +fontconfig (2.1.90-1) unstable; urgency=low + + * New upstream (pre)release. + * debian/patches/CVS-HEAD-subpixel-rendering-fix.patch, + debian/patches/fail-on-submake-failure.patch, + debian/patches/owen-fc-cache-fix.patch: + - Included upstream now; deleted. + * debian/patches/fonts-conf-cleanup.patch: + - New patch. Removes the date from fonts.conf, and helps move + subpixel rendering bits into local.conf. + * debian/control: + - [libfontconfig1-dev] Add Depends on pkg-config. + - Add Build-Depends on docbook-utils. + * debian/rocks: + - Remove manpage stuff. + * debian/fontconfig.templates, debian/fontconfig.config, + debian/fontconfig.postinst: + - Debconfiscation. Now prompts for subpixel rendering bits + (Closes: #182748). + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Sun, 2 Mar 2003 13:29:35 -0500 + +fontconfig (2.1-15) unstable; urgency=low + + * debian/control: + - Build-Depend on xlibs-dev (>= 4.2.0). + * debian/patches/owen-fc-cache-fix.patch: + - New patch, pulled from the GARNOME CVS; edited slightly. + This should fix those crashes in FcConfigAdd (Closes: #178780). + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Fri, 17 Jan 2003 13:20:09 -0500 + +fontconfig (2.1-14) unstable; urgency=low + + * debian/patches/CVS-HEAD-subpixel-rendering-fix.patch: + - New patch, should fix crashes when subpixel rendering is + turned on (Closes: #175903). Big thanks to + Michael Guntsche for extracting the relevant fix + from CVS! + + -- Colin Walters Fri, 10 Jan 2003 13:30:28 -0500 + +fontconfig (2.1-13) unstable; urgency=low + + * debian/rocks: + - Tighten up shlibs for libfontconfig1. + + -- Colin Walters Wed, 8 Jan 2003 22:34:53 -0500 + +fontconfig (2.1-12) unstable; urgency=low + + * debian/fontconfig.postinst: + - Redirect fc-cache error messages to /var/log/fontconfig.log, and + refer the user to this upon failure (Closes: #174507). + + -- Colin Walters Fri, 3 Jan 2003 15:04:05 -0500 + +fontconfig (2.1-11) unstable; urgency=low + + * debian/control: + - Remove Build-Depends on zlib1g; instead Build-Depend on the very + latest libfreetype6-dev which does this for us. + * debian/fontconfig.postinst: + - Display a little message about regenerating the fonts cache. + + -- Colin Walters Wed, 25 Dec 2002 01:08:05 -0500 + +fontconfig (2.1-10) unstable; urgency=low + + * debian/patches/fail-on-submake-failure.patch: + - New patch. This way at least the package won't build in the future + if there is a failure. + * debian/control: + - Build-Depend on zlib1g-dev directly until freetype is fixed. + - Change fontconfig section to utils. + + -- Colin Walters Sun, 22 Dec 2002 21:37:25 -0500 + +fontconfig (2.1-9) unstable; urgency=low + + * The " "*PANT* *PANT* YEAH BABY!!!! + FRESH COMMITS TO (freetype) CVS!!!!" *PANT* *PANT*" release. + * debian/control: + - Build-Depend on the very latest freetype, the previous version of + which was a CVS snapshot that broke the fontconfig build, and in fact + the build of almost any package dependent on freetype; see #173834. + Closes: #173900. + - Build-Depend on debhelper (>= 4.1.1) since we use some features from + it with CBS in this package (Closes: #173941). + * debian/fontconfig.postinst: + - New file, with the important contents stolen from Red Hat 8's + postinst. Thanks Anthony Fok . (Closes: #173949). + + -- Colin Walters Sun, 22 Dec 2002 03:36:21 -0500 + +fontconfig (2.1-8) unstable; urgency=low + + * debian/control: + - Build-Depend on xlibs-dev. This should fix the issue with + /usr/X11R6/lib/fonts or whatever being missing from fonts.conf. + - Mention more prominently that fontconfig doesn't depend on X. + * debian/rocks: + - Install fc-cache, fc-list, and fontconfig manpages + (Closes: #173748). + + -- Colin Walters Sat, 21 Dec 2002 02:54:36 -0500 + +fontconfig (2.1-7) unstable; urgency=low + + * debian/control: + - [libfontconfig1-dev] Add a Conflicts: fontconfig (<< 2.1-5) so that + we ensure upgrading happens in the correct order (due to + fontconfig-config switching packages). + + -- Colin Walters Wed, 11 Dec 2002 00:48:31 -0500 + +fontconfig (2.1-6) unstable; urgency=low + + * debian/patches/no-date-in-fonts-conf.patch: + - New patch; this will prevent the fonts.conf conffile from changing + on every package upload. + * debian/README.Debian: + - Update. + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Tue, 10 Dec 2002 14:48:24 -0500 + +fontconfig (2.1-5) unstable; urgency=low + + * debian/libfontconfig1-dev.install: + - Install fontconfig-config. + * debian/fontconfig.install + - Don't install fontconfig-config. + * debian/control: + - [libfontconfig1-dev] Add Depends: on libfreetype6-dev + (Closes: #172488) + * debian/rules: + - Update to the latest version of Colin's Build System. + * debian/rocks: + - Add debian/tmp/usr/lib/ to DEB_SHLIBDEPS_INCLUDE + (Closes: #172432). + - Ensure libfontconfig1 is built before fontconfig. + + -- Colin Walters Mon, 9 Dec 2002 23:54:06 -0500 + +fontconfig (2.1-4) unstable; urgency=low + + * debian/control: + - Really Build-Depend on ed (Closes: #172245). Now how did I add it + to the changelog, but not control? Don't ask me...) + * debian/rules: + - Update to the latest version of Colin's Build System. + + -- Colin Walters Mon, 9 Dec 2002 12:59:07 -0500 + +fontconfig (2.1-3) unstable; urgency=low + + * debian/control: + - Build-Depend on ed. + * debian/rules: + - Update to the latest version of Colin's Build System. + * debian/rocks: + - Remove extra cruft in deb-extra-clean rule. + + -- Colin Walters Sun, 8 Dec 2002 20:58:26 -0500 + +fontconfig (2.1-2) unstable; urgency=low + + * First upload to unstable; Closes: #170559. + * debian/rules: + - Update to latest version of Colin's Build System. + + -- Colin Walters Fri, 6 Dec 2002 01:37:16 -0500 + +fontconfig (2.1-1) unstable; urgency=low + + * New upstream version. + * debian/rules: + - Use Colin's Build System. + * debian/control: + - Bump Standards-Version to 3.5.8. + * debian/copyright: + - Fix Upstream Authors. + + -- Colin Walters Tue, 3 Dec 2002 22:38:28 -0500 + +fontconfig (2.0-2) unstable; urgency=low + + * debian/control: + - [fontconfig] New package; install configuration files and binaries in it. + - [libfontconfig1-dev] Fix up description. + + -- Colin Walters Mon, 14 Oct 2002 23:06:59 -0400 + +fontconfig (2.0-1) unstable; urgency=low + + * Initial version. + + -- Colin Walters Sun, 13 Oct 2002 14:43:56 -0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..3059202 --- /dev/null +++ b/debian/control @@ -0,0 +1,78 @@ +Source: fontconfig +Section: devel +Priority: optional +Maintainer: Keith Packard +Build-Depends: cdbs (>= 0.4.5.4), debhelper (>= 4.1.76), libfreetype6-dev (>= 2.1.7), libexpat1-dev, docbook-utils (>= 0.6.13), docbook-to-man, defoma (>= 0.7.0), binutils (>= 2.12.90.0.9) +Standards-Version: 3.6.1 + +Package: fontconfig +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, defoma (>= 0.7.0), ucf (>= 0.29), ttf-bitstream-vera | ttf-freefont | gsfonts-x11 | msttcorefonts +Conflicts: libfontconfig1-dev (<< 2.2.2-1) +Description: generic font configuration library + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + Fontconfig is not a rasterization library, nor does it impose a + particular rasterization library on the application. The X-specific + library 'Xft' uses fontconfig along with freetype to specify and + rasterize fonts. + . + This package contains a program to maintain the fontconfig cache + (fc-cache), and a sample program to list installed fonts (fc-list). + +Package: fontconfig-udeb +Section: debian-installer +Architecture: any +Depends: libexpat1-udeb, libfreetype6-udeb, zlib1g-udeb +Description: generic font configuration library (shared library) + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + See the "fontconfig" package description for more information. + +Package: libfontconfig1-dev +Section: libdevel +Architecture: any +Depends: libfontconfig1 (= ${Source-Version}), libexpat1-dev, libfreetype6-dev (>= 2.1.7), pkg-config +Provides: libfontconfig-dev +Conflicts: libfontconfig-dev, fontconfig (<< 2.1-5) +Description: generic font configuration library (development headers) + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + See the "fontconfig" package description for more information. + +Package: libfontconfig1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, fontconfig +Description: generic font configuration library (shared library) + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + See the "fontconfig" package description for more information. + +Package: libfontconfig1-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libfontconfig1 (= ${Source-Version}) +Description: generic font configuration library (debugging symbols) + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + This package contains the debugging symbols associated with + libfontconfig1. They will automatically be used by gdb for debugging + fontconfig-related issues. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..8a399ec --- /dev/null +++ b/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Colin Walters on +Sun, 13 Oct 2002 15:01:50 -0400 + +It was downloaded from http://www.fontconfig.org/ + +Upstream Author: Keith Packard + +Copyright: + +Copyright © 2001,2003 Keith Packard + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + diff --git a/debian/fontconfig-udeb.install b/debian/fontconfig-udeb.install new file mode 100644 index 0000000..3b34148 --- /dev/null +++ b/debian/fontconfig-udeb.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/libfontconfig*.so.* +debian/tmp/etc/* +debian/tmp/usr/bin/* diff --git a/debian/fontconfig.config b/debian/fontconfig.config new file mode 100755 index 0000000..dd119e1 --- /dev/null +++ b/debian/fontconfig.config @@ -0,0 +1,10 @@ +#! /bin/sh + +set -e + +. /usr/share/debconf/confmodule + +db_input medium fontconfig/hinting_type || true +db_input low fontconfig/subpixel_rendering || true +db_input low fontconfig/enable_bitmaps || true +db_go diff --git a/debian/fontconfig.defoma b/debian/fontconfig.defoma new file mode 100644 index 0000000..7558667 --- /dev/null +++ b/debian/fontconfig.defoma @@ -0,0 +1,162 @@ +# -*- perl -*- +# Defoma configuration script for fontconfig +# Copyright © 2003 Angus Lees +# This file is hereby placed into the public domain. + +@ACCEPT_CATEGORIES = qw(type1 truetype cid); +# .. and any other categories supported by freetype + +package fontconfig; + +use Debian::Defoma::Common; +use Debian::Defoma::Id; +use Debian::Defoma::Subst; + +use strict; +use warnings; + +my $PkgDir = "$ROOTDIR/fontconfig.d"; +my ($Id, $Sb); + +sub init { + $Id ||= defoma_id_open_cache() or return 1; + $Sb ||= defoma_subst_open(rulename => 'fontconfig', + threshold => 70, + idobject => $Id) or return 1; + + return 0; +} + +sub register { + my $font = shift; + my $hints = parse_hints_start(@_); + + return 1 unless $hints->{FontName}; + + my $priority = $hints->{Priority} || 20; + my ($fontname) = split / +/, $hints->{FontName}; + my @alias = split / +/, $hints->{Alias} if $hints->{Alias}; + + defoma_id_register($Id, type => 'real', font => $font, + id => $fontname, priority => $priority, + hints => join(' ', @_)); + + foreach my $alias (@alias) { + defoma_id_register($Id, type => 'alias', font => $font, + id => $alias, priority => $priority, + origin => $fontname); + } + + defoma_subst_register($Sb, $font, $fontname); + + return 0; +} + +sub unregister { + my $font = shift; + defoma_subst_unregister($Sb, $font); + defoma_id_unregister($Id, type => 'alias', font => $font); + defoma_id_unregister($Id, type => 'real', font => $font); + return 0; +} + +sub do_install_real { + my $font = shift; + my $id = shift; + + my $dir = $PkgDir . '/' . substr($id, 0, 1); + my $ext = $font =~ m|\.([^/.]+)$| ? ".$1" : ''; + my $file = $id . $ext; + + mkdir $dir; + symlink $font, "$dir/$file" or return 1; + + return 0; +} + +sub do_remove_real { + my $font = shift; + my $id = shift; + + my $dir = $PkgDir . '/' . substr($id, 0, 1); + my $ext = $font =~ m|\.([^/.]+)$| ? ".$1" : ''; + my $file = $id . $ext; + + unlink "$dir/$file" or return 1; + rmdir $dir; # ignore failure + + return 0; +} + +sub term { + return unless $Id; + + open my $fh, '>', "$PkgDir/fonts.conf" or return 1; + + print $fh < + + + + $PkgDir +EOF + + # aliases + foreach (defoma_id_get_font($Id, installed => type => 'SaI')) { + print $fh < + $Id->{e_id}->[$_] + $Id->{e_depid}->[$_] + +EOF + } + + # substituded fonts + foreach (defoma_id_get_font($Id, installed => type => 'SSI')) { + print $fh < + $Id->{e_id}->[$_] + $Id->{e_depid}->[$_] + +EOF + } + + print $fh "\n"; + + close $fh; + + defoma_subst_close($Sb); + defoma_id_close_cache($Id); + + system('fc-cache', $PkgDir); + + return 0; +} + +sub main { + my $cmd = shift; + + if ($cmd eq 'init') { + init(); + } elsif ($cmd eq 'register') { + return register(@_); + } elsif ($cmd eq 'unregister') { + return unregister(@_); + } elsif ($cmd eq 'do-install-real') { + return do_install_real(@_); + } elsif ($cmd eq 'do-remove-real') { + return do_remove_real(@_); + } elsif ($cmd eq 'term') { + return term(@_); + } + + 0; +} + +no warnings; + +*truetype = \&main; +*type1 = \&main; +*cid = \&main; + +1; diff --git a/debian/fontconfig.dirs b/debian/fontconfig.dirs new file mode 100644 index 0000000..336da93 --- /dev/null +++ b/debian/fontconfig.dirs @@ -0,0 +1 @@ +/var/lib/fontconfig diff --git a/debian/fontconfig.install b/debian/fontconfig.install new file mode 100644 index 0000000..800f0aa --- /dev/null +++ b/debian/fontconfig.install @@ -0,0 +1,6 @@ +debian/tmp/usr/bin/fc-* +debian/tmp/etc/fonts/fonts.* +debian/tmp/usr/share/doc/fontconfig/fontconfig-user.* +debian/tmp/usr/share/man/man5 +debian/tmp/usr/share/man/man1 +debian/local.conf.md5sum /usr/share/fontconfig diff --git a/debian/fontconfig.postinst b/debian/fontconfig.postinst new file mode 100755 index 0000000..e7f6817 --- /dev/null +++ b/debian/fontconfig.postinst @@ -0,0 +1,139 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule + +LOCALCONF=/var/lib/fontconfig/local.conf +rm -f $LOCALCONF + +CONFDIR=/etc/fonts/conf.d + +db_get fontconfig/hinting_type +hinting_type="$RET" + +hint_prio="10-debconf-" +unhinted="unhinted.conf" +autohint="autohint.conf" + +if [ -h $CONFDIR/$hint_prio$unhinted ]; then + rm $CONFDIR/$hint_prio$unhinted +fi +if [ -h $CONFDIR/$hint_prio$autohint ]; then + rm $CONFDIR/$hint_prio$autohint +fi + +case "$hinting_type" in +"Native") + ;; +"Autohint") + ln -s $CONFDIR/$autohint $CONFDIR/$hint_prio$autohint + ;; +"None") + ln -s $CONFDIR/$unhinted $CONFDIR/$hint_prio$unhinted + ;; +esac + +db_get fontconfig/subpixel_rendering +subpixel_rendering="$RET" + +subpixel_prio="20-debconf-" +subpixel="sub-pixel.conf" +no_subpixel="no-sub-pixel.conf" + +if [ -h $CONFDIR/$subpixel_prio$subpixel ]; then + rm $CONFDIR/$subpixel_prio$subpixel +fi + +if [ -h $CONFDIR/$subpixel_prio$no_subpixel ]; then + rm $CONFDIR/$subpixel_prio$no_subpixel +fi + +case "$subpixel_rendering" in +"Automatic") + ;; +"Enable") + ln -s $CONFDIR/$subpixel $CONFDIR/$subpixel_prio$subpixel + ;; +"Disable") + ln -s $CONFDIR/$no_subpixel $CONFDIR/$subpixel_prio$no_subpixel + ;; +esac + +db_get fontconfig/enable_bitmaps +enable_bitmaps="$RET" + +bitmaps_prio="30-debconf-" +yes_bitmaps="yes_bitmaps.conf" +no_bitmaps="no-bitmaps.conf" + +if [ -h $CONFDIR/$bitmaps_prio$yes_bitmaps ]; then + rm $CONFDIR/$bitmaps_prio$yes_bitmaps +fi + +if [ -h $CONFDIR/$bitmaps_prio$no_bitmaps ]; then + rm $CONFDIR/$bitmaps_prio$no_bitmaps +fi + +case "$enable_bitmaps" in +"true") + ln -s $CONFDIR/$yes_bitmaps $CONFDIR/$bitmaps_prio$yes_bitmaps + ;; +*) + ln -s $CONFDIR/$no_bitmaps $CONFDIR/$bitmaps_prio$no_bitmaps + ;; +esac + +cp /dev/null $LOCALCONF +rm -f $LOCALCONF.md5sum +ln -sf /usr/share/fontconfig/local.conf.md5sum $LOCALCONF.md5sum +ucf --debconf-ok $LOCALCONF /etc/fonts/local.conf +rm -f $LOCALCONF.md5sum + +# if the local.conf file is now empty, remove it + +if [ -s /etc/fonts/local.conf ]; then + : +else + if [ -f /etc/fonts/local.conf ]; then + rm /etc/fonts/local.conf + fi +fi + +# Create /usr/local/share/fonts +LOCALDIR=/usr/local/share/fonts +if [ ! -d $LOCALDIR ]; then + if mkdir $LOCALDIR 2>/dev/null ; then + chmod 2775 $LOCALDIR + chown root:staff $LOCALDIR + fi +fi + +if [ "$1" = configure ]; then + # Ensure Defoma subst file exists, with some default substitutions + if ! defoma-subst check-rule fontconfig; then + defoma-subst new-rule fontconfig \ + 'serif --GeneralFamily,* Roman --Shape Serif Upright --Weight Medium' \ + 'sans-serif --GeneralFamily,* SansSerif --Shape NoSerif Upright --Weight Medium' \ + 'monospace --Width,* Fixed --GeneralFamily,2 Typewriter --Shape Upright --Weight Medium' + fi +fi + +if [ -d /var/lib/defoma/x-ttcidfont-conf.d ]; then + # Remove old fonts.cache-1 files + find /var/lib/defoma/x-ttcidfont-conf.d -name fonts.cache-1 | xargs rm -f +fi + +#DEBHELPER# + +if [ "$1" = configure ]; then + # (Hacked up from Red Hat 8 fontconfig RPM) + # Force regeneration of all fontconfig cache files. + # The redirect is because fc-cache is giving warnings about ~/fc.cache + # the HOME setting is to avoid problems if HOME hasn't been reset + printf "Regenerating fonts cache... " + HOME=/root fc-cache -f -v 1>/var/log/fontconfig.log 2>&1 || (printf "failed.\nSee /var/log/fontconfig.log for more information.\n"; exit 1) + printf "done.\n" +fi + +exit 0 diff --git a/debian/fontconfig.postrm b/debian/fontconfig.postrm new file mode 100644 index 0000000..88598c3 --- /dev/null +++ b/debian/fontconfig.postrm @@ -0,0 +1,26 @@ +#! /bin/sh +# postrm script for fontconfig + +set -e + +CONF=/etc/fonts/local.conf + +case "$1" in + purge) + if [ -x /usr/bin/ucf ]; then + ucf --purge $CONF + fi + rm -f $CONF + rm -rf /var/lib/fontconfig /var/lib/defoma/fontconfig.d + for dir in /usr/share/fonts /usr/X11R6/lib/X11/fonts /usr/local/share/fonts ; do + if [ -d $dir ]; then + find $dir -name fonts.cache-1 | xargs rm -f + fi + done + rmdir /usr/local/share/fonts 2> /dev/null || true + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/fontconfig.templates b/debian/fontconfig.templates new file mode 100644 index 0000000..9d30fef --- /dev/null +++ b/debian/fontconfig.templates @@ -0,0 +1,51 @@ +Template: fontconfig/hinting_type +Type: select +_Choices: Native, Autohinter, None +Default: Native +_Description: With what method should fonts be hinted? + + The FreeType font library can adjust glyph outlines to accomodate the pixel + grid for improved legibility. This process is called "hinting". + FreeType can either use the hints built-in to each font or it can use a + format-indepedent Autohinter. For most font formats, using the + format-specific hints generates better results. However, many + freely available TrueType format fonts don't include any hints at all. + When loading such a font, unless you specifically ask to use the + Autohinter, these fonts will end up unhinted, which will make them appear + fuzzy on the screen. + . + If the TrueType fonts you use most include hints, then the Native hinter + gives better results. However, if the fonts you use most do not include + such hints, then the Autohinter will work better. Yes, FreeType should do + this automatically. + . + You can also select None to disable all hinting and make your screen look + like Mac OS X. + . + +Template: fontconfig/subpixel_rendering +Type: select +_Choices: Automatic, Enable, Disable +Default: Automatic +_Description: Should font be rendered using sub-pixel elements? + With known sub-pixel geometry, LCD screens can synthesize higher resolution + in one dimension. Taking advantage of this when rendering glyphs sharpens + the appearance of text on the screen. This can cause color artifacts, + especially when rendering unhinted or autohinted fonts. + . + This option selects when sub-pixel rendering should be used. Automatic + enables sub-pixel rendering whenever the X server detects an LCD monitor, + which it can generally do when the monitor is built into the computer or + connected with a digital (DVI) cable. Enable forces the system to use + sub-pixel rendering while Disable forces the system to not use sub-pixel + rendering. + +Template: fontconfig/enable_bitmaps +Type: boolean +Default: false +_Description: Enable bitmapped fonts by default? + By default, only outline fonts are used by applications which support + fontconfig. Outline fonts are fonts which scale well to various sizes. + In contrast, bitmapped fonts are often lower quality. Enabling this option + will affect the systemwide default; this and many other fontconfig options + may be enabled or disabled on a per-user basis. diff --git a/debian/libfontconfig1-dev.install b/debian/libfontconfig1-dev.install new file mode 100644 index 0000000..50af778 --- /dev/null +++ b/debian/libfontconfig1-dev.install @@ -0,0 +1,7 @@ +debian/tmp/usr/include/fontconfig/* +debian/tmp/usr/lib/pkgconfig/fontconfig.pc +debian/tmp/usr/lib/libfontconfig*.a +debian/tmp/usr/lib/libfontconfig*.so +debian/tmp/usr/share/man/man3 +debian/tmp/usr/share/doc/fontconfig/fontconfig-devel* usr/share/doc/libfontconfig1-dev/ + diff --git a/debian/libfontconfig1.install b/debian/libfontconfig1.install new file mode 100644 index 0000000..af6d5ed --- /dev/null +++ b/debian/libfontconfig1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libfontconfig*.so.* diff --git a/debian/local.conf.md5sum b/debian/local.conf.md5sum new file mode 100644 index 0000000..402ac6d --- /dev/null +++ b/debian/local.conf.md5sum @@ -0,0 +1,18 @@ +175d36e26749eea8f1e6b98d4383a311 2.1.90-1a +85ca344319416083e7907d407472f51c 2.1.90-1b +0d5e958e03c3bc410bbf1edfd05c9a0a 2.1.92-1a +c59ba7d38a9e167781b2dea6202836c5 2.1.92-1b +85ca344319416083e7907d407472f51c 2.1.92-1c +5095e9ad666ed7615f4fea48c03c34c3 2.1.92-1d +30dd06e06a0bdfe5807aaec6dfd32c00 2.1.92-2a +abc56a60f57d08723367d2baabff52e8 2.1.92-2b +d70b4afe9a9500bbb64f85a3cf5d07d1 2.1.92-2c +5257c46342ff7e5322721f0bcefc7df2 2.1.92-2d +924af23e6df6c7947344fbbd9699ddbf 2.2.1-4a +ebc36a4fd11fc3dbcc1e6247d641fb1e 2.2.1-4b +ad908e2bf7c005e791060ab505778982 2.2.1-4c +2f20274fa03fc04050c9d36a783a1b4d 2.2.1-4d +de9be282507bca2c4dd90ce8ed8e14da 2.2.1-4e +b7d75b0803bcc247db190ffdcc1d2621 2.2.1-4f +77b9ecac7dde1e290214a0551ba71189 2.2.1-4g +559b9c549f10510a39b8ac104f7cf0e2 2.2.1-4h diff --git a/debian/no-sub-pixel.conf b/debian/no-sub-pixel.conf new file mode 100644 index 0000000..b62d2ef --- /dev/null +++ b/debian/no-sub-pixel.conf @@ -0,0 +1,12 @@ + + + + + + + + unknown + + none + + diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 0000000..e8c4d38 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] fontconfig.templates diff --git a/debian/po/cs.po b/debian/po/cs.po new file mode 100644 index 0000000..35b3a84 --- /dev/null +++ b/debian/po/cs.po @@ -0,0 +1,154 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-10-24 18:49+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "Kter metoda se m pout pro vykreslovn textu?" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "Povolit implicitn bitmapov fonty?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Standardn jsou v aplikacch podporujcch fontconfig pouvny pouze " +"obrysov fonty. Tyto fonty se velmi dobe zvtuj a zmenuj. Oproti nim " +"mohou zvtovan bitmapov fonty vypadat kostrbat. Tato volba ovlivn " +"implicitn nastaven celho systmu, nicmn uivatel si ji mohou zmnit ve " +"svm osobnm nastaven." + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Interpret bytekdu (CRT monitory), Autohinter, Podpixelov renderovn " +#~ "(LCD obrazovky)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "Knihovna Freetype um vykreslovat psma rznmi metodami. Podle vaeho " +#~ "hardwaru a typu pouitch font mete s nktermi metodami doshnout " +#~ "lepch vsledk." + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "Modul autohinter je implicitn, protoe dv sprvn vsledky na vtin " +#~ "konfigurac. Interpret bytekdu kresl psma velmi oste a pokud mte " +#~ "klasick monitor, bv asto lep volbou. Analogicky je podpixelov " +#~ "renderovn pizpsobeno pro vysoce kvalitn vstup na vtin LCD " +#~ "monitor." diff --git a/debian/po/da.po b/debian/po/da.po new file mode 100644 index 0000000..e7749ba --- /dev/null +++ b/debian/po/da.po @@ -0,0 +1,174 @@ +# translation of fontconfig debconf template to Danish +# Reviewed by Ole Laursen, 2004 +# Claus Hindsgaul , 2004. +# +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig_2.2.2-1_da\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-11-19 16:56+0100\n" +"Last-Translator: Claus Hindsgaul \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "Hvilken metode skal benyttes til at tegne tekst?" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "Aktivér billedbaserede skrifttyper som standard?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Som udgangspunkt bruges kun vektor-skrifttyper af programmer, der " +"understøtter fontconfig. Vektor-skrifttyper skalerer godt til forskellige " +"størrelser. Derimod er billedbaserede skrifttyper (\"bitmap fonts\") ofte af " +"dårligere kvalitet. Aktivering af denne funktion vil påvirke hele systemets " +"standardindstilling. Denne og mange andre fontconfig-tilvalg kan aktiveres " +"eller deaktiveres for hver enkelt bruger." + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Bytekode-fortolker (billedrør), Autohinter, Delpiksel-optegning (LCD-" +#~ "skærme)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "Skrifttypebiblioteket Freetype kan tegne skrifter med forskellige " +#~ "metoder. Afhængigt af dit udstyr og de skrifter, du normalt bruger, vil " +#~ "nogle være bedre end andre." + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "Autohinter-modulet er valgt som standard; det giver de korrekte " +#~ "resultater i de fleste opsætninger. Bytekode-fortolkeren tegner " +#~ "skrifterne meget skarpt op, og er oftest det bedste velg, hvis du bruger " +#~ "en billedrørs-skærm. På den anden side er delpiksel-optegningsmetoden " +#~ "optimeret til visning på den høje kvalitet, fladskærme (LCD) besidder." + +#~ msgid "Enable sub-pixel text rendering?" +#~ msgstr "Aktivér delpiksel-tekstoptegning?" + +#~ msgid "" +#~ "If you have an LCD display, then you will want to enable this option. It " +#~ "allows for higher-quality text rendering. For more information, please " +#~ "see the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian " +#~ "system." +#~ msgstr "" +#~ "Hvis du har en LCD-skærm, bør du aktivere denne funktion. Den tillader " +#~ "tekstoptegning i højere kvalitet. Flere oplysninger finder du i " +#~ "fontconfigs brugervejledning i /usr/share/doc/fontconfig/ på dit " +#~ "Debiansystem." + +#~ msgid "Enable the freetype autohinter module?" +#~ msgstr "Aktivér freetype-autohinter-modul?" + +#~ msgid "" +#~ "Depending on your display and on which fonts you use, they can look " +#~ "better or worse when using the autohinter module. Enable it if you happen " +#~ "to prefer the look it gives to your fonts." +#~ msgstr "" +#~ "Afhængig af din skærm og hvilke skrifttyper, du bruger, kan de se bedre " +#~ "eller dårligere ud, når du bruger autohinter-modulet. Aktivér det, hvis " +#~ "du foretrækker det udseende, det giver dine skrifttyper." diff --git a/debian/po/de.po b/debian/po/de.po new file mode 100644 index 0000000..4379e52 --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,157 @@ +# translation of fontconfig_2.2.2-2_templates.po to German +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Erik Schanze , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig_2.2.3-3_de\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-11-13 17:50+0100\n" +"Last-Translator: Erik Schanze \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "Wie sollen Schriften gerendert werden?" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "Standardmäßig Bitmap-Schriften verwenden?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Standardmäßig werden von Anwendungen, die fontconfig unterstützen, nur " +"Outline-Schriften verwendet. Outline-Schriften können gut in verschiedene " +"Größen skaliert werden. Bitmap-Schriften sind im Gegensatz dazu oft von " +"geringerer Qualität. Mit dem Einschalten dieser Option wird sie zum " +"systemweiten Standard; diese und viele andere Einstellungen von fontconfig " +"können benutzerbezogen ein- und ausgeschaltet werden." + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Bytecode-Interpreter (Röhrenmonitore), Autohinter, Subpixel-Rendering " +#~ "(Flachbildschirme)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "Die Schriftart-Bibliothek Freetype kann Schriften verschiedenartig " +#~ "rendern. Von Ihren Geräten und den normalerweise genutzten Schriften, " +#~ "hängt es ab, welche Methode zu besseren Ergebnissen führt." + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "Das Modul Autohinter ist voreingestellt; es führt mit den meisten Geräten " +#~ "zu guten Ergebnissen. Der Bytecode-Interpreter stellt Schriften sehr " +#~ "scharfkantig dar und ist bei Kathodenstrahl-Monitoren meist die bessere " +#~ "Wahl. Dagegen ist das Subpixel-Rendering auf hohe Render-Qualität für die " +#~ "meisten Flüssigkristall-Bildschirme optimiert." diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 0000000..cf8bc18 --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,198 @@ +# fontconfig debconf translation to spanish +# Copyright (C) 2004 Software in the Public Interest +# This file is distributed under the same license as the fontconfig package. +# +# Changes: +# - Initial translation +# Fco. Javier Snchez Castelo , 2004 +# - Revision: +# Javier Fernndez-Sanguino Pea +# - Translation of new paragraphs: +# Rubn Porras , 2004 +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentacin de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traduccin al espaol, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traduccin de Debian al espaol +# http://www.debian.org/intl/spanish/coordinacion +# especialmente las notas de traduccin en +# http://www.debian.org/intl/spanish/notas +# +# - La gua de traduccin de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +msgid "" +msgstr "" +"Project-Id-Version: fontconfig 2.2.3-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-10-24 14:05+0200\n" +"Last-Translator: Rubn Porras\n" +"Language-Team: Debian Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "Con qu mtodo se deben interpretar los textos?" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "Activar el tipo de letra bitmapped por omisin?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Por omisin, slo las aplicaciones que admiten fontconfig usan tipos de " +"letra outline. Estos tipos de letra escalan bastante bien en distintos " +"tamaos. Sin embargo, el tipo de letra bitmapped es habitualmente de peor " +"calidad. Activar esta opcin afectar al valor por omisin de todo el " +"sistema; los usuarios podrn, de forma individual, activar sta y muchas " +"otras opciones de fontconfig." + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Intrprete bytecode (pantallas TRC), Autohinter, Intrprete mediante " +#~ "subpxeles (pantallas LCD)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "La biblioteca Freetype es capaz de interpretar los tipos de letra usando " +#~ "varios mtodos. Dependiendo del hardware y los tipos de letra que use " +#~ "habitualmente, algunos darn mejores resultados." + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "El mdulo autohinter es el predeterminado; obtiene resultados correctos " +#~ "en la mayora de las configuraciones. El intrprete bytecode genera " +#~ "tipos de letra muy marcada, y suele ser la mejor opcin si usa una " +#~ "pantalla de rayos catdicos. Por otro lado, el intrprete mediante " +#~ "subpxeles est optimizado para obtener resultados de alta calidad en " +#~ "pantallas de cristal lquido." + +#~ msgid "Enable sub-pixel text rendering?" +#~ msgstr "Activar el renderizado de sub-pixel de texto?" + +#~ msgid "" +#~ "If you have an LCD display, then you will want to enable this option. It " +#~ "allows for higher-quality text rendering. For more information, please " +#~ "see the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian " +#~ "system." +#~ msgstr "" +#~ "Si tiene un monitor LCD, entonces seguramente querr activar esta opcin. " +#~ "Esta permite renderizar el texto con mejor calidad. Para ms informacin, " +#~ "por favor vea el manual de fontconfig en /usr/share/doc/fontconfig/ en " +#~ "su sistema Debian." + +#~ msgid "Enable the freetype autohinter module?" +#~ msgstr "Activar el mdulo freetype autohinter?" + +#~ msgid "" +#~ "Depending on your display and on which fonts you use, they can look " +#~ "better or worse when using the autohinter module. Enable it if you happen " +#~ "to prefer the look it gives to your fonts." +#~ msgstr "" +#~ "Dependiendo de su monitor y del tipo de letra que utilice, podr " +#~ "visualizarla mejor o peor cuando use el mdulo autohinter. Actvelo si " +#~ "prefiere el aspecto que le da a sus tipos de letra." diff --git a/debian/po/fr.po b/debian/po/fr.po new file mode 100644 index 0000000..82f7c3b --- /dev/null +++ b/debian/po/fr.po @@ -0,0 +1,194 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig 2.2.3-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-10-23 17:00+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "Mthode utiliser pour le rendu des textes :" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "Voulez-vous des polices de type bitmap par dfaut?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Par dfaut, seules les polices de type contour (outline) sont utilises " +"par les applications qui utilisent fontconfig. Ces polices gardent toutes " +"leurs qualits dans les diffrentes tailles. Les polices de type bitmap, " +"au contraire, ont souvent une qualit moindre. Cette option affectera la " +"valeur par dfaut pour tout le systme; chaque utilisateur peut activer ou " +"dsactiver cette option ainsi que d'autres options de fontconfig." + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Interprteur de bytecode (crans CRT), Autohinter, Lissage sous-pixel " +#~ "(crans LCD)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "La bibliothque Freetype utilise plusieurs mthodes pour le rendu des " +#~ "polices. Selon votre matriel et les polices afficher, certaines sont " +#~ "meilleures que d'autres." + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "Le module autohinter est la mthode par dfaut. Elle donne de bons " +#~ "rsultats sur la plupart des configurations. L'interprteur de bytecode " +#~ "offre un rendu prcis, c'est souvent le meilleur choix si vous possdez " +#~ "un cran CRT. Enfin, la mthode du lissage sous-pixel offre un rendu de " +#~ "haute qualit sur la plupart des crans LCD." + +#~ msgid "Enable sub-pixel text rendering?" +#~ msgstr "Voulez-vous activer le lissage sous-pixel pour le texte?" + +#~ msgid "" +#~ "If you have an LCD display, then you will want to enable this option. It " +#~ "allows for higher-quality text rendering. For more information, please " +#~ "see the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian " +#~ "system." +#~ msgstr "" +#~ "Si vous utilisez un cran LCD, cette option est pour vous. Elle donne une " +#~ "plus grande qualit au rendu des textes. Pour davantage d'informations, " +#~ "veuillez consulter le manuel de fontconfig dans /usr/share/doc/" +#~ "fontconfig/." + +#~ msgid "Enable the freetype autohinter module?" +#~ msgstr "Voulez-vous utiliser le module autohinter?" + +#~ msgid "" +#~ "Depending on your display and on which fonts you use, they can look " +#~ "better or worse when using the autohinter module. Enable it if you happen " +#~ "to prefer the look it gives to your fonts." +#~ msgstr "" +#~ "Le module autohinter peut, ou non, amliorer l'affichage des polices que " +#~ "vous utilisez. Utilisez-le si vous pensez qu'il amliore l'apparence de " +#~ "vos polices." + +#~ msgid "Overwrite existing /etc/fonts/local.conf?" +#~ msgstr "Faut-il modifier le fichier /etc/fonts/local.conf?" + +#~ msgid "" +#~ "You appear to have an already existing /etc/fonts/local.conf. Choosing to " +#~ "continue at this point will overwrite any changes you have made in this " +#~ "file. The curent version will be backed up to /etc/fonts/local.conf.old." +#~ msgstr "" +#~ "Un fichier /etc/fonts/local.conf existe dj. Si vous continuez " +#~ "l'installation, les modifications que vous avez apportes ce fichier " +#~ "seront effaces. La version actuelle sera sauvegarde dans /etc/fonts/" +#~ "local.conf.old." diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 0000000..b73d2d3 --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,180 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-10-24 09:28+0900\n" +"Last-Translator: Kenshi Muto \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "ƥȤɤˡ褷ޤ?" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "ǥեȤǥӥåȥޥåץեȤͭˤޤ?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"ǥեȤǤϡȥ饤եȤΤߤ fontconfig 򥵥ݡȤ륢ץ" +"ǻȤޤȥ饤եȤϤޤޤʥ˹碌礭" +"ѤեȤǤоŪ˥ӥåȥޥåץեȤϤƤʼǤ" +"ͭˤȡƥΤΥǥեȤȵڤޤȤۤ¿" +" fontconfig ϴŪ˥桼Ȥ̵ͭˤǤޤ" + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Хȥɥ󥿥ץ꥿ (CRT ), ȥҥ, ֥ԥ" +#~ " (LCD )" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "Freetype եȥ饤֥ϰۤʤˡǥեȤǤޤɤ줬" +#~ "ɤ̤ˤʤ뤫ϡϡɥӰ̤ѤեȤ˰¸" +#~ "ޤ" + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "ȥҥȥ⥸塼ϥǥեȤǤۤȤɤŬڤʷ̤ˤʤ" +#~ "Хȥɥ󥿥ץ꥿ϥեȤ褷CRT ̤Ȥ" +#~ "ƤȤˤϤɤˤʤ뤳ȤޤФ֥ԥ" +#~ "󥰼ˡϡۤȤɤ LCD ̤ǤιʼΤ˺Ŭ" +#~ "Ƥޤ" + +#~ msgid "Enable sub-pixel text rendering?" +#~ msgstr "֥ԥƥȥ󥰤ͭˤޤ?" + +#~ msgid "" +#~ "If you have an LCD display, then you will want to enable this option. It " +#~ "allows for higher-quality text rendering. For more information, please " +#~ "see the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian " +#~ "system." +#~ msgstr "" +#~ "LCD ǥץ쥤ȤäƤΤǤСͭˤΤ褤" +#~ "礦ʼΥƥȥ󥰤Ǥޤܺ٤ˤĤƤϤʤ " +#~ "Debian ƥ /usr/share/doc/fontconfig/ ˤ fontconfig Υޥ˥奢" +#~ "򻲾ȤƤ" + +#~ msgid "Enable the freetype autohinter module?" +#~ msgstr "freetype ȥҥȥ⥸塼ͭˤޤ?" + +#~ msgid "" +#~ "Depending on your display and on which fonts you use, they can look " +#~ "better or worse when using the autohinter module. Enable it if you happen " +#~ "to prefer the look it gives to your fonts." +#~ msgstr "" +#~ "ȥҥȥ⥸塼ȤäȤˤɤ褦ˤʤ뤫갭ʤ" +#~ "ϡʤΥǥץ쥤ѤեȤ˰¸ޤեȤ" +#~ "褦Ǥͭˤޤ" diff --git a/debian/po/nl.po b/debian/po/nl.po new file mode 100644 index 0000000..dd4d4ae --- /dev/null +++ b/debian/po/nl.po @@ -0,0 +1,158 @@ +# translation of nl.po to Dutch +# translation of fontconfig_2.2.1-16_nl.po to Dutch +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Frans Pop , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: nl\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-11-03 22:00+0100\n" +"Last-Translator: Frans Pop \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "Volgens welke methode moet tekst worden weergegeven?" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "Bitmap-lettertypen standaard activeren?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Standaard worden alleen 'outline' lettertypen gebruikt door applicaties die " +"fontconfig ondersteunen. 'Outline' lettertypen zijn lettertypen die goed " +"geschaald kunnen worden naar verschillende lettergroottes. Daarentegen zijn " +"'bitmapped' lettertypen vaak van een lagere kwaliteit; deze, en vele andere, " +"opties van fontconfig kunnen voor elke gebruiker afzonderlijk ingesteld " +"worden." + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Bytecode interpreter (CRT-monitoren), Autohinter, Subpixel weergave (LCD-" +#~ "monitoren)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "De Freetype lettertype-bibliotheek kan lettertypen weergeven volgens " +#~ "verschillende methoden. Afhankelijk van uw apparatuur en de lettertypen " +#~ "die u gewoonlijk gebruikt, kan de ene methode betere resultaten geven dan " +#~ "de andere." + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "De module 'autohinter' is de standaardwaarde; het geeft op de meeste " +#~ "configuraties een goed resultaat. De 'bytecode interpreter' geeft " +#~ "lettertypen zeer scherp weer en is vaak een betere keus als u een CRT-" +#~ "monitor heeft. De methode 'subpixel weergave' daarentegen is " +#~ "geoptimaliseerd voor weergave met hoge kwaliteit op LCD-monitor." diff --git a/debian/po/pt.po b/debian/po/pt.po new file mode 100644 index 0000000..e40498b --- /dev/null +++ b/debian/po/pt.po @@ -0,0 +1,145 @@ +# Portuguese translation of fontconfig +# 2004 Miguel Figueiredo +msgid "" +msgstr "" +"Project-Id-Version: fontconfig 2.2.3-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-10-24 12:23+0000\n" +"Last-Translator:Miguel Figueiredo \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "Com qual método deverá ser desenhado o texto?" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "Permitir tipos de letra bitmap por omissão?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Por omissão, apenas tipos de letra de contornos são utilizados em aplicações " +"que suportam o fontconfig. Tipos de fonte de contornos são tipos de letra " +"que escalam em vários tamanhos. Em contraste, tipos de letra bitmap têm " +"muitas vezes menos qualidade. Ligando esta opção irá afectar os valores por " +"omissão de todo o sistema; esta e muitas outras opções do fontconfig são " +"ligadas ou desligadas num controle por utilizador." + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Interpretador de Bytecode (ecrãs CRT), Autohinter, Subpixel rendering " +#~ "(ecrãs LCD)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "A biblioteca de tipos de letra Freetype consegue desenhar fontes com " +#~ "diferentes métodos. Dependendo do seu hardware e das fontes que utiliza " +#~ "normalmente, alguns darão melhores resultados." + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "O módulo autohinter é o escolhido por omissão; dá resultados correctos na " +#~ "maioria das configurações. O interpretador de bytecode desenha os tipos " +#~ "de letra muito nítidos, e é muitas vezes a melhor escolha se está a " +#~ "utilizar um ecrã de raios catódicos. De outro modo, o método de desenho " +#~ "de subpixel é optimizado para desenho de alta qualidade na maioria dos " +#~ "ecrãs de cristais líquidos." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po new file mode 100644 index 0000000..aca9a74 --- /dev/null +++ b/debian/po/pt_BR.po @@ -0,0 +1,183 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-10-30 13:01-0300\n" +"Last-Translator: Andr Lus Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "Os textos devem ser renderizados usando qual mtodo ?" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "Habilitar fontes bitmapped por padro ?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Por padro, somente fontes desenhadas so usadas por aplicaes que suportam " +"o fontconfig. Fontes desenhadas (outline) so fontes que escalam bem em " +"diversos tamanhos. Em contraste, fontes bitmapped so geralmente de uma " +"qualidade menor. A habilitao desta opo ir afetar o padro de todo o " +"sistema; essa e muitas outras opes do fontconfig podem ser habilitadas ou " +"desabilitadas para cada usurio." + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Interpretador de bytecode (telas CRT), Autohinter, Renderizao de " +#~ "subpixel (telas CRT)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "A biblioteca de fontes Freetype capaz de renderizar fontes usando " +#~ "diferentes mtodos. Dependendo de seu hardware e das fontes que voc " +#~ "geralmente utiliza, alguns mtodos podero oferecer melhores resultados." + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "O mdulo autohinter o padro, pois fornece resultados corretos na " +#~ "maioria das configuraes. O interpretador de bytecode renderiza fontes " +#~ "bastante afiadas e geralmente uma melhor escolha caso voc esteja " +#~ "usando um monitor de raios catdicos. Por outro lado, o mtodo de " +#~ "renderizao de subpixel otimizado para renderizao de alta qualidade " +#~ "na maioria dos displays de cristal lquido." + +#~ msgid "Enable sub-pixel text rendering?" +#~ msgstr "Habilitar renderizao de texto de sub-pixel ?" + +#~ msgid "" +#~ "If you have an LCD display, then you will want to enable this option. It " +#~ "allows for higher-quality text rendering. For more information, please " +#~ "see the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian " +#~ "system." +#~ msgstr "" +#~ "Caso voc possua um monitor LCD voc ir desejar habilitar esta opo. A " +#~ "mesma proporciona uma renderizao de texto de alta qualidade. Para " +#~ "maiores informaes, por favor consulte o manual do fontconfig em /usr/" +#~ "share/doc/fontconfig/ em seu sistema Debian." + +#~ msgid "Enable the freetype autohinter module?" +#~ msgstr "Habilitar o mdulo freetype autohinter ?" + +#~ msgid "" +#~ "Depending on your display and on which fonts you use, they can look " +#~ "better or worse when using the autohinter module. Enable it if you happen " +#~ "to prefer the look it gives to your fonts." +#~ msgstr "" +#~ "Dependendo de seu monitor e das fontes que voc usa, as mesmas podem ter " +#~ "uma melhor ou pior aparncia quando voc utiliza o mdulo autohinter. " +#~ "Habilite-o caso voc prefira a aparncia que o mesmo oferece suas " +#~ "fontes." diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 0000000..5461486 --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,120 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "With what method should fonts be hinted?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" diff --git a/debian/po/tr.po b/debian/po/tr.po new file mode 100644 index 0000000..50c1579 --- /dev/null +++ b/debian/po/tr.po @@ -0,0 +1,150 @@ +# Turkish translation of fontconfig. +# This file is distributed under the same license as the fontconfig package. +# Gürkan Aslan , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-10-23 16:23+0300\n" +"Last-Translator: Gürkan Aslan \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "Metinler hangi yöntemle kaplansın?" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "Biteşlemli yazıtipleri öntanımlı olarak etkinleştirilsin mi?" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"Fontconfig'i destekleyen uygulamalarda ön tanımlı olarak sadece " +"ölçeklenebilir yazıtipleri kullanılır. Ölçeklenebilir yazıtipleri " +"kalitesinden birşey kaybetmeden çeşitli boyutlara ölçeklendirilebilir. Buna " +"karşılık, biteşlemli yazıtipleri çoğunlukla düşük kalitelidir. Bu seçeneği " +"etkinleştirmek sistem genelinde geçerli öntanımlı ayarları etkileyecektir; " +"alternatif olarak bu ve diğer birçok fontconfig seçeneğinin kullanıcı " +"bazında etkinleştirilmesi de tercih edilebilir." + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "" +#~ "Bytecode yorumlayıcı (CRT ekranlar), Otomatik sezinleyici (Autohinter), " +#~ "Piksel-altı kaplama (LCD ekranlar)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "Freetype yazıtipi kitaplığı yazıtiplerini farklı yöntemler kullanarak " +#~ "kaplayabilmektedir. Kullandığınız donanım ve yazıtiplerine bağlı olarak " +#~ "bu yöntemlerden bazıları diğerlerine nispetle daha iyi sonuçlar " +#~ "verecektir." + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "Öntanımlı seçenek otomatik sezinleyici modülüdür; çoğu yapılandırmada " +#~ "doğru sonuçlar verir. \"Bytecode\" yorumlayıcı, yazıtiplerini çok keskin " +#~ "hatlarla kaplar ve katod-ışınlı bir ekran (CRT) kullanıyorsunuz " +#~ "genellikle daha iyi bir seçimdir. Öte yandan, piksel-altı (subpixel) " +#~ "metin kaplama yöntemi çoğu sıvı kristal ekranda (LCD) yüksek kaplama " +#~ "kalitesi sağlamaya yönelik olarak iyileştirilmiştir." diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po new file mode 100644 index 0000000..df04f09 --- /dev/null +++ b/debian/po/zh_CN.po @@ -0,0 +1,148 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: fontconfig debconf\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"PO-Revision-Date: 2004-11-03 00:14+1300\n" +"Last-Translator: Carlos Liu \n" +"Language-Team: Debian Chinese [GB] \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../fontconfig.templates:3 +msgid "Native, Autohinter, None" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +#, fuzzy +msgid "With what method should fonts be hinted?" +msgstr "您希望使用哪种文本渲染方式？" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"The FreeType font library can adjust glyph outlines to accomodate the pixel " +"grid for improved legibility. This process is called \"hinting\". FreeType " +"can either use the hints built-in to each font or it can use a format-" +"indepedent Autohinter. For most font formats, using the format-specific " +"hints generates better results. However, many freely available TrueType " +"format fonts don't include any hints at all. When loading such a font, " +"unless you specifically ask to use the Autohinter, these fonts will end up " +"unhinted, which will make them appear fuzzy on the screen." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"If the TrueType fonts you use most include hints, then the Native hinter " +"gives better results. However, if the fonts you use most do not include " +"such hints, then the Autohinter will work better. Yes, FreeType should do " +"this automatically." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:5 +msgid "" +"You can also select None to disable all hinting and make your screen look " +"like Mac OS X." +msgstr "" + +#. Type: select +#. Choices +#: ../fontconfig.templates:28 +msgid "Automatic, Enable, Disable" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "Should font be rendered using sub-pixel elements?" +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"With known sub-pixel geometry, LCD screens can synthesize higher resolution " +"in one dimension. Taking advantage of this when rendering glyphs sharpens " +"the appearance of text on the screen. This can cause color artifacts, " +"especially when rendering unhinted or autohinted fonts." +msgstr "" + +#. Type: select +#. Description +#: ../fontconfig.templates:30 +msgid "" +"This option selects when sub-pixel rendering should be used. Automatic " +"enables sub-pixel rendering whenever the X server detects an LCD monitor, " +"which it can generally do when the monitor is built into the computer or " +"connected with a digital (DVI) cable. Enable forces the system to use sub-" +"pixel rendering while Disable forces the system to not use sub-pixel " +"rendering." +msgstr "" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "Enable bitmapped fonts by default?" +msgstr "默认使用点阵字体吗？" + +#. Type: boolean +#. Description +#: ../fontconfig.templates:46 +msgid "" +"By default, only outline fonts are used by applications which support " +"fontconfig. Outline fonts are fonts which scale well to various sizes. In " +"contrast, bitmapped fonts are often lower quality. Enabling this option will " +"affect the systemwide default; this and many other fontconfig options may be " +"enabled or disabled on a per-user basis." +msgstr "" +"默认状态下，仅有轮廓字体可以被支持 fontconfig 的程序所使用。轮廓字体可以在不" +"同的尺寸上进行平滑缩放。而相反的，点阵字体通常只能提供低质量的显示效果。开启" +"此选项将会影响整个系统的默认设置。当然，此选项以及其它很多 fontconfig 设置都" +"可以基于每个用户单独进行开启或关闭。" + +#~ msgid "" +#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +#~ "screens)" +#~ msgstr "Bytecode 解释器 (CRT 显示器), 自动微调, 次像素渲染 (LCD 液晶显示器)" + +#~ msgid "" +#~ "The Freetype font library is able to render fonts with different methods. " +#~ "Depending on your hardware and the fonts you generally use, some will " +#~ "give better results." +#~ msgstr "" +#~ "Freetype 字体库程序可以使用多种不同的方法进行字体渲染。根据您的硬件和通常" +#~ "所使用的字体，其中某些方法会有较好的显示效果。" + +#~ msgid "" +#~ "The autohinter module is the default; it gives correct results on most " +#~ "configurations. The bytecode interpreter renders fonts very sharply, and " +#~ "is often a better choice if you are using a cathode-ray screen. On the " +#~ "other hand, the subpixel rendering method is optimized for high-quality " +#~ "rendering on most liquid crystal displays." +#~ msgstr "" +#~ "自动微调模块是默认的选项，它能对大多数配置提供正确的显示结果。Bytecode 解" +#~ "释器的字体渲染效果非常锐利，比较适合用于阴极射线管显示器。而次像素渲染方式" +#~ "则是针对液晶显示器上高质量渲染的优化设置。" diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ed4afd6 --- /dev/null +++ b/debian/rules @@ -0,0 +1,39 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters + +# This ensures the fontconfig package is built after libfontconfig1 +binary/fontconfig:: binary/libfontconfig1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-docs --with-add-fonts=/usr/X11R6/lib/X11/fonts/Type1,/usr/local/share/fonts + +# tight versioning +DEB_DH_MAKESHLIBS_ARGS_fontconfig-udeb := --no-act +DEB_DH_MAKESHLIBS_ARGS_libfontconfig1 := -V"libfontconfig1 (>= 2.2.1)" + +DEB_SHLIBDEPS_LIBRARY_fontconfig := libfontconfig1 +DEB_SHLIBDEPS_INCLUDE_fontconfig := debian/libfontconfig1/usr/lib/ + +DEB_DH_STRIP_ARGS := --dbg-package=libfontconfig1 + +clean:: + debconf-updatepo + rm -f config/Makedefs Makefile {src,fontconfig}/Makefile fc-{cache,list}/Makefile fontconfig-config fontconfig.pc config.h + +# work around dh_installman bug +binary-post-install/libfontconfig1-dev:: + if test -f debian/libfontconfig1-dev/usr/share/man/man3/fonts-conf.5; then \ + mkdir -p debian/libfontconfig1-dev/usr/share/man/man5/; \ + mv debian/libfontconfig1-dev/usr/share/man/man3/fonts-conf.5 debian/libfontconfig1-dev/usr/share/man/man5/fonts-conf.5; \ + fi + +%.1: %.sgml + docbook-to-man $< > $@ + +# defoma stuff +binary-post-install/fontconfig:: + dh_installdefoma diff --git a/debian/unhinted.conf b/debian/unhinted.conf new file mode 100644 index 0000000..fb0b375 --- /dev/null +++ b/debian/unhinted.conf @@ -0,0 +1,9 @@ + + + + + + + false + + diff --git a/doc/.cvsignore b/doc/.cvsignore index 227c8f4..2736787 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -2,6 +2,7 @@ Makefile Makefile.in *.txt *.html +*.pdf fontconfig-devel edit-sgml *.o diff --git a/doc/Makefile.am b/doc/Makefile.am index 622de9b..b1a2aee 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -75,7 +75,8 @@ DOC_FUNCS_SGML=\ fcstrset.sgml \ fcvalue.sgml -man_MANS=fonts-conf.5 @DOCMAN3@ +man5_MANS=fonts-conf.5 +man3_MANS=$(DOCMAN3) noinst_PROGRAMS=edit-sgml edit_sgml_SOURCES=edit-sgml.c @@ -83,7 +84,7 @@ edit_sgml_SOURCES=edit-sgml.c docdir=@DOCDIR@ DOC_FILES=$(TXT) $(PDF) $(HTML_FILES) -LOCAL_DOCS=$(man_MANS) $(DOC_FILES) $(HTML_DIR)/* +LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/* EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(FNCS_TMPL) confdir.sgml.in @@ -103,7 +104,7 @@ if USEDOCBOOK $(RM) $@ $(DOC2PDF) $< -$(man_MANS): func.refs +$(man3_MANS): func.refs func.refs: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml $(RM) func.refs @@ -127,19 +128,19 @@ local-fontconfig-user.sgml: fontconfig-user.sgml all-local: $(LOCAL_DOCS) clean-local: - $(RM) $(man_MANS) $(DOC_FILES) $(DOC_FUNCS_SGML) func.refs + $(RM) $(man3_MANS) $(man5_MANS) $(DOC_FILES) $(DOC_FUNCS_SGML) func.refs $(RM) -r $(HTML_DIR) $(HTML_DIR): local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml $(RM) -r $(HTML_DIR) $(DOC2HTML) -o $(HTML_DIR) local-fontconfig-devel.sgml -fontconfig-devel.txt: local-fontconfig-devel.sgml version.sgml confdir.sgml +fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml $(RM) $@ $(DOC2TXT) local-fontconfig-devel.sgml mv local-fontconfig-devel.txt $@ -fontconfig-devel.pdf: local-fontconfig-devel.sgml version.sgml confdir.sgml +fontconfig-devel.pdf: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml $(RM) $@ $(DOC2PDF) local-fontconfig-devel.sgml mv local-fontconfig-devel.pdf $@