Update to fontsproto 2.1.0

This commit is contained in:
matthieu 2010-04-24 19:52:53 +00:00
parent 6711a3ce25
commit 96759891e5
11 changed files with 182 additions and 188 deletions

View File

@ -1,4 +1,167 @@
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 8ce8e2e50381e8cc7f21af58e6481175d1689ea6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 16:21:09 2009 +1000
* configure.ac:
Update package version number for final X11R7 release candidate.
fontsproto 2.1.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c2c7f7c5b7bc45a2ff99fe252892b803c3d222fd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 16:16:36 2009 +1000
Remove RCS tags
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 72c22dd717afe4c7e796eae634e8c4ec175af677
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 20:06:28 2009 -0200
Janitor: Correct make distcheck and dont distribute autogen.sh
commit 451d42b3e5a32b91e874a32d0874485899e3b350
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:39:01 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
commit 863651c2af7b32bba7eedf5d43fdbd97998bd580
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:54:04 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit 8d5cafd32d08753050738314a291dd2fd3ad91c2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jul 14 18:56:15 2006 -0700
renamed: .cvsignore -> .gitignore
commit 6ddcf067a4b10a306f13b2732c712c0a95fe26ea
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:37 2005 +0000
Update package version number for final X11R7 release candidate.
commit bb2fe46e444a270e506904856e4f989deb67c1bc
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:14 2005 +0000
Update package version number for RC1 release.
commit 9956a3dd5c2931a790c6e7150ddfbd0d620fdf1f
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 2 19:19:38 2005 +0000
Add basic .cvsignore files for proto modules.
commit d63eb21475e0c75a6bf3bb1eeef12b395ccab7b0
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:55 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 4a938cdb4e61bb249c36a36ed480033282dba0c4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat May 21 03:52:47 2005 +0000
Change version to 2.0.
commit 82b845b9a129ec244e42a5718867bdb3f4c5e62d
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 19 00:22:39 2005 +0000
revert last change, didn't do right thing at all, sorry for the noise
commit 46342b904dfb936a8859c1d9a268f0d8c8af123a
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 19 00:10:18 2005 +0000
Require automake 1.7 in AM_INIT_AUTOMAKE
commit e25b847cf67fd41ad36c4cb7b900bf0ed5ce8fb9
Author: Josh Triplett <josh@speakeasy.net>
Date: Sat May 14 09:35:25 2005 +0000
The headers should go in include/X11/fonts, not include/X11/extensions.
commit 747b5f710fd29f8e34d7d5eefbbca3a728fa8346
Author: Josh Triplett <josh@speakeasy.net>
Date: Sat May 14 08:58:05 2005 +0000
Add COPYING file for Fonts.
commit f875959fca0981f17522c6325e072391582090de
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon May 9 18:20:04 2005 +0000
Change all the protonames from <extension>Ext to <extension>Proto.
commit 79c89e7f8bd4a291cc58bc18727503ab853764db
Author: Kevin E Martin <kem@kem.org>
Date: Fri May 6 01:46:30 2005 +0000
Initial build system files for proto module.
commit f8419f84622bf0b65e1ed62c1828d041613a3e01
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 18:43:08 2004 +0000
Merging XORG-CURRENT into trunk
commit 89c4f5b099d21bab972166ea898d8f333d98dad5
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:31:37 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit ae0ac1684eca92422687ae874e058f17239f503e
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:10:54 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 08666a657f4c63581c582807760d53dbd44d068f
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:14 2004 +0000
readding XFree86's cvs IDs
commit bd9361f063b45969747cc3458c4028aeb63a17d1
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:22:28 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit ba8889a4f7dff3d3f4ca15e7cde42baa792cecea
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:02 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 5be5f868949cb6cd23acf73db79193c9adca9681
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:44 2003 +0000
XFree86 4.3.0.1
commit d551e3eaf4060cb24ed68eee06323337f12a95ad
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:44 2003 +0000
Initial revision
commit 387de4c2e956ae535a37da724803bc4acdd9ae3c
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 15:54:35 2003 +0000
R6.6 is the Xorg base-line

View File

@ -1,5 +1,3 @@
/* $Xorg: FS.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
* Copyright 1990, 1991 Network Computing Devices;
* Portions Copyright 1987 by Digital Equipment Corporation
@ -50,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/include/fonts/FS.h,v 1.9 2003/07/09 15:27:28 tsi Exp $ */
#ifndef _FS_H_
#define _FS_H_

View File

@ -1,4 +1,3 @@
/* $Xorg: FSproto.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
/*
Copyright 1990, 1991, 1998 The Open Group
@ -43,7 +42,6 @@ in this Software without prior written authorization from The Open Group.
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
/* $XFree86: xc/include/fonts/FSproto.h,v 1.2 2001/08/01 00:44:37 tsi Exp $ */
#ifndef _FS_PROTO_H_
#define _FS_PROTO_H_

View File

@ -10,4 +10,14 @@ fonts_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontsproto.pc
EXTRA_DIST = autogen.sh fontsproto.pc.in
EXTRA_DIST = fontsproto.pc.in
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog

View File

@ -1,12 +0,0 @@
#! /bin/sh
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"

View File

@ -1,8 +1,12 @@
AC_PREREQ([2.57])
AC_INIT([FontsProto], [2.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_INIT([FontsProto], [2.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.2)
XORG_RELEASE_VERSION
XORG_CHANGELOG
AC_OUTPUT([Makefile
fontsproto.pc])

View File

@ -1,4 +1,3 @@
/* $Xorg: font.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@ -21,8 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/include/fonts/font.h,v 3.4 2000/11/27 00:10:02 dawes Exp $ */
/* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */
#ifndef FONT_H
#define FONT_H

View File

@ -1,5 +1,3 @@
/* $XFree86: xc/include/fonts/fontproto.h,v 1.2 1999/09/04 09:14:08 dawes Exp $ */
/***********************************************************
Copyright (c) 1999 The XFree86 Project Inc.

View File

@ -1,4 +1,3 @@
/* $Xorg: fontstruct.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@ -21,7 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp $ */
#ifndef FONTSTR_H
#define FONTSTR_H

View File

@ -1,4 +1,3 @@
/* $Xorg: fsmasks.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
/*
* Copyright 1990, 1991 Network Computing Devices;
* Portions Copyright 1987 by Digital Equipment Corporation

View File

@ -1,158 +0,0 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
scriptversion=2005-06-29.22
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain.
#
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
errstatus=0
dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
Create each directory DIR (with mode MODE, if specified), including all
leading file name components.
Report bugs to <bug-automake@gnu.org>."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
exit $?
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--version)
echo "$0 $scriptversion"
exit $?
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
for file
do
if test -d "$file"; then
shift
else
break
fi
done
case $# in
0) exit 0 ;;
esac
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
# mkdir -p a/c at the same time, both will detect that a is missing,
# one will create a, then the other will try to create a and die with
# a "File exists" error. This is a problem when calling mkinstalldirs
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version
fi
;;
*)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
do
test -d $d && rmdir $d
done
fi
;;
esac
for file
do
case $file in
/*) pathcomp=/ ;;
*) pathcomp= ;;
esac
oIFS=$IFS
IFS=/
set fnord $file
shift
IFS=$oIFS
for d
do
test "x$d" = x && continue
pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp=$pathcomp/
done
done
exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End: