Hello community,
here is the log from the commit of package xorg-x11-fonts-devel for openSUSE:Factory
checked in at Thu Oct 7 21:51:25 CEST 2010.
--------
--- xorg-x11-fonts-devel/xorg-x11-fonts-devel.changes 2010-04-02 17:51:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-fonts-devel/xorg-x11-fonts-devel.changes 2010-10-05 07:57:21.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Oct 5 05:55:15 UTC 2010 - sndirsch@novell.com
+
+- font-util 1.1.2
+ * This release fixes the bug in the fontutils.m4 autoconf macros
+ that allowed packages generated with these macros to
+ successfully pass configure when required utilities were
+ missing, resulting in build failures that were hard to
+ diagnose, such as "-b: command not found".
+ Existing font packages will need to have autoreconf run after
+ installing the new fontutil.m4 to take advantage of this fix -
+ the next release of the font packages will include this fix in
+ the configure scripts distributed in their tarballs.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
font-util-1.1.1.tar.bz2
New:
----
font-util-1.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-fonts-devel.spec ++++++
--- /var/tmp/diff_new_pack.eXkMpd/_old 2010-10-07 21:51:14.000000000 +0200
+++ /var/tmp/diff_new_pack.eXkMpd/_new 2010-10-07 21:51:14.000000000 +0200
@@ -19,11 +19,11 @@
Name: xorg-x11-fonts-devel
-%define dirsuffix 1.1.1
+%define dirsuffix 1.1.2
BuildRequires: pkgconfig xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 1
+Release: 4
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Fonts
++++++ font-util-1.1.1.tar.bz2 -> font-util-1.1.2.tar.bz2 ++++++
++++ 10807 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/COPYING new/font-util-1.1.2/COPYING
--- old/font-util-1.1.1/COPYING 2009-10-08 05:27:59.000000000 +0200
+++ new/font-util-1.1.2/COPYING 2010-10-05 06:29:15.000000000 +0200
@@ -1,3 +1,26 @@
+Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+ ------------------------------------------------------------------------
+
Copyright (c) 2003 The NetBSD Foundation, Inc.
All rights reserved.
@@ -95,32 +118,3 @@
Unicode Standard, and to make copies of this file in any form for
internal or external distribution as long as this notice remains
attached.
-
- ------------------------------------------------------------------------
-
-Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/ChangeLog new/font-util-1.1.2/ChangeLog
--- old/font-util-1.1.1/ChangeLog 2009-10-12 17:50:16.000000000 +0200
+++ new/font-util-1.1.2/ChangeLog 2010-10-05 06:32:07.000000000 +0200
@@ -1,3 +1,143 @@
+commit 0a715f61f878cfe22470608036c3fdfc7d89bca1
+Author: Alan Coopersmith
+Date: Mon Oct 4 21:31:43 2010 -0700
+
+ font-util 1.1.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit a43ab24c31aa5626b3f28b813a246c4b930b0e97
+Author: Alan Coopersmith
+Date: Mon Oct 4 21:30:06 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith
+
+commit c2112acec406c80cfc29a7af9c2a39afb9c38475
+Author: Gaetan Nadon
+Date: Tue Jul 20 18:45:18 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit 41bf28914ae27d8cf9a93db5fa5f65ca5a68d4bf
+Author: Gaetan Nadon
+Date: Fri Aug 27 18:22:37 2010 -0400
+
+ XORG_FONT_REQUIRED_PROG: should stop when program is missing #14436
+
+ The macro was designed to test for a program and, when missing, stop
+ the configuration. The first parameter to the macro is a variable
+ name which is used by AC_PATH_PROG to store the program path.
+ The test failed to reference the variable content, it tested the
+ variable name which is never blank.
+
+ BDFTOPCF MKFONTSCALE MKFONTDIR COMPRESS and UCS2ANY were affected.
+
+ Reviewed-by: Alan Coopersmith
+ Tested-by: Jesse Adkins
+ Signed-off-by: Gaetan Nadon
+
+commit e8d3097d42969fa1e32eff2ece252ff584d3d56a
+Author: Gaetan Nadon
+Date: Fri Aug 20 09:27:12 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Gaetan Nadon
+
+commit d310e0321f888bf2fc215587457722a73b0f127a
+Author: Alan Coopersmith
+Date: Thu May 20 19:11:38 2010 -0700
+
+ Replace /usr/X11R6 mapfiles path in manpage with actual path via sed
+
+ Signed-off-by: Alan Coopersmith
+
+commit 6ce4badc29d599835a9f2593aa9835b1905a72a2
+Author: Gaetan Nadon
+Date: Sun Mar 28 14:45:56 2010 -0400
+
+ config: remove fontutil.pc.in from the EXTRA_DIST variable
+
+ It is automatically distributed in the tarball by Automake
+
+ Reviewed-by: Dan Nicholson
+ Signed-off-by: Gaetan Nadon
+
+commit 86893646727ac02b46d67ec81502451463dd9ed2
+Author: Gaetan Nadon
+Date: Sat Mar 27 11:21:41 2010 -0400
+
+ config: generated fontutil.m4 is "installed", not "distributed"
+
+ Generated files are not included in the tarball, only .in files
+ The fontutil.m4.in file is added in the tarball by Automake.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 85e9d27df3e806106d395f66143bcc1372fece90
+Author: Alan Coopersmith
+Date: Thu Jan 14 21:51:38 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith
+
+commit af6b1bfacb2ebd2dc27b5c81398ec3d9f5cd35cc
+Author: Gaetan Nadon
+Date: Mon Nov 23 14:59:02 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit b80d458dbe1704a7a351849a6e588c57205ac9c9
+Author: Gaetan Nadon
+Date: Sun Oct 18 20:49:07 2009 -0400
+
+ Makefile.am: add INSTALL target and clean ChangeLog DIST targets
+
+ Add INSTALL target to generate file with INSTALL_CMD #24206
+ ChangeLog is not required in EXTRA_DIST #24432
+ ChangeLog is not required in MAINTAINERCLEANFILES #24432
+
+commit af090eb780ae74f102d6eda036e0b3bc888561b4
+Author: Gaetan Nadon
+Date: Sun Oct 18 20:34:34 2009 -0400
+
+ INSTALL, NEWS, README COPYING or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ COPYING may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 2ca7b784d9a53e00a393dcfd7c4ea1bf7223d98b
+Author: Gaetan Nadon
+Date: Mon Nov 23 13:38:51 2009 -0500
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit 640a11b930dde29a5a74bcecec858d0a8255c013
Author: Alan Coopersmith
Date: Mon Oct 12 08:49:02 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/INSTALL new/font-util-1.1.2/INSTALL
--- old/font-util-1.1.1/INSTALL 2009-10-07 02:35:55.000000000 +0200
+++ new/font-util-1.1.2/INSTALL 2010-10-05 06:32:07.000000000 +0200
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/Makefile.am new/font-util-1.1.2/Makefile.am
--- old/font-util-1.1.1/Makefile.am 2009-10-06 23:20:11.000000000 +0200
+++ new/font-util-1.1.2/Makefile.am 2010-09-04 01:14:32.000000000 +0200
@@ -19,6 +19,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = bdftruncate ucs2any
AM_CFLAGS = $(CWARNFLAGS)
@@ -52,38 +53,18 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontutil.pc
-appmandir = $(APP_MAN_DIR)
-appman_PRE = bdftruncate.man ucs2any.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+CLEANFILES = bdftruncate
-CLEANFILES = bdftruncate $(appman_DATA)
+EXTRA_DIST = $(mapfiles_DATA)
-EXTRA_DIST = $(mapfiles_DATA) \
- $(appman_PRE) \
- fontutil.pc.in \
- $(aclocal_DATA)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
+.PHONY: ChangeLog INSTALL
-SED = sed
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-
-.PHONY: ChangeLog
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/bdftruncate.man new/font-util-1.1.2/bdftruncate.man
--- old/font-util-1.1.1/bdftruncate.man 2006-07-11 05:00:54.000000000 +0200
+++ new/font-util-1.1.2/bdftruncate.man 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-.TH bdftruncate __appmansuffix__ __vendorversion__
-.SH NAME
-bdftruncate \- generate truncated BDF font from ISO 10646-1-encoded BDF font
-.SH SYNOPSIS
-.B bdftruncate
-.I threshold
-.B <
-.I source.bdf
-.B >
-.I destination.bdf
-.SH DESCRIPTION
-.B bdftruncate
-allows one to generate from an ISO10646-1 encoded BDF font other ISO10646-1
-BDF fonts in which all characters above a threshold code value are stored
-unencoded. This is often desirable because the Xlib API and X11 protocol
-data structures used for representing font metric information are extremely
-inefficient when handling sparsely populated fonts.
-.SH EXAMPLE
-The command
-.RS
-bdftruncate 0x3200 < 6x13.bdf > 6x13t.bdf
-.RE
-will generate the file 6x13t.bdf in which all glyphs with codes
->= 0x3200 will only be stored unencoded (i.e., they are encoded at
-codepoint -1).
-.SH "SEE ALSO"
-.BR ucs2any (1)
-.SH AUTHOR
-.B bdftruncate
-was written by Markus Kuhn.
-.PP
-Branden Robinson wrote this manual page, originally for the Debian Project.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/config.h.in new/font-util-1.1.2/config.h.in
--- old/font-util-1.1.1/config.h.in 2009-10-12 17:49:41.000000000 +0200
+++ new/font-util-1.1.2/config.h.in 2010-10-05 06:31:53.000000000 +0200
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/configure.ac new/font-util-1.1.2/configure.ac
--- old/font-util-1.1.1/configure.ac 2009-10-12 17:47:26.000000000 +0200
+++ new/font-util-1.1.2/configure.ac 2010-10-05 06:31:28.000000000 +0200
@@ -21,15 +21,16 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(font-util, [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-util)
+AC_PREREQ([2.60])
+AC_INIT([font-util], [1.1.2],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [font-util])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
AM_CONFIG_HEADER(config.h)
XORG_DEFAULT_OPTIONS
@@ -52,4 +53,9 @@
MAPDIR="$mapdir"
AC_SUBST(MAPDIR)
-AC_OUTPUT([Makefile fontutil.m4 fontutil.pc])
+AC_CONFIG_FILES([Makefile
+ man/Makefile
+ fontutil.m4
+ fontutil.pc])
+
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/fontutil.m4 new/font-util-1.1.2/fontutil.m4
--- old/font-util-1.1.1/fontutil.m4 2009-10-12 17:49:51.000000000 +0200
+++ new/font-util-1.1.2/fontutil.m4 1970-01-01 01:00:00.000000000 +0100
@@ -1,324 +0,0 @@
-dnl fontutil.m4. Generated from fontutil.m4.in by configure.
-dnl
-dnl This file comes from X.Org's font-util 1.1.1
-dnl
-dnl Copyright 2005 Red Hat, Inc
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
-dnl --------------------------------------------------------------------
-dnl
-dnl Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the
-dnl "Software"), to deal in the Software without restriction, including
-dnl without limitation the rights to use, copy, modify, merge, publish,
-dnl distribute, and/or sell copies of the Software, and to permit persons
-dnl to whom the Software is furnished to do so, provided that the above
-dnl copyright notice(s) and this permission notice appear in all copies of
-dnl the Software and that both the above copyright notice(s) and this
-dnl permission notice appear in supporting documentation.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of a copyright holder
-dnl shall not be used in advertising or otherwise to promote the sale, use
-dnl or other dealings in this Software without prior written authorization
-dnl of the copyright holder.
-
-# XORG_FONT_MACROS_VERSION(required-version)
-# ------------------------------------------
-# Minimum version: 1.1.0
-#
-# If you're using a macro added in Version 1.1 or newer, include this in
-# your configure.ac with the minimum required version, such as:
-# XORG_FONT_MACROS_VERSION(1.1)
-#
-# To ensure that this macro is defined, also add:
-# m4_ifndef([XORG_FONT_MACROS_VERSION],
-# [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
-#
-#
-# See the "minimum version" comment for each macro you use to see what
-# version you require.
-m4_defun([XORG_FONT_MACROS_VERSION],[
-m4_define([vers_have], [1.1.1])
-m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
-m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
-m4_if(m4_cmp(maj_have, maj_needed), 0,,
- [m4_fatal([font-util major version ]maj_needed[ is required but ]vers_have[ found])])
-m4_if(m4_version_compare(vers_have, [$1]), -1,
- [m4_fatal([font-util version $1 or higher is required but ]vers_have[ found])])
-m4_undefine([vers_have])
-m4_undefine([maj_have])
-m4_undefine([maj_needed])
-]) # XORG_FONT_MACROS_VERSION
-
-# XORG_FONT_CHECK_{maps}()
-# ------------------------
-# Minimum version: 1.0.0
-# These macros add --enable/disable-{maps} where {maps} are ISO8859-*,
-# JISX0201 or KOI8_R. By default, they are all enabled.
-
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_1], [XORG_FONT_CHECK_ENCODING(ISO8859-1)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_2], [XORG_FONT_CHECK_ENCODING(ISO8859-2)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_3], [XORG_FONT_CHECK_ENCODING(ISO8859-3)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_4], [XORG_FONT_CHECK_ENCODING(ISO8859-4)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_5], [XORG_FONT_CHECK_ENCODING(ISO8859-5)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_6], [XORG_FONT_CHECK_ENCODING(ISO8859-6)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_7], [XORG_FONT_CHECK_ENCODING(ISO8859-7)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_8], [XORG_FONT_CHECK_ENCODING(ISO8859-8)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_9], [XORG_FONT_CHECK_ENCODING(ISO8859-9)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_10],[XORG_FONT_CHECK_ENCODING(ISO8859-10)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_11],[XORG_FONT_CHECK_ENCODING(ISO8859-11)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_12],[XORG_FONT_CHECK_ENCODING(ISO8859-12)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_13],[XORG_FONT_CHECK_ENCODING(ISO8859-13)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_14],[XORG_FONT_CHECK_ENCODING(ISO8859-14)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_15],[XORG_FONT_CHECK_ENCODING(ISO8859-15)])
-AC_DEFUN([XORG_FONT_CHECK_ISO8859_16],[XORG_FONT_CHECK_ENCODING(ISO8859-16)])
-AC_DEFUN([XORG_FONT_CHECK_JISX0201], [XORG_FONT_CHECK_ENCODING(JISX0201)])
-AC_DEFUN([XORG_FONT_CHECK_KOI8_R], [XORG_FONT_CHECK_ENCODING(KOI8-R)])
-
-# XORG_FONT_CHECK_ENCODING(encoding)
-# ----------------------------------
-# Minimum version: 1.1.0
-# This macro adds --enable/disable-<encoding>, enabled by default.
-# It replaced individual copies of this code in the above macros in 1.1.
-# Currently assumes encoding names will be all upper-case - add m4_toupper
-# calls if this is not true in the future.
-
-AC_DEFUN([XORG_FONT_CHECK_ENCODING],[
- AC_ARG_ENABLE(m4_tolower($1),
- AS_HELP_STRING(m4_join([-], [--disable], m4_tolower($1)),
- [Build $1 fonts (default: yes)]),
- [AS_TR_SH($1)=$enableval], [AS_TR_SH($1)=yes])
- AC_MSG_CHECKING([whether to build $1 fonts])
- AC_MSG_RESULT($[AS_TR_SH($1)])
- AM_CONDITIONAL(AS_TR_SH($1), [test "x$AS_TR_SH($1)" = xyes])
-]) # XORG_FONT_CHECK_ENCODING
-
-# XORG_FONT_CHECK_ENCODING_LIST(encoding1 encoding2....)
-# -----------------------------------------------------
-# Minimum version: 1.1.0
-# Call XORG_FONT_CHECK_ENCODING for multiple encodings at once
-
-AC_DEFUN([XORG_FONT_CHECK_ENCODING_LIST],[
- m4_foreach_w([enc], [$1], [XORG_FONT_CHECK_ENCODING(enc)])
-]) # XORG_FONT_CHECK_ENCODING_LIST
-
-# XORG_FONT_REQUIRED_PROG(VARNAME, progname)
-# ------------------------------------------
-# Minimum version: 1.1.0
-#
-# Simple wrapper around AC_PATH_PROG that errors if not found
-#
-
-AC_DEFUN([XORG_FONT_REQUIRED_PROG],[
- AC_PATH_PROG($1, $2)
- if test x"$1" = x; then
- AC_MSG_ERROR([$2 is required to build $PACKAGE_NAME.])
- fi
-])
-
-
-# XORG_FONT_FCCACHE()
-# -------------------
-# Minimum version: 1.1.0
-#
-# Set FCCACHE to path to fc-cache (fontconfig cache builder) if found
-# Set RUN_FCCACHE to a rule suitable for substituting into a makefile
-# to run fc-cache if found and not installing to $DESTDIR
-#
-# fc-cache is optional, not required, and should be skipped when making
-# packages (installing to $DESTDIR).
-#
-AC_DEFUN([XORG_FONT_FCCACHE],[
- AC_PATH_PROG(FCCACHE, fc-cache)
- FCCACHE_WARN='echo "** Warning: fonts.cache not built" ; echo "** Generate this file manually on host system using fc-cache"'
- if test x"$FCCACHE" = x ; then
- RUN_FCCACHE="${FCCACHE_WARN}"
- else
- RUN_FCCACHE='@(if test -z "$(DESTDIR)"; then echo $(FCCACHE) $(fontdir); $(FCCACHE) $(fontdir); else'
- RUN_FCCACHE="${RUN_FCCACHE} ${FCCACHE_WARN} ; fi)"
- fi
- AC_SUBST([RUN_FCCACHE])
-])
-
-
-# XORG_FONT_COMMON_UTILS()
-# ------------------------
-# Minimum version: 1.1.0
-#
-# Call XORG_FONT_REQUIRED_PROG for programs needed for all font types
-
-AC_DEFUN([XORG_FONT_COMMON_UTILS],[
- XORG_FONT_FCCACHE
- XORG_FONT_REQUIRED_PROG(MKFONTDIR, mkfontdir)
-])
-
-# XORG_FONT_SCALED_UTILS()
-# ------------------------
-# Minimum version: 1.1.0
-#
-# Call XORG_FONT_REQUIRED_PROG for programs needed for scalable fonts
-# (TrueType, OpenType, Type1)
-
-AC_DEFUN([XORG_FONT_SCALED_UTILS],[
- XORG_FONT_COMMON_UTILS
- XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale)
-])
-
-# XORG_FONT_BDF_UTILS()
-# ---------------------
-# Minimum version: 1.1.0
-#
-# Call XORG_FONT_REQUIRED_PROG for programs needed for BDF format bitmap fonts
-# Also call XORG_FONT_CHECK_COMPRESSION to determine how to compress the
-# PCF output files created by bdftopcf
-
-AC_DEFUN([XORG_FONT_BDF_UTILS],[
- XORG_FONT_COMMON_UTILS
- XORG_FONT_REQUIRED_PROG(BDFTOPCF, bdftopcf)
- XORG_FONT_CHECK_COMPRESSION
-])
-
-# XORG_FONT_CHECK_COMPRESSION()
-# -----------------------------
-# Minimum version: 1.1.0
-#
-# Offer a --with-compression flag to control what compression method is
-# used for pcf font files. Offers all the methods currently supported
-# by libXfont, including no compression.
-
-AC_DEFUN([XORG_FONT_CHECK_COMPRESSION],[
- AC_MSG_CHECKING([font compression method])
- AC_ARG_WITH(compression,
- [AS_HELP_STRING([--with-compression=],
- [compression method to use on pcf fonts])],
- [compression="$withval"], [compression="yes"])
- if test x"$compression" = "xyes" ; then
- compression="gzip"
- fi
- AC_MSG_RESULT([${compression}])
- case ${compression} in
- *compress) COMPRESS_SUFFIX=".Z" ;;
- *gzip) COMPRESS_SUFFIX=".gz" ;;
- *bzip2) COMPRESS_SUFFIX=".bz2" ;;
- no|none) COMPRESS_SUFFIX="" ; COMPRESS="cat" ;;
- *) AC_MSG_ERROR([${compression} is not a supported compression method]) ;;
- esac
- if test x"$COMPRESS_SUFFIX" != "x" ; then
- XORG_FONT_REQUIRED_PROG(COMPRESS, ${compression})
- fi
- AC_SUBST([COMPRESS_SUFFIX])
-])
-
-# XORG_FONT_UCS2ANY()
-# -------------------
-# Minimum version: 1.1.0
-#
-# Call XORG_FONT_REQUIRED_PROG for ucs2any program needed for splitting
-# Unicode-encoded BDF format bitmap fonts into subsets for older encodings.
-# Also call pkg-config to find the directory with the encoding files needed
-# by ucs2any, and export it as MAPFILES_PATH to the Makefiles
-
-AC_DEFUN([XORG_FONT_UCS2ANY],[
- XORG_FONT_REQUIRED_PROG(UCS2ANY, ucs2any)
- PKG_CHECK_MODULES(MAPS, [fontutil])
- AC_MSG_CHECKING([for ucs2any encoding data files])
- MAPFILES_PATH=`pkg-config --variable=mapdir fontutil`
- AC_SUBST(MAPFILES_PATH)
- AC_MSG_RESULT([${MAPFILES_PATH}])
-])
-
-
-
-# XORG_FONTROOTDIR()
-# --------------------
-# Minimum version: 1.1.0
-#
-# Sets FONTROOTDIR to the root directory for font files. Uses the first
-# found from:
-# --with-fontrootdir
-# pkg-config --variable=fontrootdir fontutil
-# ${datadir}/fonts/X11
-
-AC_DEFUN([XORG_FONTROOTDIR],[
- dnl Ensure $PKG_CONFIG is set first
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-
- AC_MSG_CHECKING([for root directory for font files])
- AC_ARG_WITH(fontrootdir,
- AS_HELP_STRING([--with-fontrootdir=DIR],
- [Path to root directory for font files]),
- [FONTROOTDIR="$withval"])
- # if --with-fontrootdir not specified...
- if test "x${FONTROOTDIR}" = "x"; then
- FONTROOTDIR=`$PKG_CONFIG --variable=fontrootdir fontutil`
- fi
- # ...and if pkg-config didn't find fontdir in fontutil.pc...
- if test "x${FONTROOTDIR}" = "x"; then
- FONTROOTDIR="${datadir}/fonts/X11"
- fi
- AC_SUBST(FONTROOTDIR)
- AC_MSG_RESULT([${FONTROOTDIR}])
-])
-
-# XORG_FONTSUBDIR(variable, flag, subdir)
-# ---------------------------------------
-# Minimum version: 1.1.0
-#
-# Offer a --with-<flag> flag to control directory for font installation
-# Default is the specified <subdir> of the font root directory.
-# Sets <variable> to the selected directory
-
-AC_DEFUN([XORG_FONTSUBDIR],[
- AC_REQUIRE([XORG_FONTROOTDIR])
-
- AC_MSG_CHECKING([for directory for $3 files])
- AC_ARG_WITH($2,
- [AS_HELP_STRING([--with-$2=DIR],
- [Path to $3 files [FONTROOTDIR/$3]])],
- [$1="${withval}"], [$1='${FONTROOTDIR}/$3'])
- AC_SUBST($1)
- AC_MSG_RESULT([${$1}])
-]) # XORG_FONTSUBDIR
-
-# XORG_FONTDIR(subdir)
-# --------------------
-# Minimum version: 1.1.0
-#
-# Offer a --with-fontdir flag to control directory for font installation
-# Default is the specified subdir of the font root directory.
-# Sets FONTDIR to the selected directory
-
-AC_DEFUN([XORG_FONTDIR],[XORG_FONTSUBDIR([FONTDIR], [fontdir], [$1])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/fontutil.m4.in new/font-util-1.1.2/fontutil.m4.in
--- old/font-util-1.1.1/fontutil.m4.in 2009-10-08 05:27:59.000000000 +0200
+++ new/font-util-1.1.2/fontutil.m4.in 2010-10-05 06:29:06.000000000 +0200
@@ -2,6 +2,29 @@
dnl
dnl This file comes from X.Org's @PACKAGE_STRING@
dnl
+dnl Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the "Software"),
+dnl to deal in the Software without restriction, including without limitation
+dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
+dnl and/or sell copies of the Software, and to permit persons to whom the
+dnl Software is furnished to do so, subject to the following conditions:
+dnl
+dnl The above copyright notice and this permission notice (including the next
+dnl paragraph) shall be included in all copies or substantial portions of the
+dnl Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+dnl DEALINGS IN THE SOFTWARE.
+dnl
+dnl --------------------------------------------------------------------
+dnl
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -25,35 +48,6 @@
dnl not be used in advertising or otherwise to promote the sale, use or
dnl other dealings in this Software without prior written authorization
dnl from the copyright holders.
-dnl
-dnl --------------------------------------------------------------------
-dnl
-dnl Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the
-dnl "Software"), to deal in the Software without restriction, including
-dnl without limitation the rights to use, copy, modify, merge, publish,
-dnl distribute, and/or sell copies of the Software, and to permit persons
-dnl to whom the Software is furnished to do so, provided that the above
-dnl copyright notice(s) and this permission notice appear in all copies of
-dnl the Software and that both the above copyright notice(s) and this
-dnl permission notice appear in supporting documentation.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of a copyright holder
-dnl shall not be used in advertising or otherwise to promote the sale, use
-dnl or other dealings in this Software without prior written authorization
-dnl of the copyright holder.
# XORG_FONT_MACROS_VERSION(required-version)
# ------------------------------------------
@@ -144,7 +138,7 @@
AC_DEFUN([XORG_FONT_REQUIRED_PROG],[
AC_PATH_PROG($1, $2)
- if test x"$1" = x; then
+ if test x"$$1" = x; then
AC_MSG_ERROR([$2 is required to build $PACKAGE_NAME.])
fi
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/man/Makefile.am new/font-util-1.1.2/man/Makefile.am
--- old/font-util-1.1.1/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/font-util-1.1.2/man/Makefile.am 2010-09-04 01:14:32.000000000 +0200
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = bdftruncate.man ucs2any.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+MAN_SUBSTS += -e 's|__mapfilesdir__|$(MAPDIR)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/man/bdftruncate.man new/font-util-1.1.2/man/bdftruncate.man
--- old/font-util-1.1.1/man/bdftruncate.man 1970-01-01 01:00:00.000000000 +0100
+++ new/font-util-1.1.2/man/bdftruncate.man 2010-09-04 01:14:32.000000000 +0200
@@ -0,0 +1,32 @@
+.TH bdftruncate __appmansuffix__ __vendorversion__
+.SH NAME
+bdftruncate \- generate truncated BDF font from ISO 10646-1-encoded BDF font
+.SH SYNOPSIS
+.B bdftruncate
+.I threshold
+.B <
+.I source.bdf
+.B >
+.I destination.bdf
+.SH DESCRIPTION
+.B bdftruncate
+allows one to generate from an ISO10646-1 encoded BDF font other ISO10646-1
+BDF fonts in which all characters above a threshold code value are stored
+unencoded. This is often desirable because the Xlib API and X11 protocol
+data structures used for representing font metric information are extremely
+inefficient when handling sparsely populated fonts.
+.SH EXAMPLE
+The command
+.RS
+bdftruncate 0x3200 < 6x13.bdf > 6x13t.bdf
+.RE
+will generate the file 6x13t.bdf in which all glyphs with codes
+>= 0x3200 will only be stored unencoded (i.e., they are encoded at
+codepoint -1).
+.SH "SEE ALSO"
+.BR ucs2any (1)
+.SH AUTHOR
+.B bdftruncate
+was written by Markus Kuhn.
+.PP
+Branden Robinson wrote this manual page, originally for the Debian Project.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/man/ucs2any.man new/font-util-1.1.2/man/ucs2any.man
--- old/font-util-1.1.1/man/ucs2any.man 1970-01-01 01:00:00.000000000 +0100
+++ new/font-util-1.1.2/man/ucs2any.man 2010-09-04 01:14:32.000000000 +0200
@@ -0,0 +1,74 @@
+.TH ucs2any __appmansuffix__ __vendorversion__
+.SH NAME
+ucs2any \- generate BDF fonts containing subsets of ISO 10646-1 codepoints
+.SH SYNOPSIS
+.B ucs2any
+[
+.B +d
+|
+.B -d
+]
+.I source-name
+{
+.I mapping-file
+.I registry-encoding
+}
+\&.\|.\|.
+.SH DESCRIPTION
+.B ucs2any
+allows one to generate from an ISO 10646-1 encoded BDF font other BDF fonts
+in any possible encoding. This way, one can derive from a single
+ISO 10646-1 master font a whole set of 8-bit fonts in all ISO 8859 and
+various other encodings.
+.SH OPTIONS
+.TP
+.B +d
+puts DEC VT100 graphics characters in the C0 range (default for upright,
+character-cell fonts).
+.TP
+.B \-d
+omits DEC VT100 graphics characters from the C0 range (default for all
+font types except upright, character-cell fonts).
+.SH OPERANDS
+.TP
+.I source-name
+is the name of an ISO 10646-1 encoded BDF file.
+.TP
+.I mapping-file
+is the name of a character set table like those at
+.BR ftp://ftp.unicode.org/Public/MAPPINGS/ .
+These files can also typically be found installed in the
+.I __mapfilesdir__
+directory.
+.TP
+.I registry-encoding
+are the CHARSET_REGISTRY and CHARSET_ENCODING field values for the font
+name (XLFD) of the target font, separated by a hyphen.
+.PP
+Any number of
+.I mapping-file
+and
+.I registry-encoding
+operand pairs may be specified.
+.SH EXAMPLE
+The command
+.RS
+ucs2any 6x13.bdf 8859-1.TXT iso8859-1 8859-2.TXT iso8859-2
+.RE
+will generate the files
+.I 6x13-iso8859-1.bdf
+and
+.IR 6x13-iso8859-2.bdf .
+.SH FUTURE DIRECTIONS
+Hopefully a future release will have a facility similar to
+.B ucs2any
+built into the server, and reencode ISO 10646-1 on the fly, because
+storing the same fonts in many different encodings is clearly a waste of
+storage capacity.
+.SH "SEE ALSO"
+.BR bdftruncate (1)
+.SH AUTHOR
+.B ucs2any
+was written by Markus Kuhn.
+.PP
+Branden Robinson wrote this manual page, originally for the Debian Project.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-util-1.1.1/ucs2any.man new/font-util-1.1.2/ucs2any.man
--- old/font-util-1.1.1/ucs2any.man 2006-07-11 05:00:54.000000000 +0200
+++ new/font-util-1.1.2/ucs2any.man 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-.TH ucs2any __appmansuffix__ __vendorversion__
-.SH NAME
-ucs2any \- generate BDF fonts containing subsets of ISO 10646-1 codepoints
-.SH SYNOPSIS
-.B ucs2any
-[
-.B +d
-|
-.B -d
-]
-.I source-name
-{
-.I mapping-file
-.I registry-encoding
-}
-\&.\|.\|.
-.SH DESCRIPTION
-.B ucs2any
-allows one to generate from an ISO 10646-1 encoded BDF font other BDF fonts
-in any possible encoding. This way, one can derive from a single
-ISO 10646-1 master font a whole set of 8-bit fonts in all ISO 8859 and
-various other encodings.
-.SH OPTIONS
-.TP
-.B +d
-puts DEC VT100 graphics characters in the C0 range (default for upright,
-character-cell fonts).
-.TP
-.B \-d
-omits DEC VT100 graphics characters from the C0 range (default for all
-font types except upright, character-cell fonts).
-.SH OPERANDS
-.TP
-.I source-name
-is the name of an ISO 10646-1 encoded BDF file.
-.TP
-.I mapping-file
-is the name of a character set table like those at
-.BR ftp://ftp.unicode.org/Public/MAPPINGS/ .
-These files can also typically be found installed in the
-.I /usr/X11R6/lib/X11/fonts/util/
-directory.
-.TP
-.I registry-encoding
-are the CHARSET_REGISTRY and CHARSET_ENCODING field values for the font
-name (XLFD) of the target font, separated by a hyphen.
-.PP
-Any number of
-.I mapping-file
-and
-.I registry-encoding
-operand pairs may be specified.
-.SH EXAMPLE
-The command
-.RS
-ucs2any 6x13.bdf 8859-1.TXT iso8859-1 8859-2.TXT iso8859-2
-.RE
-will generate the files
-.I 6x13-iso8859-1.bdf
-and
-.IR 6x13-iso8859-2.bdf .
-.SH FUTURE DIRECTIONS
-Hopefully a future release will have a facility similar to
-.B ucs2any
-built into the server, and reencode ISO 10646-1 on the fly, because
-storing the same fonts in many different encodings is clearly a waste of
-storage capacity.
-.SH "SEE ALSO"
-.BR bdftruncate (1)
-.SH AUTHOR
-.B ucs2any
-was written by Markus Kuhn.
-.PP
-Branden Robinson wrote this manual page, originally for the Debian Project.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org