[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xfonts-encodings: Changes to 'debian-unstable'



 .gitignore                                          |    3 
 ChangeLog                                           |  297 +
 Makefile.am                                         |   10 
 Makefile.in                                         |  642 ---
 README                                              |   24 
 aclocal.m4                                          |  665 ---
 configure                                           | 3407 --------------------
 configure.ac                                        |   38 
 debian/changelog                                    |   20 
 debian/control                                      |   12 
 debian/patches/01_encodings_dir_absolute_paths.diff |   31 
 debian/patches/02_am_maintainer_mode.diff           |   13 
 debian/patches/series                               |    2 
 debian/rules                                        |   34 
 debian/source.lintian-overrides                     |    2 
 debian/xsfbs/xsfbs.mk                               |   21 
 debian/xsfbs/xsfbs.sh                               |  233 -
 install-sh                                          |  323 -
 large/.gitignore                                    |    4 
 large/Makefile.am                                   |    4 
 large/Makefile.in                                   |  335 -
 missing                                             |  360 --
 mkinstalldirs                                       |  158 
 23 files changed, 402 insertions(+), 6236 deletions(-)

New commits:
commit 38f88c85f8b3cb522375fa7a40272c50006f78aa
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 2 08:56:40 2010 +0000

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 6b448aa..a84d75c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-encodings (1:1.0.3-1) UNRELEASED; urgency=low
+xfonts-encodings (1:1.0.3-1) unstable; urgency=low
 
   * New upstream release.
   * Drop 01_encodings_dir_absolute_paths.diff.  It didn't apply anymore, and
@@ -16,7 +16,7 @@ xfonts-encodings (1:1.0.3-1) UNRELEASED; urgency=low
     --with-encodingsdir to configure.
   * Drop obsolete lintian override.
 
- -- Julien Cristau <jcristau@debian.org>  Sat, 02 Jan 2010 08:31:30 +0000
+ -- Julien Cristau <jcristau@debian.org>  Sat, 02 Jan 2010 08:56:37 +0000
 
 xfonts-encodings (1:1.0.2-4) unstable; urgency=low
 

commit 8bdaaecaca0cea550ce3d4115d519a5d3c174279
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 2 08:56:24 2010 +0000

    Drop obsolete lintian override.

diff --git a/debian/changelog b/debian/changelog
index e1d1000..6b448aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xfonts-encodings (1:1.0.3-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.8.3.
   * Build-Depend on new xfonts-utils so we don't need to pass
     --with-encodingsdir to configure.
+  * Drop obsolete lintian override.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 02 Jan 2010 08:31:30 +0000
 
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 0c682a9..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Quilt is required for our clean target, and thus belongs in Build-Depends
-xfonts-encodings source: build-depends-without-arch-dep quilt

commit d2a60d3be6dd0fb2042933b206040fcdd381f0c7
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 2 08:49:31 2010 +0000

    Use new fontutil
    
    Build-Depend on new xfonts-utils so we don't need to pass
    --with-encodingsdir to configure.

diff --git a/debian/changelog b/debian/changelog
index 0a1a67a..e1d1000 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ xfonts-encodings (1:1.0.3-1) UNRELEASED; urgency=low
   * Build the package in binary-indep, not binary-arch (lintian).  Also fix
     ordering of some dh_* calls.
   * Bump Standards-Version to 3.8.3.
+  * Build-Depend on new xfonts-utils so we don't need to pass
+    --with-encodingsdir to configure.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 02 Jan 2010 08:31:30 +0000
 
diff --git a/debian/control b/debian/control
index e12f305..b6d4d1f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 5.0.0),
 Build-Depends-Indep:
  pkg-config,
- xfonts-utils,
+ xfonts-utils (>= 1:7.5),
  autoconf,
  automake,
  xutils-dev (>= 1:7.5~1),
diff --git a/debian/rules b/debian/rules
index 0788dd4..e92f603 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,6 @@ build-stamp:
 	cd obj-$(DEB_BUILD_GNU_TYPE) && \
 	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 	             --infodir=\$${prefix}/share/info $(confflags) \
-		     --with-encodingsdir=/usr/share/fonts/X11/encodings/ \
 	             CFLAGS="$(CFLAGS)" 
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
 	>$@

commit 3bfe1e0448670b617835e3f98037cd5d98c1c538
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 2 08:48:08 2010 +0000

    Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 4a8cfd7..0a1a67a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xfonts-encodings (1:1.0.3-1) UNRELEASED; urgency=low
     ourselves).
   * Build the package in binary-indep, not binary-arch (lintian).  Also fix
     ordering of some dh_* calls.
+  * Bump Standards-Version to 3.8.3.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 02 Jan 2010 08:31:30 +0000
 
diff --git a/debian/control b/debian/control
index 6b93961..e12f305 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep:
  autoconf,
  automake,
  xutils-dev (>= 1:7.5~1),
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 
 Package: xfonts-encodings
 Architecture: all

commit 01a2e91d45018f2bae99035e5e02373b92a51596
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 2 08:46:40 2010 +0000

    Build the package in binary-indep, not binary-arch (lintian).
    
    Also fix ordering of some dh_* calls.

diff --git a/debian/changelog b/debian/changelog
index e98417d..4a8cfd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xfonts-encodings (1:1.0.3-1) UNRELEASED; urgency=low
   * Run autoreconf at build time.
   * Drop 02_am_maintainer_mode.diff (unneeded now that we run autoreconf
     ourselves).
+  * Build the package in binary-indep, not binary-arch (lintian).  Also fix
+    ordering of some dh_* calls.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 02 Jan 2010 08:31:30 +0000
 
diff --git a/debian/rules b/debian/rules
index 8ef4f0f..0788dd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,10 @@ install: build
 
 # Build architecture-dependent files here.
 binary-arch: build install
+# Nothing to do
+
+# Build architecture-independent files here.
+binary-indep: build install
 	dh_testdir
 	dh_testroot
 
@@ -80,16 +84,12 @@ binary-arch: build install
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
 	dh_makeshlibs
+	dh_shlibdeps
+	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

commit ce9e744473ef3bc67f96411daf3a3a0ac2ff3d08
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 2 08:43:06 2010 +0000

    Two more files to delete on clean

diff --git a/debian/rules b/debian/rules
index 78d37ba..8ef4f0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ clean: xsfclean
 	rm -rf autom4te.cache */autom4te.cache
 	rm -rf obj-*
 	rm -f aclocal.m4 configure install-sh missing mkinstalldirs
+	rm -f config.guess config.sub
 	find -name Makefile.in -delete
 
 	dh_clean

commit 572dbb265153779e12e9f3902b3fac464f577b4a
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 2 08:41:50 2010 +0000

    Drop 02_am_maintainer_mode.diff
    
    Unneeded now that we run autoreconf ourselves.

diff --git a/debian/changelog b/debian/changelog
index aea3dc0..e98417d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xfonts-encodings (1:1.0.3-1) UNRELEASED; urgency=low
   * debian/rules: allow parallel builds and parse space-separated
     DEB_BUILD_OPTIONS.
   * Run autoreconf at build time.
+  * Drop 02_am_maintainer_mode.diff (unneeded now that we run autoreconf
+    ourselves).
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 02 Jan 2010 08:31:30 +0000
 
diff --git a/debian/control b/debian/control
index 6f763a2..6b93961 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
 Build-Depends:
  debhelper (>= 5.0.0),
- quilt,
 Build-Depends-Indep:
  pkg-config,
  xfonts-utils,
diff --git a/debian/patches/02_am_maintainer_mode.diff b/debian/patches/02_am_maintainer_mode.diff
deleted file mode 100644
index b04cfdc..0000000
--- a/debian/patches/02_am_maintainer_mode.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xfonts-encodings/configure.ac
-===================================================================
---- xfonts-encodings.orig/configure.ac	2007-05-31 13:51:34.000000000 +0200
-+++ xfonts-encodings/configure.ac	2007-05-31 13:51:43.000000000 +0200
-@@ -2,6 +2,8 @@
- AC_INIT([encodings], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
-+AM_MAINTAINER_MODE
-+
- m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
- 
- # mkfontscale
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 58dfbdd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-02_am_maintainer_mode.diff
diff --git a/debian/rules b/debian/rules
index aecf000..78d37ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ endif
 
 
 build: build-stamp
-build-stamp: $(STAMP_DIR)/patch
+build-stamp:
 	dh_testdir
 	autoreconf -vfi
 	mkdir -p obj-$(DEB_BUILD_GNU_TYPE)

commit c770fb39e9a0915d070bbb58f53950b2ba365deb
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 2 08:39:48 2010 +0000

    Delete generated files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 8212e25..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,642 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-@GZIP_SMALL_TRUE@am__append_1 = $(COMPRESSED)
-subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure COPYING \
-	ChangeLog install-sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(encodingsdir)"
-encodingsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(encodings_DATA)
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ENCODINGSDIR = @ENCODINGSDIR@
-GZIP = @GZIP@
-GZIP_LARGE_FALSE = @GZIP_LARGE_FALSE@
-GZIP_LARGE_TRUE = @GZIP_LARGE_TRUE@
-GZIP_SMALL_FALSE = @GZIP_SMALL_FALSE@
-GZIP_SMALL_TRUE = @GZIP_SMALL_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKFONTSCALE = @MKFONTSCALE@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-SUBDIRS = large
-encodingsdir = @ENCODINGSDIR@
-ENCODING_FILES = \
-	adobe-dingbats.enc	\
-	adobe-standard.enc	\
-	adobe-symbol.enc	\
-	armscii-8.enc		\
-	ascii-0.enc		\
-	dec-special.enc		\
-	ibm-cp437.enc		\
-	ibm-cp850.enc		\
-	ibm-cp852.enc		\
-	ibm-cp866.enc		\
-	iso8859-11.enc		\
-	iso8859-13.enc		\
-	iso8859-16.enc		\
-	iso8859-6.16.enc	\
-	iso8859-6.8x.enc	\
-	microsoft-cp1250.enc	\
-	microsoft-cp1251.enc	\
-	microsoft-cp1252.enc	\
-	microsoft-cp1253.enc	\
-	microsoft-cp1254.enc	\
-	microsoft-cp1255.enc	\
-	microsoft-cp1256.enc	\
-	microsoft-cp1257.enc	\
-	microsoft-cp1258.enc	\
-	microsoft-win3.1.enc	\
-	mulearabic-0.enc	\
-	mulearabic-1.enc	\
-	mulearabic-2.enc	\
-	mulelao-1.enc		\
-	suneu-greek.enc		\
-	tcvn-0.enc		\
-	tis620-2.enc		\
-	viscii1.1-1.enc
-
-EXTRA_DIST = $(ENCODING_FILES) ChangeLog
-COMPRESSED = $(ENCODING_FILES:%=%.gz)
-CLEANFILES = encodings.dir $(am__append_1)
-@GZIP_SMALL_FALSE@DATA_FILES = $(ENCODING_FILES) encodings.dir
-@GZIP_SMALL_TRUE@DATA_FILES = $(COMPRESSED)
-SUFFIXES = .enc .enc.gz
-encodings_DATA = $(DATA_FILES) encodings.dir
-MAINTAINERCLEANFILES = ChangeLog
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .enc .enc.gz
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-uninstall-info-am:
-install-encodingsDATA: $(encodings_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(encodingsdir)" || $(mkdir_p) "$(DESTDIR)$(encodingsdir)"
-	@list='$(encodings_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(encodingsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(encodingsdir)/$$f'"; \
-	  $(encodingsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(encodingsdir)/$$f"; \
-	done
-
-uninstall-encodingsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(encodings_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(encodingsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(encodingsdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(encodingsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-encodingsDATA
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-encodingsDATA uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-recursive distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-encodingsDATA install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-encodingsDATA \
-	uninstall-info-am
-
-
-.enc.enc.gz:
-	@GZIP@ -c < $< > $@
-
-encodings.dir: $(DATA_FILES)
-	@MKFONTSCALE@ -b -s -l -n -p $(encodingsdir) -e . -e large .
-
-ChangeLog:
-	git-log > ChangeLog
-
-dist-hook: ChangeLog
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 06d85e9..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,665 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-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


Reply to: