.gitignore | 81 +++++++++++++++++++++++++++++++++++++----- Makefile.am | 12 +++--- configure.ac | 12 +++--- iso8859-6.8x.enc | 2 - large/big5.eten-0.enc | 1 large/big5hkscs-0.enc | 2 - large/gb18030.2000-0.enc | 1 large/gb18030.2000-1.enc | 1 large/gb2312.1980-0.enc | 1 large/gbk-0.enc | 1 large/jisx0201.1976-0.enc | 1 large/jisx0208.1990-0.enc | 1 large/jisx0212.1990-0.enc | 1 large/ksc5601.1987-0.enc | 1 large/ksc5601.1992-3.enc | 1 large/sun.unicode.india-0.enc | 1 16 files changed, 87 insertions(+), 33 deletions(-)
New commits: commit 22a939832df60c2c0e9767ab26b4c82433aa1555 Author: Alan Coopersmith <[email protected]> Date: Fri Oct 29 20:54:06 2010 -0700 encodings 1.0.4 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 4055d1b..829326b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([encodings], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([encodings], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 44e5e3221239b3deae20a3220a62c26870da956c Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/configure.ac b/configure.ac index 9775cfd..4055d1b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([encodings], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit d47c71268417e255091d1a5585296be558b98c51 Author: Gaetan Nadon <[email protected]> Date: Fri Oct 15 20:09:56 2010 -0400 config: Use the shorthand --disable-all-encodings option in font-util v1.2 This option is useful to disable all possible font encodings at once, without fine-graining the calling ebuilds for a list of encodings supported by each font package. The option is parsed before all other encoding options, so it basically sets defaults for all of them. Afterwards, any encoding can be re-enabled back using '--enable-<encoding>' (much like '--disable-all-encodings --enable-iso8859-2'). Reviewed-by: Rémi Cardona <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 1a5a744..9775cfd 100644 --- a/configure.ac +++ b/configure.ac @@ -11,10 +11,10 @@ XORG_DEFAULT_OPTIONS AC_PROG_INSTALL -# Require X.Org's font util macros 1.1 or later +# Require X.Org's font util macros 1.2 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) + [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.2) # mkfontscale XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale) commit 8101ff3418c04df3d0d6e82ce107ea2bdfb6c999 Author: Jesse Adkins <[email protected]> Date: Tue Sep 28 13:29:57 2010 -0700 Purge cvs tags. Signed-off-by: Jesse Adkins <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/iso8859-6.8x.enc b/iso8859-6.8x.enc index f5bb047..3e66157 100644 --- a/iso8859-6.8x.enc +++ b/iso8859-6.8x.enc @@ -7,8 +7,6 @@ STARTENCODING iso8859-6.8x # - http://www.langbox.com/arabic/FontSet_ISO8859-6-8X.html # - http://bugs.xfree86.org/show_bug.cgi?id=420 # - http://bugzilla.mozilla.org/show_bug.cgi?id=78201 -# $XdotOrg: xc/fonts/encodings/iso8859-6.8x.enc,v 1.2 2003/12/08 15:35:04 dawes Exp $ -# $XFree86$ STARTMAPPING unicode UNDEFINE 0x00 0xFF 0x8D 0xFEEF diff --git a/large/big5.eten-0.enc b/large/big5.eten-0.enc index 725769b..6f59494 100644 --- a/large/big5.eten-0.enc +++ b/large/big5.eten-0.enc @@ -2,7 +2,6 @@ STARTENCODING big5.eten-0 ALIAS big5-0 ALIAS big5.cp950-0 # This file is generated from glibc-2.2 BIG5 charmap -# $XFree86: xc/fonts/encodings/large/big5.eten-0.enc,v 1.5 2001/09/26 12:48:19 alanh Exp $ SIZE 0xFA 0xFF FIRSTINDEX 0xA1 0x40 STARTMAPPING unicode diff --git a/large/big5hkscs-0.enc b/large/big5hkscs-0.enc index 7fd1e03..812b02f 100644 --- a/large/big5hkscs-0.enc +++ b/large/big5hkscs-0.enc @@ -2,8 +2,6 @@ STARTENCODING big5hkscs-0 # This file is generated from Anthony Fok's (<[email protected]>) # http://www.thizlinux.com/~anthony/hkscs/Correct-Big5HKSCS-to-Unicode-by-b5.txt # by Jungshik Shin <[email protected]> -# $XFree86: xc/fonts/encodings/large/big5hkscs-0.enc,v 1.1 2003/08/26 11:34:53 eich Exp $ -# $XdotOrg: xc/fonts/encodings/large/big5hkscs-0.enc,v 1.2 2004/04/23 18:43:03 eich Exp $ SIZE 0xFF 0xFF FIRSTINDEX 0x81 0x40 STARTMAPPING unicode diff --git a/large/gb18030.2000-0.enc b/large/gb18030.2000-0.enc index 0476e51..6a4fa15 100644 --- a/large/gb18030.2000-0.enc +++ b/large/gb18030.2000-0.enc @@ -1,5 +1,4 @@ # Contributed by James Su <[email protected]> -# $XFree86$ STARTENCODING gb18030.2000-0 SIZE 0xFF 0xFF FIRSTINDEX 0x81 0x40 diff --git a/large/gb18030.2000-1.enc b/large/gb18030.2000-1.enc index 761a549..beac78c 100644 --- a/large/gb18030.2000-1.enc +++ b/large/gb18030.2000-1.enc @@ -1,5 +1,4 @@ # Contributed by James Su <[email protected]> -# $XFree86$ STARTENCODING gb18030.2000-1 SIZE 0x9A 0x100 STARTMAPPING unicode diff --git a/large/gb2312.1980-0.enc b/large/gb2312.1980-0.enc index 337a3a5..2aff9bf 100644 --- a/large/gb2312.1980-0.enc +++ b/large/gb2312.1980-0.enc @@ -1,5 +1,4 @@ STARTENCODING gb2312.1980-0 -# $XFree86$ SIZE 0x78 0x7F FIRSTINDEX 0x20 0x20 STARTMAPPING unicode diff --git a/large/gbk-0.enc b/large/gbk-0.enc index 81e3dad..99ed377 100644 --- a/large/gbk-0.enc +++ b/large/gbk-0.enc @@ -1,5 +1,4 @@ STARTENCODING gbk-0 -# $XFree86: xc/fonts/encodings/large/gbk-0.enc,v 1.2 2002/09/27 02:04:21 dawes Exp $ SIZE 0xFF 0xFF FIRSTINDEX 0x80 0x40 STARTMAPPING unicode diff --git a/large/jisx0201.1976-0.enc b/large/jisx0201.1976-0.enc index a6efc25..915d50c 100644 --- a/large/jisx0201.1976-0.enc +++ b/large/jisx0201.1976-0.enc @@ -1,5 +1,4 @@ STARTENCODING jisx0201.1976-0 -# $XFree86$ SIZE 0xE0 STARTMAPPING cmap 3 1 0x00A1 0xFF61 diff --git a/large/jisx0208.1990-0.enc b/large/jisx0208.1990-0.enc index d06caf1..1f7dc87 100644 --- a/large/jisx0208.1990-0.enc +++ b/large/jisx0208.1990-0.enc @@ -2,7 +2,6 @@ STARTENCODING jisx0208.1990-0 ALIAS jisx0208.1983-0 # This file is partly derived from data provided by the Unicode Consortium # Original data Copyright (c) 1991-1994 Unicode, Inc. -# $XFree86: xc/fonts/encodings/large/jisx0208.1990-0.enc,v 1.4 2003/11/02 04:30:55 dawes Exp $ SIZE 0x75 0x7f FIRSTINDEX 0x21 0x21 STARTMAPPING cmap 3 1 diff --git a/large/jisx0212.1990-0.enc b/large/jisx0212.1990-0.enc index d12048b..2a19599 100644 --- a/large/jisx0212.1990-0.enc +++ b/large/jisx0212.1990-0.enc @@ -1,5 +1,4 @@ STARTENCODING jisx0212.1990-0 -# $XFree86$ SIZE 0x6E 0x80 FIRSTINDEX 0x20 0x20 STARTMAPPING unicode diff --git a/large/ksc5601.1987-0.enc b/large/ksc5601.1987-0.enc index 43c77e2..1c67da5 100644 --- a/large/ksc5601.1987-0.enc +++ b/large/ksc5601.1987-0.enc @@ -1,6 +1,5 @@ STARTENCODING ksc5601.1987-0 # This file is partially derived from data provided by the Unicode consortium -# $XFree86: xc/fonts/encodings/large/ksc5601.1987-0.enc,v 1.4 2001/12/24 23:17:15 dawes Exp $ ALIAS ksx1001.1998-0 ALIAS ksx1001.1997-0 SIZE 0x7E 0x80 diff --git a/large/ksc5601.1992-3.enc b/large/ksc5601.1992-3.enc index 10c2d3b..00757d6 100644 --- a/large/ksc5601.1992-3.enc +++ b/large/ksc5601.1992-3.enc @@ -3,7 +3,6 @@ STARTENCODING ksc5601.1992-3 # at ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT. # The up-to-date mapping table JOHAB.TXT with two new characters # is available at http://jshin.net/faq/JOHAB.TXT.gz. -# $XFree86: xc/fonts/encodings/large/ksc5601.1992-3.enc,v 1.1 2001/11/02 03:06:39 dawes Exp $ ALIAS ksx1001.1998-3 ALIAS ksxjohab-1 SIZE 0xFA 0xFF diff --git a/large/sun.unicode.india-0.enc b/large/sun.unicode.india-0.enc index f4c8c22..8400f88 100644 --- a/large/sun.unicode.india-0.enc +++ b/large/sun.unicode.india-0.enc @@ -1,4 +1,3 @@ -# $XFree86: xc/fonts/encodings/large/sun.unicode.india-0.enc,v 1.1 2003/12/07 18:20:11 dawes Exp $ STARTENCODING sun.unicode.india-0 SIZE 0xF8 0x100 FIRSTINDEX 0x00 0x20 commit 2bbe5d04111249f877cd152daebdd6140bffa1db Author: Gaetan Nadon <[email protected]> Date: Sat Mar 27 10:46:07 2010 -0400 config: remove from ChangeLog from EXTRA_DIST Automake always distribute ChangeLog Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/Makefile.am b/Makefile.am index aa3f21d..04e57b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,7 @@ ENCODING_FILES = \ tis620-2.enc \ viscii1.1-1.enc -EXTRA_DIST = $(ENCODING_FILES) ChangeLog +EXTRA_DIST = $(ENCODING_FILES) MAINTAINERCLEANFILES = ChangeLog INSTALL commit 45bc91ff4fc6d104286a1dd8a925a360c5380b12 Author: Gaetan Nadon <[email protected]> Date: Mon Nov 23 15:11:25 2009 -0500 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 diff --git a/Makefile.am b/Makefile.am index 169dda1..aa3f21d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,10 +62,12 @@ encodings.dir: $(DATA_FILES) encodings_DATA = $(DATA_FILES) encodings.dir -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog - +dist-hook: ChangeLog INSTALL commit e23f044d40a064aaf9436a5afb85083e4dfa39be Author: Gaetan Nadon <[email protected]> Date: Mon Nov 23 15:03:12 2009 -0500 configure.ac: AM_MAINTAINER_MODE missing #24238 This turns off maintainer mode build rules in tarballs. Works in conjunction with autogen.sh --enable-maintainer-mode diff --git a/configure.ac b/configure.ac index 43bfa15..1a5a744 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.57]) AC_INIT([encodings], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], commit f385c3c4d077f33b93e9b426b70d86ab63eead62 Author: Gaetan Nadon <[email protected]> Date: Mon Nov 23 14:23:51 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index 4183d56..169dda1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,8 @@ ENCODING_FILES = \ EXTRA_DIST = $(ENCODING_FILES) ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL + COMPRESSED = $(ENCODING_FILES:%=%.gz) CLEANFILES = encodings.dir @@ -60,8 +62,6 @@ encodings.dir: $(DATA_FILES) encodings_DATA = $(DATA_FILES) encodings.dir -MAINTAINERCLEANFILES=ChangeLog - .PHONY: ChangeLog ChangeLog: commit 74eec8241bca833c4f9c20338ca74bc732f74e93 Author: Gaetan Nadon <[email protected]> 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. diff --git a/.gitignore b/.gitignore index 51c8728..b8aa722 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,80 @@ -Makefile -Makefile.in -*.enc.gz +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno +config.sub configure -encodings.dir +configure.scan +depcomp +.deps/ +INSTALL install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -encodings-*.tar.* -ChangeLog -tags +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for encodings +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# +*.enc.gz +*.dir -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
