xfonts-encodings: Changes to 'upstream-unstable'
.gitignore | 3 +++
COPYING | 34 +++++++++-------------------------
Makefile.am | 10 ++++++----
README | 24 ++++++++++++++++++++++++
configure.ac | 38 +++++++++++++++++++++-----------------
large/.gitignore | 4 ----
large/Makefile.am | 4 ++--
7 files changed, 65 insertions(+), 52 deletions(-)
New commits:
commit 37d2a7c362a330d6aaa4d348a5db81da844ef7a8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Oct 10 17:56:53 2009 -0700
encodings 1.0.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 07403f0..43bfa15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([encodings], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([encodings], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit ba904c20fa5e80449d515c8c8f04953db5a64a06
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 7 16:46:52 2009 -0700
Migrate to xorg macros 1.3 & font-util 1.1 macros
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Makefile.am b/Makefile.am
index 29a875d..4183d56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,16 +47,16 @@ if GZIP_SMALL
DATA_FILES = $(COMPRESSED)
CLEANFILES += $(COMPRESSED)
else
-DATA_FILES = $(ENCODING_FILES) encodings.dir
+DATA_FILES = $(ENCODING_FILES)
endif
SUFFIXES = .enc .enc.gz
.enc.enc.gz:
- @GZIP@ -c < $< > $@
+ $(AM_V_GEN)$(GZIP) -c < $< > $@
encodings.dir: $(DATA_FILES)
- @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . -e large .
+ $(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . -e large .
encodings_DATA = $(DATA_FILES) encodings.dir
diff --git a/configure.ac b/configure.ac
index 0fc8bbb..07403f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,30 +2,39 @@ AC_PREREQ([2.57])
AC_INIT([encodings], [1.0.2], [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)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
-# mkfontscale
+AC_PROG_INSTALL
-AC_PATH_PROG(MKFONTSCALE, mkfontscale)
-if [[ -z $MKFONTSCALE ]]; then
- AC_MSG_ERROR([mkfontscale is needed to build fontenc. Please install the app/mkfontscale package from X.Org.])
-fi
+# Require X.Org's font util macros 1.1 or later
+m4_ifndef([XORG_FONT_MACROS_VERSION],
+ [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
+XORG_FONT_MACROS_VERSION(1.1)
+
+# mkfontscale
+XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale)
# Choose whether or not to compress encodings - default is to compress all
+AC_MSG_CHECKING([if small encodings should be compressed])
AC_ARG_ENABLE(gzip-small-encodings,
AC_HELP_STRING([--disable-gzip-small-encodings],
[Disable compression of small encoding files]),
[GZIP_SMALL="$enableval"], [GZIP_SMALL="yes"])
AM_CONDITIONAL(GZIP_SMALL, [test x$GZIP_SMALL = xyes])
+AC_MSG_RESULT([${GZIP_SMALL}])
+AC_MSG_CHECKING([if large encodings should be compressed])
AC_ARG_ENABLE(gzip-large-encodings,
AC_HELP_STRING([--disable-gzip-large-encodings],
[Disable compression of large encoding files]),
[GZIP_LARGE="$enableval"], [GZIP_LARGE="yes"])
AM_CONDITIONAL(GZIP_LARGE, [test x$GZIP_LARGE = xyes])
+AC_MSG_RESULT([${GZIP_LARGE}])
# gzip
@@ -36,13 +45,6 @@ if test x$GZIP_SMALL = xyes -o x$GZIP_LARGE = xyes ; then
fi
fi
-encodingsdir=${libdir}/X11/fonts/encodings
-AC_ARG_WITH(encodingsdir, AC_HELP_STRING([--with-encodingsdir=<pathname>],
- [Path to install font encodings]), [encodingsdir="$withval"])
-ENCODINGSDIR="$encodingsdir"
-AC_SUBST(ENCODINGSDIR)
-
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings])
AC_OUTPUT([Makefile large/Makefile])
diff --git a/large/Makefile.am b/large/Makefile.am
index 1bd8891..32e03bc 100644
--- a/large/Makefile.am
+++ b/large/Makefile.am
@@ -34,9 +34,9 @@ endif
SUFFIXES = .enc .enc.gz
.enc.enc.gz:
- @GZIP@ -c < $< > $@
+ $(AM_V_GEN)$(GZIP) -c < $< > $@
encodings.dir: $(DATA_FILES)
- @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . .
+ $(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . .
encodings_DATA = $(DATA_FILES) encodings.dir
commit 8053655dd5714014ecca5182471c96f5223feb29
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 6 19:15:31 2009 -0700
Add pointers to mailing lists, bugzilla, & git to README
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
new file mode 100644
index 0000000..e6111bf
--- /dev/null
+++ b/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/font/encodings
+
+ http://cgit.freedesktop.org/xorg/font/encodings
+
+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
+
commit 6a86a2a95a40350ce19a6f5e802452cc28f1b968
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 19:11:08 2009 -0200
Janitor: Correct make distcheck and configure.ac simplification
diff --git a/.gitignore b/.gitignore
index b0c84e7..51c8728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ encodings.dir
install-sh
missing
*~
+encodings-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index f9e798b..29a875d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,7 @@ MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog
ChangeLog:
- git-log > ChangeLog
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 1ecebd0..0fc8bbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,9 @@ AC_PREREQ([2.57])
AC_INIT([encodings], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+# 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)
# mkfontscale
@@ -14,13 +16,13 @@ fi
# Choose whether or not to compress encodings - default is to compress all
AC_ARG_ENABLE(gzip-small-encodings,
- AS_HELP_STRING([--disable-gzip-small-encodings],
+ AC_HELP_STRING([--disable-gzip-small-encodings],
[Disable compression of small encoding files]),
[GZIP_SMALL="$enableval"], [GZIP_SMALL="yes"])
AM_CONDITIONAL(GZIP_SMALL, [test x$GZIP_SMALL = xyes])
AC_ARG_ENABLE(gzip-large-encodings,
- AS_HELP_STRING([--disable-gzip-large-encodings],
+ AC_HELP_STRING([--disable-gzip-large-encodings],
[Disable compression of large encoding files]),
[GZIP_LARGE="$enableval"], [GZIP_LARGE="yes"])
AM_CONDITIONAL(GZIP_LARGE, [test x$GZIP_LARGE = xyes])
@@ -34,13 +36,13 @@ if test x$GZIP_SMALL = xyes -o x$GZIP_LARGE = xyes ; then
fi
fi
-DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
-AC_ARG_WITH(encodingsdir,
- AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to install font encodings]),
- [ENCODINGSDIR="$withval"],
- [ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"])
+encodingsdir=${libdir}/X11/fonts/encodings
+AC_ARG_WITH(encodingsdir, AC_HELP_STRING([--with-encodingsdir=<pathname>],
+ [Path to install font encodings]), [encodingsdir="$withval"])
+ENCODINGSDIR="$encodingsdir"
AC_SUBST(ENCODINGSDIR)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile large/Makefile])
commit 862d94a9b9931361c546d951b7026258d944fdad
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 19:10:58 2009 -0200
Janitor: Correct make distcheck and configure.ac simplification
diff --git a/large/.gitignore b/large/.gitignore
deleted file mode 100644
index 68d0e99..0000000
--- a/large/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.enc.gz
-encodings.dir
commit d1546d162b4fe12c5d01479ded02b00bff5a9c64
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 15:51:13 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
diff --git a/Makefile.am b/Makefile.am
index 898fda9..f9e798b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,8 @@ encodings_DATA = $(DATA_FILES) encodings.dir
MAINTAINERCLEANFILES=ChangeLog
+.PHONY: ChangeLog
+
ChangeLog:
git-log > ChangeLog
commit 0feb027d6c94a7896c5d2fb861de8c69340998db
Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Mon Jul 23 22:55:01 2007 +0200
Replace generic copyright statement.
diff --git a/COPYING b/COPYING
index e894728..4ef12a7 100644
--- a/COPYING
+++ b/COPYING
@@ -1,28 +1,12 @@
-XFree86 code without an explicit copyright is covered by the following
-copyright/license:
+The XFree86/Xorg encoding files are in the public domain.
-Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+Most of these encoding files were generated by me in the winter of 1998/1998
+from publicly available sources (notably from data files provided by the
+Unicode Consortium) using a throw-away program written in Common Lisp. Over
+the years, a number of people have kindly added new encoding files to the
+collection.
-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:
+If you want to add a copyright statement to an encoding file, you need
+your brain examined.
-The above copyright notice and this permission notice 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 XFREE86 PROJECT 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.
-
-Except as contained in this notice, the name of the XFree86 Project
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from the XFree86 Project.
+ Juliusz Chroboczek
Reply to: