Commit dc2e06ab authored by Keith Packard's avatar Keith Packard
Browse files

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
parent 4afc00ca
......@@ -25,3 +25,10 @@ fontconfig-*.tar.gz
ltmain.sh
autom4te.cache
ChangeLog-*
*.deb
*.dsc
*.changes
*.build
*.tar.gz
*.diff.gz
*.udeb
2005-03-02 Keith Packard <keithp@keithp.com>
* .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 <keithp@keithp.com>
* README:
......
......@@ -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
Makefile
Makefile.in
This diff is collapsed.
This diff is collapsed.
*** 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:
<dir>/usr/X11R6/lib/X11/fonts</dir>
in between the <fontconfig> and </fontconfig>.
*****************
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 <joss@debian.org> Wed, 8 Oct 2003 21:51:35 +0200
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- debian/autohint.conf -->
<fontconfig>
<!-- Use the Autohinter -->
<match target="font">
<edit name="autohint" mode="assign"><bool>true</bool></edit>
</match>
</fontconfig>
This diff is collapsed.
Source: fontconfig
Section: devel
Priority: optional
Maintainer: Keith Packard <keithp@debian.org>
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.
This package was debianized by Colin Walters <walters@debian.org> 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.
debian/tmp/usr/lib/libfontconfig*.so.*
debian/tmp/etc/*
debian/tmp/usr/bin/*
#! /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
# -*- perl -*-
# Defoma configuration script for fontconfig
# Copyright © 2003 Angus Lees <gus@debian.org>
# 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 <<EOF;
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "/etc/fonts/fonts.dtd">
<!-- autogenerated by fontconfig.defoma -->
<fontconfig>
<dir>$PkgDir</dir>
EOF
# aliases
foreach (defoma_id_get_font($Id, installed => type => 'SaI')) {
print $fh <<EOF
<alias>
<family>$Id->{e_id}->[$_]</family>
<accept><family>$Id->{e_depid}->[$_]</family></accept>
</alias>
EOF
}
# substituded fonts
foreach (defoma_id_get_font($Id, installed => type => 'SSI')) {
print $fh <<EOF
<alias>
<family>$Id->{e_id}->[$_]</family>
<default><family>$Id->{e_depid}->[$_]</family></default>
</alias>
EOF
}
print $fh "</fontconfig>\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;
/var/lib/fontconfig
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
#!/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