From 6711a3ce255b2321a2ae1b3aceff5f9c440294c3 Mon Sep 17 00:00:00 2001 From: matthieu Date: Sat, 24 Apr 2010 19:51:28 +0000 Subject: [PATCH] Update to fontcacheproto 0.1.3 --- proto/fontcacheproto/ChangeLog | 165 ++++++++++++++++++++++++++++- proto/fontcacheproto/Makefile.am | 12 ++- proto/fontcacheproto/README | 24 +++++ proto/fontcacheproto/configure.ac | 7 +- proto/fontcacheproto/mkinstalldirs | 158 --------------------------- 5 files changed, 202 insertions(+), 164 deletions(-) create mode 100644 proto/fontcacheproto/README delete mode 100644 proto/fontcacheproto/mkinstalldirs diff --git a/proto/fontcacheproto/ChangeLog b/proto/fontcacheproto/ChangeLog index c722b519a..70753a2c3 100644 --- a/proto/fontcacheproto/ChangeLog +++ b/proto/fontcacheproto/ChangeLog @@ -1,4 +1,163 @@ -2005-12-14 Kevin E. Martin +commit 79b075876c6874f1ad6605962973f2865b2a082a +Author: Alan Coopersmith +Date: Fri Oct 2 19:30:03 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + fontcacheproto 0.1.3 + + Signed-off-by: Alan Coopersmith + +commit 7c8e261c218ff5c0a2806a429725dba437241970 +Author: Alan Coopersmith +Date: Fri Oct 2 19:26:08 2009 -0700 + + Add pointers to mailing list, git repo, and wiki to README + + Signed-off-by: Alan Coopersmith + +commit 6388965137d61913cbb1b8b3b718e6fd359052cc +Author: Alan Coopersmith +Date: Fri Oct 2 19:20:34 2009 -0700 + + Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS + + Signed-off-by: Alan Coopersmith + +commit 211eb4c16534f83527df992c4f68936254455e7b +Author: Paulo Cesar Pereira de Andrade +Date: Tue Jan 27 20:06:28 2009 -0200 + + Janitor: Correct make distcheck and dont distribute autogen.sh + +commit a3055497adbbdf626db22176cedb7795e5684567 +Author: James Cloos +Date: Thu Dec 6 16:39:00 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit f4d701aa7c2d2ece96e3701747cedaee0ad57a44 +Author: James Cloos +Date: Mon Sep 3 05:54:03 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 7e722460a355cbf22d554c7cfc69e7ce03454f06 +Author: Alan Coopersmith +Date: Fri Jul 14 18:56:13 2006 -0700 + + renamed: .cvsignore -> .gitignore + +commit a51ca6a8a428b5be64dc5ad0ad13ff29350768ca +Author: Kevin E Martin +Date: Thu Dec 15 00:24:37 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit cc6820d803058730369b94f0b62d590d309355cc +Author: Kevin E Martin +Date: Wed Oct 19 02:48:14 2005 +0000 + + Update package version number for RC1 release. + +commit edf62f591f28a217b9bc0781e118ce6f762c3fcb +Author: Eric Anholt +Date: Tue Aug 2 19:19:38 2005 +0000 + + Add basic .cvsignore files for proto modules. + +commit 455a177ede4620d9effa1fb167a9e07e747ebd48 +Author: Kevin E Martin +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 83c131b8611f32f9a292a629d13629c6200b5984 +Author: Daniel Stone +Date: Sat May 21 03:50:53 2005 +0000 + + Change version to 0.1. + +commit 1bee3aeab31877963efc323700e19aa259520c88 +Author: Adam Jackson +Date: Thu May 19 00:22:39 2005 +0000 + + revert last change, didn't do right thing at all, sorry for the noise + +commit 5901343a49c424da552a7ef40b53d01b1b77b291 +Author: Adam Jackson +Date: Thu May 19 00:10:17 2005 +0000 + + Require automake 1.7 in AM_INIT_AUTOMAKE + +commit 6da9cb33ea4b587f47fcb0a4e086943afb5f6039 +Author: Josh Triplett +Date: Sat May 14 08:39:45 2005 +0000 + + Add COPYING file for Fontcache. + +commit 32157c7dc40ecf148db657ee8e6c01cf4e23ebb4 +Author: Søren Sandmann Pedersen +Date: Mon May 9 18:20:04 2005 +0000 + + Change all the protonames from Ext to Proto. + +commit 4653ec6e4e4f1917eb374c5ca8211993c76e643d +Author: Kevin E Martin +Date: Fri May 6 01:46:30 2005 +0000 + + Initial build system files for proto module. + +commit cc2328e65469115c32617c2c7434e5110e383d4c +Author: Egbert Eich +Date: Fri Apr 23 18:43:06 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit e15f038c34265c2f984be29b4323786362f3724e +Author: Egbert Eich +Date: Sun Mar 14 08:31:36 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 47edd8743037411048cf5122eb911b916ccf2fba +Author: Egbert Eich +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 5f059cd0b8c545917405b434ae570a57a31c0267 +Author: Egbert Eich +Date: Thu Feb 26 13:35:13 2004 +0000 + + readding XFree86's cvs IDs + +commit 0bd7bac3ccb3ef436ff8f306ec03cac6252e210d +Author: Egbert Eich +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 e9dacf494c059dc3e66a564378679146ff55ed3e +Author: Kaleb Keithley +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 fd314bc875543d6f017cc1910f97e2e723248770 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:43 2003 +0000 + + XFree86 4.3.0.1 + +commit d5552d5100a83653e00cd0f5296dc4557e52754a +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:43 2003 +0000 + + Initial revision diff --git a/proto/fontcacheproto/Makefile.am b/proto/fontcacheproto/Makefile.am index 77328db72..c7d1b453d 100644 --- a/proto/fontcacheproto/Makefile.am +++ b/proto/fontcacheproto/Makefile.am @@ -7,4 +7,14 @@ fontcache_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fontcacheproto.pc -EXTRA_DIST = autogen.sh fontcacheproto.pc.in +EXTRA_DIST = fontcacheproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/proto/fontcacheproto/README b/proto/fontcacheproto/README new file mode 100644 index 000000000..fe3acc914 --- /dev/null +++ b/proto/fontcacheproto/README @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/proto/fontcacheproto + + http://cgit.freedesktop.org/xorg/proto/fontcacheproto + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff --git a/proto/fontcacheproto/configure.ac b/proto/fontcacheproto/configure.ac index 24e980898..774933ef0 100644 --- a/proto/fontcacheproto/configure.ac +++ b/proto/fontcacheproto/configure.ac @@ -1,8 +1,11 @@ AC_PREREQ([2.57]) -AC_INIT([FontcacheProto], [0.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([FontcacheProto], [0.1.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -XORG_RELEASE_VERSION +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile fontcacheproto.pc]) diff --git a/proto/fontcacheproto/mkinstalldirs b/proto/fontcacheproto/mkinstalldirs deleted file mode 100644 index 259dbfcd3..000000000 --- a/proto/fontcacheproto/mkinstalldirs +++ /dev/null @@ -1,158 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2005-06-29.22 - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -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 ." - -# 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: