[kaffe] CVS kaffe (dalibor): Removed gettext again since it broke too many things

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Mon Feb 2 08:42:02 2004


PatchSet 4384 
Date: 2004/02/02 16:26:01
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Removed gettext again since it broke too many things

2004-02-02  Dalibor Topic <robilad@kaffe.org>

        * Makefile.am:
        (SUBDIRS) Removed intl.

        * configure.in
        (AM_GETTEXT) Use external.
        (AC_CONFIG_FILES) Removed intl/Makefile.

        * developers/autogen.sh:
        Removed gettext patch.

        * intl/ChangeLog,
        intl/Makefile.in,
        intl/VERSION,
        intl/bindtextdom.c,
        intl/config.charset,
        intl/dcgettext.c,
        intl/dcigettext.c,
        intl/dcngettext.c,
        intl/dgettext.c,
        intl/dngettext.c,
        intl/eval-plural.h,
        intl/explodename.c,
        intl/finddomain.c,
        intl/gettext.c,
        intl/gettextP.h,
        intl/gmo.h,
        intl/hash-string.h,
        intl/intl-compat.c,
        intl/l10nflist.c,
        intl/libgnuintl.h.in,
        intl/loadinfo.h,
        intl/loadmsgcat.c,
        intl/localcharset.c,
        intl/localcharset.h,
        intl/locale.alias,
        intl/localealias.c,
        intl/localename.c,
        intl/log.c,
        intl/ngettext.c,
        intl/os2compat.c,
        intl/os2compat.h,
        intl/osdep.c,
        intl/plural-exp.c,
        intl/plural-exp.h,
        intl/plural.c,
        intl/plural.y,
        intl/printf-args.c,
        intl/printf-args.h,
        intl/printf-parse.c,
        intl/printf-parse.h,
        intl/printf.c,
        intl/ref-add.sin,
        intl/ref-del.sin,
        intl/relocatable.c,
        intl/relocatable.h,
        intl/textdomain.c,
        intl/vasnprintf.c,
        intl/vasnprintf.h,
        intl/vasnwprintf.h,
        intl/wprintf-parse.h,
        intl/xsize.h,
        developers/patch-gettext-bad-config-h-dependency:
        Removed.

        * Makefile.in,
        aclocal.m4,
        configure,
        config/Makefile.in,
        config/config.h.in,
        include/Makefile.in.
        kaffe/Makefile.in,
        kaffe/jvmpi/Makefile.in,
        kaffe/kaffe/Makefile.in,
        kaffe/kaffeh/Makefile.in,
        kaffe/kaffevm/Makefile.in,
        kaffe/kaffevm/gcj/Makefile.in,
        kaffe/kaffevm/intrp/Makefile.in,
        kaffe/kaffevm/jit/Makefile.in,
        kaffe/kaffevm/jit3/Makefile.in,
        kaffe/kaffevm/systems/Makefile.in,
        kaffe/kaffevm/systems/beos-native/Makefile.in,
        kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
        kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
        kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
        kaffe/man/Makefile.in,
        kaffe/scripts/Makefile.in,
        kaffe/scripts/bat/Makefile.in,
        kaffe/scripts/compat/Makefile.in,
        kaffe/xprof/Makefile.in,
        libraries/Makefile.in,
        libraries/clib/Makefile.in,
        libraries/clib/awt/Makefile.in,
        libraries/clib/awt/X/Makefile.in,
        libraries/clib/awt/qt/Makefile.in,
        libraries/clib/io/Makefile.in,
        libraries/clib/management/Makefile.in,
        libraries/clib/math/Makefile.in,
        libraries/clib/native/Makefile.in,
        libraries/clib/net/Makefile.in,
        libraries/clib/nio/Makefile.in,
        libraries/clib/security/Makefile.in,
        libraries/clib/zip/Makefile.in,
        libraries/extensions/Makefile.in,
        libraries/extensions/comm/Makefile.in,
        libraries/extensions/comm/javalib/Makefile.in,
        libraries/extensions/microsoft/Makefile.in,
        libraries/extensions/microsoft/clib/Makefile.in,
        libraries/extensions/microsoft/javalib/Makefile.in,
        libraries/extensions/pjava/Makefile.in,
        libraries/extensions/pjava/javalib/Makefile.in,
        libraries/extensions/servlet/Makefile.in,
        libraries/extensions/servlet/javalib/Makefile.in,
        libraries/extensions/sound/Makefile.in,
        libraries/extensions/sound/alsa/Makefile.in,
        libraries/extensions/sound/common/Makefile.in,
        libraries/extensions/sound/esd/Makefile.in,
        libraries/javalib/Makefile.in,
        replace/Makefile.in,
        test/Makefile.in,
        test/internal/Makefile.in,
        test/regression/Makefile.in,
        test/regression/compile_time/Makefile.in,
        test/regression/compiler/Makefile.in,
        test/regression/run_time/Makefile.in:
        Regenerated.

Members: 
	ChangeLog:1.1968->1.1969 
	Makefile.am:1.59->1.60 
	Makefile.in:1.140->1.141 
	aclocal.m4:1.92->1.93 
	configure:1.288->1.289 
	configure.in:1.253->1.254 
	config/Makefile.in:1.115->1.116 
	config/config.h.in:1.88->1.89 
	developers/autogen.sh:1.28->1.29 
	developers/patch-gettext-bad-config-h-dependency:1.1->1.2(DEAD) 
	include/Makefile.in:1.142->1.143 
	intl/ChangeLog:1.2->1.3(DEAD) 
	intl/Makefile.in:1.3->1.4(DEAD) 
	intl/VERSION:1.2->1.3(DEAD) 
	intl/bindtextdom.c:1.1->1.2(DEAD) 
	intl/config.charset:1.2->1.3(DEAD) 
	intl/dcgettext.c:1.1->1.2(DEAD) 
	intl/dcigettext.c:1.1->1.2(DEAD) 
	intl/dcngettext.c:1.1->1.2(DEAD) 
	intl/dgettext.c:1.1->1.2(DEAD) 
	intl/dngettext.c:1.1->1.2(DEAD) 
	intl/eval-plural.h:1.1->1.2(DEAD) 
	intl/explodename.c:1.1->1.2(DEAD) 
	intl/finddomain.c:1.1->1.2(DEAD) 
	intl/gettext.c:1.1->1.2(DEAD) 
	intl/gettextP.h:1.1->1.2(DEAD) 
	intl/gmo.h:1.2->1.3(DEAD) 
	intl/hash-string.h:1.1->1.2(DEAD) 
	intl/intl-compat.c:1.1->1.2(DEAD) 
	intl/l10nflist.c:1.1->1.2(DEAD) 
	intl/libgnuintl.h.in:1.1->1.2(DEAD) 
	intl/loadinfo.h:1.1->1.2(DEAD) 
	intl/loadmsgcat.c:1.2->1.3(DEAD) 
	intl/localcharset.c:1.1->1.2(DEAD) 
	intl/localcharset.h:1.1->1.2(DEAD) 
	intl/locale.alias:1.2->1.3(DEAD) 
	intl/localealias.c:1.1->1.2(DEAD) 
	intl/localename.c:1.2->1.3(DEAD) 
	intl/log.c:1.1->1.2(DEAD) 
	intl/ngettext.c:1.1->1.2(DEAD) 
	intl/os2compat.c:1.1->1.2(DEAD) 
	intl/os2compat.h:1.1->1.2(DEAD) 
	intl/osdep.c:1.1->1.2(DEAD) 
	intl/plural-exp.c:1.1->1.2(DEAD) 
	intl/plural-exp.h:1.1->1.2(DEAD) 
	intl/plural.c:1.1->1.2(DEAD) 
	intl/plural.y:1.1->1.2(DEAD) 
	intl/printf-args.c:1.1->1.2(DEAD) 
	intl/printf-args.h:1.1->1.2(DEAD) 
	intl/printf-parse.c:1.1->1.2(DEAD) 
	intl/printf-parse.h:1.1->1.2(DEAD) 
	intl/printf.c:1.1->1.2(DEAD) 
	intl/ref-add.sin:1.1->1.2(DEAD) 
	intl/ref-del.sin:1.1->1.2(DEAD) 
	intl/relocatable.c:1.1->1.2(DEAD) 
	intl/relocatable.h:1.1->1.2(DEAD) 
	intl/textdomain.c:1.1->1.2(DEAD) 
	intl/vasnprintf.c:1.1->1.2(DEAD) 
	intl/vasnprintf.h:1.1->1.2(DEAD) 
	intl/vasnwprintf.h:1.1->1.2(DEAD) 
	intl/wprintf-parse.h:1.1->1.2(DEAD) 
	intl/xsize.h:1.1->1.2(DEAD) 
	kaffe/Makefile.in:1.100->1.101 
	kaffe/jvmpi/Makefile.in:1.21->1.22 
	kaffe/kaffe/Makefile.in:1.115->1.116 
	kaffe/kaffeh/Makefile.in:1.97->1.98 
	kaffe/kaffevm/Makefile.in:1.131->1.132 
	kaffe/kaffevm/gcj/Makefile.in:1.80->1.81 
	kaffe/kaffevm/intrp/Makefile.in:1.86->1.87 
	kaffe/kaffevm/jit/Makefile.in:1.92->1.93 
	kaffe/kaffevm/jit3/Makefile.in:1.62->1.63 
	kaffe/kaffevm/systems/Makefile.in:1.88->1.89 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.79->1.80 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.85->1.86 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.88->1.89 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.58->1.59 
	kaffe/man/Makefile.in:1.86->1.87 
	kaffe/scripts/Makefile.in:1.123->1.124 
	kaffe/scripts/bat/Makefile.in:1.79->1.80 
	kaffe/scripts/compat/Makefile.in:1.104->1.105 
	kaffe/xprof/Makefile.in:1.54->1.55 
	libraries/Makefile.in:1.83->1.84 
	libraries/clib/Makefile.in:1.91->1.92 
	libraries/clib/awt/Makefile.in:1.96->1.97 
	libraries/clib/awt/X/Makefile.in:1.86->1.87 
	libraries/clib/awt/qt/Makefile.in:1.41->1.42 
	libraries/clib/io/Makefile.in:1.89->1.90 
	libraries/clib/management/Makefile.in:1.98->1.99 
	libraries/clib/math/Makefile.in:1.94->1.95 
	libraries/clib/native/Makefile.in:1.121->1.122 
	libraries/clib/net/Makefile.in:1.102->1.103 
	libraries/clib/nio/Makefile.in:1.15->1.16 
	libraries/clib/security/Makefile.in:1.62->1.63 
	libraries/clib/zip/Makefile.in:1.96->1.97 
	libraries/extensions/Makefile.in:1.74->1.75 
	libraries/extensions/comm/Makefile.in:1.69->1.70 
	libraries/extensions/comm/javalib/Makefile.in:1.69->1.70 
	libraries/extensions/microsoft/Makefile.in:1.61->1.62 
	libraries/extensions/microsoft/clib/Makefile.in:1.64->1.65 
	libraries/extensions/microsoft/javalib/Makefile.in:1.62->1.63 
	libraries/extensions/pjava/Makefile.in:1.69->1.70 
	libraries/extensions/pjava/javalib/Makefile.in:1.69->1.70 
	libraries/extensions/servlet/Makefile.in:1.69->1.70 
	libraries/extensions/servlet/javalib/Makefile.in:1.69->1.70 
	libraries/extensions/sound/Makefile.in:1.37->1.38 
	libraries/extensions/sound/alsa/Makefile.in:1.39->1.40 
	libraries/extensions/sound/common/Makefile.in:1.39->1.40 
	libraries/extensions/sound/esd/Makefile.in:1.39->1.40 
	libraries/javalib/Makefile.in:1.225->1.226 
	replace/Makefile.in:1.33->1.34 
	test/Makefile.in:1.89->1.90 
	test/internal/Makefile.in:1.47->1.48 
	test/regression/Makefile.in:1.158->1.159 
	test/regression/compile_time/Makefile.in:1.19->1.20 
	test/regression/compiler/Makefile.in:1.1->1.2 
	test/regression/run_time/Makefile.in:1.18->1.19 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1968 kaffe/ChangeLog:1.1969
--- kaffe/ChangeLog:1.1968	Mon Feb  2 13:32:30 2004
+++ kaffe/ChangeLog	Mon Feb  2 16:26:01 2004
@@ -1,3 +1,131 @@
+2004-02-02  Dalibor Topic <robilad@kaffe.org>
+
+	* Makefile.am:
+	(SUBDIRS) Removed intl.
+
+	* configure.in
+	(AM_GETTEXT) Use external.
+	(AC_CONFIG_FILES) Removed intl/Makefile.
+
+	* developers/autogen.sh:
+	Removed gettext patch.
+
+	* intl/ChangeLog,
+	intl/Makefile.in,
+	intl/VERSION,
+	intl/bindtextdom.c,
+	intl/config.charset,
+	intl/dcgettext.c,
+	intl/dcigettext.c,
+	intl/dcngettext.c,
+	intl/dgettext.c,
+	intl/dngettext.c,
+	intl/eval-plural.h,
+	intl/explodename.c,
+	intl/finddomain.c,
+	intl/gettext.c,
+	intl/gettextP.h,
+	intl/gmo.h,
+	intl/hash-string.h,
+	intl/intl-compat.c,
+	intl/l10nflist.c,
+	intl/libgnuintl.h.in,
+	intl/loadinfo.h,
+	intl/loadmsgcat.c,
+	intl/localcharset.c,
+	intl/localcharset.h,
+	intl/locale.alias,
+	intl/localealias.c,
+	intl/localename.c,
+	intl/log.c,
+	intl/ngettext.c,
+	intl/os2compat.c,
+	intl/os2compat.h,
+	intl/osdep.c,
+	intl/plural-exp.c,
+	intl/plural-exp.h,
+	intl/plural.c,
+	intl/plural.y,
+	intl/printf-args.c,
+	intl/printf-args.h,
+	intl/printf-parse.c,
+	intl/printf-parse.h,
+	intl/printf.c,
+	intl/ref-add.sin,
+	intl/ref-del.sin,
+	intl/relocatable.c,
+	intl/relocatable.h,
+	intl/textdomain.c,
+	intl/vasnprintf.c,
+	intl/vasnprintf.h,
+	intl/vasnwprintf.h,
+	intl/wprintf-parse.h,
+	intl/xsize.h,
+	developers/patch-gettext-bad-config-h-dependency:
+	Removed.
+
+	* Makefile.in,
+	aclocal.m4,
+	configure,
+	config/Makefile.in,
+	config/config.h.in,
+	include/Makefile.in.
+	kaffe/Makefile.in,
+	kaffe/jvmpi/Makefile.in,
+	kaffe/kaffe/Makefile.in,
+	kaffe/kaffeh/Makefile.in,
+	kaffe/kaffevm/Makefile.in,
+	kaffe/kaffevm/gcj/Makefile.in,
+	kaffe/kaffevm/intrp/Makefile.in,
+	kaffe/kaffevm/jit/Makefile.in,
+	kaffe/kaffevm/jit3/Makefile.in,
+	kaffe/kaffevm/systems/Makefile.in,
+	kaffe/kaffevm/systems/beos-native/Makefile.in,
+	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
+	kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+	kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+	kaffe/man/Makefile.in,
+	kaffe/scripts/Makefile.in,
+	kaffe/scripts/bat/Makefile.in,
+	kaffe/scripts/compat/Makefile.in,
+	kaffe/xprof/Makefile.in,
+	libraries/Makefile.in,
+	libraries/clib/Makefile.in,
+	libraries/clib/awt/Makefile.in,
+	libraries/clib/awt/X/Makefile.in,
+	libraries/clib/awt/qt/Makefile.in,
+	libraries/clib/io/Makefile.in,
+	libraries/clib/management/Makefile.in,
+	libraries/clib/math/Makefile.in,
+	libraries/clib/native/Makefile.in,
+	libraries/clib/net/Makefile.in,
+	libraries/clib/nio/Makefile.in,
+	libraries/clib/security/Makefile.in,
+	libraries/clib/zip/Makefile.in,
+	libraries/extensions/Makefile.in,
+	libraries/extensions/comm/Makefile.in,
+	libraries/extensions/comm/javalib/Makefile.in,
+	libraries/extensions/microsoft/Makefile.in,
+	libraries/extensions/microsoft/clib/Makefile.in,
+	libraries/extensions/microsoft/javalib/Makefile.in,
+	libraries/extensions/pjava/Makefile.in,
+	libraries/extensions/pjava/javalib/Makefile.in,
+	libraries/extensions/servlet/Makefile.in,
+	libraries/extensions/servlet/javalib/Makefile.in,
+	libraries/extensions/sound/Makefile.in,
+	libraries/extensions/sound/alsa/Makefile.in,
+	libraries/extensions/sound/common/Makefile.in,
+	libraries/extensions/sound/esd/Makefile.in,
+	libraries/javalib/Makefile.in,
+	replace/Makefile.in,
+	test/Makefile.in,
+	test/internal/Makefile.in,
+	test/regression/Makefile.in,
+	test/regression/compile_time/Makefile.in,
+	test/regression/compiler/Makefile.in,
+	test/regression/run_time/Makefile.in:
+	Regenerated.
+
 2004-02-01  Helmer Kraemer <hkraemer@freenet.de>
 
 	* kaffe/kaffevm/thread.c
@@ -10,10 +138,10 @@
 2004-02-01  Dalibor Topic <robilad@kaffe.org>
 
         include/gettext.h:
-	New file, taken from GNU gettext 0.14.1.
+	New file, taken froGNgettext 0.14.1.
 
 	* developers/patch-gettext-bad-config-h-dependency:
-	New file. Patch for a bug in a file managed by GNU gettext.
+	New file. Patch for a bug in a file managed by GNgettext.
 
         * include/Makefile.am:
 	Added gettext.h.
@@ -126,16 +254,16 @@
 
 2004-01-30  Helmer Kramer <hkraemer@freenet.de>
 
-	Checked in by Guilhem Lavaux <guilhem@kaffe.org>
+	Checked in by GuilheLavaux <guilhem@kaffe.org>
 
 	* libraries/javalib/java/security/SecureClassLoader.java
 	(SecureClassLoader): Class loader's parent should not be set.
 
-2004-01-30  Ito Kazumitsu  <kaz@maczuka.gcd.org>
+2004-01-30  Ito Kazumits <kaz@maczuka.gcd.org>
 
 	* libraries/javalib/java/io/InputStreamReader.java,
 	javalib/java/io/OutputStreamWriter.java:
-	Imported from GNU Classpath.
+	Imported froGNClasspath.
 
 	* libraries/javalib/gnu/java/io/EncodingManager.java:
 	Don't use static initializers because it causes stack overflow.
@@ -145,7 +273,7 @@
 
 	* libraries/javalib/bootstrap.classlist,
 	libraries/javalib/essential.files:
-	Added new files to compile files newly imported from GNU Classpath.
+	Added new files to compile files newly imported froGNClasspath.
 
 	* libraries/javalib/Klasses.jar.bootstrap:
 	Regenerated.
@@ -260,7 +388,7 @@
 
 	Reported by: Riccardo Mottola <zuse@libero.it>
 
-2004-01-25  Guilhem Lavaux <guilhem@kaffe.org>
+2004-01-25  GuilheLavaux <guilhem@kaffe.org>
 
 	* test/regression/compile_time/CompileScript.in: Make the script
 	accepts many parameters.
@@ -272,7 +400,7 @@
 
 	* test/regression/compile_time/Makefile.in: Regenerated.
 
-2004-01-24  Jim Pick  <jim@kaffe.org>
+2004-01-24  JiPick  <jim@kaffe.org>
 
 	* libraries/javalib/essential.files:
 	Add extra classes needed for kjc build.
@@ -297,14 +425,14 @@
 	libraries/javalib/java/security/Permissions.java,
 	libraries/javalib/java/security/ProtectionDomain.java,
 	libraries/javalib/java/security/cert/X509Certificate.java:
-	Replaced by implementations from GNU Classpath.
+	Replaced by implementations froGNClasspath.
 
 	* libraries/javalib/profiles/default/core.files,
 	libraries/javalib/profiles/allatonce/all.files:
 	Updated.
 
 	* libraries/javalib/javax/security/auth/x500/X500Principal.java:
-	New file from GNU Classpath.
+	New file froGNClasspath.
 
 	* libraries/javalib/Makefile.am,
 	libraries/javalib/Makefile.in:
@@ -404,7 +532,7 @@
 
 2004-01-21  gettextize  <bug-gnu-gettext@gnu.org>
 
-	* Makefile.am (SUBDIRS): Add intl.
+	* Makefile.a(SUBDIRS): Add intl.
 	* configure.in (AC_CONFIG_FILES): Add intl/Makefile.
 
 2004-01-20  Timothy S. Stack <stack@cs.utah.edu>
@@ -435,19 +563,19 @@
 	* config/arm/jit.h
 	(LABEL_Lframe): Removed unused variable orig.
 
-2004-01-19  Ito Kazumitsu  <kaz@maczuka.gcd.org>
+2004-01-19  Ito Kazumits <kaz@maczuka.gcd.org>
 
 	* kaffe/libraries/javalib/gnu/java/io/EncodingManager.java:
-	Copied from GNU Classpath and modified for use with kaffe.
+	Copied froGNClasspath and modified for use with kaffe.
 
 	* kaffe/libraries/javalib/gnu/java/io/decode/Decoder.java,
 	kaffe/libraries/javalib/gnu/java/io/encode/Encoder.java:
-	Copied from GNU CLasspath.
+	Copied froGNCLasspath.
 
 	* kaffe/libraries/javalib/gnu/java/io/decode/KaffeDecoder.java, 
 	kaffe/libraries/javalib/gnu/java/io/encode/KaffeEncoder.java:
 	New files.  These are added as a preparation for importing
-	GNU Classpath's java.io.InputStreamReader and
+	GNClasspath's java.io.InputStreamReader and
 	java.io.OutputStreamWriter.
 
 2004-01-19  Alexander Boettcher <ab764283@os.inf.tu-dresden.de>
@@ -461,7 +589,7 @@
 2004-01-19  Dalibor Topic <robilad@kaffe.org>
 
 	* include/Makefile.am
-	[USE_COMPAT_IFADDRS]: Ignore errors from LN_S.
+	[USE_COMPAT_IFADDRS]: Ignore errors froLN_S.
 
 	* include/Makefile.in:
 	Regenerated.
@@ -483,18 +611,18 @@
 	po/POTFILES.in:
 	New files. Required to fix the build.
 
-	The problem is that gettext documentation is very lax with 
+	The probleis that gettext documentation is very lax with 
 	respect to the meaning of the words 'should' and 'must'.
 	Apparently these files *must* exist, otherwise the build
 	breaks, contrary to gettext documentation.
 
-        Reported by: Ito Kazumitsu <kaz@maczuka.gcd.org>
+        Reported by: Ito Kazumits<kaz@maczuka.gcd.org>
                      Matthias Pfisterer <Matthias.Pfisterer@web.de>
 
 2004-01-18  Dalibor Topic <robilad@kaffe.org>
 
 	* include/Makefile.am
-	[USE_COMPAT_IFADDRS]: Replaced GNU Make specific construct.
+	[USE_COMPAT_IFADDRS]: Replaced GNMake specific construct.
 
 	* include/Makefile.in:
 	Regenerated.
@@ -508,7 +636,7 @@
 	configure:
 	Regenerated.
 
-	Reported by: Ito Kazumitsu <kaz@maczuka.gcd.org>
+	Reported by: Ito Kazumits<kaz@maczuka.gcd.org>
                      Matthias Pfisterer <Matthias.Pfisterer@web.de>
 
 2004-01-17  Dalibor Topic <robilad@kaffe.org>
@@ -528,7 +656,7 @@
 	Added calls to autopoint.
 
         * configure.in:
-	Added check for GNU gettext.
+	Added check for GNgettext.
 
 	* ABOUT-NLS,
         Makefile.am,
@@ -637,7 +765,7 @@
 
 2004-01-17  gettextize  <bug-gnu-gettext@gnu.org>
 
-	* Makefile.am (ACLOCAL_AMFLAGS): New variable.
+	* Makefile.a(ACLOCAL_AMFLAGS): New variable.
 
 2004-01-15  Dalibor Topic <robilad@kaffe.org>
 
@@ -888,7 +1016,7 @@
 	* configure.in:
 	Moved AC_CONFIG_* entries before AM_INIT.
 
-	Reported by: Jim Pick <jim@kaffe.org>
+	Reported by: JiPick <jim@kaffe.org>
 
 	* configure:
 	Regenerated.
@@ -993,7 +1121,7 @@
 	New file.
 
         * THIRDPARTY:
-	Added information on GNU Inetlib and ESound m4 macros.
+	Added information on GNInetlib and ESound m4 macros.
 
         * Makefile.in,
         aclocal.m4,
@@ -1143,7 +1271,7 @@
 2004-01-12  Dalibor Topic <robilad@kaffe.org>
 
 	* libraries/javalib/java/util/logging/SocketHandler.java:
-	New file, taken from GNU Classpath.
+	New file, taken froGNClasspath.
 
 	* libraries/javalib/profiles/default/rest.files:
 	Added java/util/logging/SocketHandler.java.
@@ -1165,14 +1293,14 @@
 2004-01-12  Dalibor Topic <robilad@kaffe.org>
 
 	* libraries/javalib/java/awt/GridBagLayout.java:
-	Replaced by implementation from GNU Classpath. 
+	Replaced by implementation froGNClasspath. 
 
 	This fixes a bug with the Babylon Chat Server client.
 
-2004-01-11  Jim Pick  <jim@kaffe.org>
+2004-01-11  JiPick  <jim@kaffe.org>
 
 	* m4/alsa.m4:
-	From http://cvs.sourceforge.net/viewcvs.py/*checkout*/alsa/alsa-lib/utils/alsa.m4?rev=1.22
+	Frohttp://cvs.sourceforge.net/viewcvs.py/*checkout*/alsa/alsa-lib/utils/alsa.m4?rev=1.22
 
 	Used to detect ALSA version.
 
@@ -1270,7 +1398,7 @@
 
 2004-01-11  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-10  Michael Koch  <konqueror@gmx.de>
 
@@ -1279,7 +1407,7 @@
 
 2004-01-11  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-07  Michael Koch  <konqueror@gmx.de>
 
@@ -1291,11 +1419,11 @@
         * java/text/RuleBasedCollator.java:
         Fixed class documentation, reordered methods to match libgcj's
         version.
-        (CollationElement.key): Renamed from char_seq. 
+        (CollationElement.key): Renamed frochar_seq. 
 
 2004-01-11  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2003-12-26  Michael Koch  <konqueror@gmx.de>
 
@@ -1304,7 +1432,7 @@
 
 2004-01-11  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-08  Michael Koch  <konqueror@gmx.de>
 
@@ -1318,7 +1446,7 @@
 
 2004-01-11  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-08  Michael Koch  <konqueror@gmx.de>
 
@@ -1343,7 +1471,7 @@
 
 2004-01-11  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2003-10-15  Michael Koch  <konqueror@gmx.de>
 
@@ -1355,7 +1483,7 @@
         * java/text/AttributedCharacterIterator.java,
         Removed redundant modifiers.
 
-2004-01-11  Guilhem Lavaux <guilhem@kaffe.org>
+2004-01-11  GuilheLavaux <guilhem@kaffe.org>
 
 	* libraries/javalib/java/text/FormatCharacterIterator.java
 	(addAttributes): Added a new helper function.
@@ -1385,12 +1513,12 @@
 	Resynced with Tritonus.org.
 
         * libraries/javalib/org/tritonus/share/sampled/convert/TAudioInputStream.java:
-	New file from Tritonus.
+	New file froTritonus.
 
         * libraries/javalib/profiles/default/sound.files:
 	Added org/tritonus/share/sampled/convert/TAudioInputStream.java.
 
-	Merged in FTP Handler from GNU Inetlib, licensed under GPL + linking exception.
+	Merged in FTP Handler froGNInetlib, licensed under GPL + linking exception.
 
         libraries/javalib/gnu/inet/ftp/ActiveModeDTP.java,
         libraries/javalib/gnu/inet/ftp/BlockInputStream.java,
@@ -1498,7 +1626,7 @@
 
 2004-01-10  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-09  Michael Koch  <konqueror@gmx.de>
 
@@ -1511,7 +1639,7 @@
 
 2004-01-10  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-09  Michael Koch  <konqueror@gmx.de>
 
@@ -1520,7 +1648,7 @@
 
 2004-01-10  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-09  Michael Koch  <konqueror@gmx.de>
 
@@ -1529,7 +1657,7 @@
 
 2004-01-09  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-09  Michael Koch  <konqueror@gmx.de>
 
@@ -1544,7 +1672,7 @@
 
 2004-01-09  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-06  Sascha Brawer  <brawer@dandelis.ch>
 
@@ -1585,7 +1713,7 @@
 
 2004-01-09  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-04  Michael Koch  <konqueror@gmx.de>
 
@@ -1599,7 +1727,7 @@
 
 2004-01-09  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-06  Per Bothner  <per@bothner.com>
 
@@ -1608,7 +1736,7 @@
 
 2004-01-09  Dalibor Topic <robilad@kaffe.org>
 
-        Resynced with GNU Classpath.
+        Resynced with GNClasspath.
 
 	2004-01-08  Michael Koch  <konqueror@gmx.de>
 
@@ -1619,7 +1747,7 @@
 
 2004-01-09  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-06  Michael Koch  <konqueror@gmx.de>
 
@@ -1629,7 +1757,7 @@
 
 2004-01-09  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-07  Michael Koch  <konqueror@gmx.de>
 
@@ -1637,7 +1765,7 @@
 
 2004-01-08  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-06  Michael Koch  <konqueror@gmx.de>
 
@@ -1647,7 +1775,7 @@
 
 2004-01-08  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-05  Sascha Brawer  <brawer@dandelis.ch>
 
@@ -1658,7 +1786,7 @@
 
 2004-01-08  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-04  Michael Koch  <konqueror@gmx.de>
 
@@ -1670,7 +1798,7 @@
 
 2004-01-08  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-06  Michael Koch  <konqueror@gmx.de>
 
@@ -1679,7 +1807,7 @@
 
 2004-01-08  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-08  Michael Koch  <konqueror@gmx.de>
 
@@ -1692,7 +1820,7 @@
 
 2004-01-08  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-08  Michael Koch  <konqueror@gmx.de>
 
@@ -1705,7 +1833,7 @@
 
 2004-01-08  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-08  Michael Koch  <konqueror@gmx.de>
 
@@ -1721,7 +1849,7 @@
 
 2004-01-08  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2004-01-08  Michael Koch  <konqueror@gmx.de>
 
@@ -1732,7 +1860,7 @@
 
 2004-01-08  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2003-10-09  Michael Koch  <konqueror@gmx.de>
 
@@ -1753,7 +1881,7 @@
 	libraries/javalib/gnu/java/net/SocketOutputStream.java:
 	Removed.
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2003-10-09  Michael Koch  <konqueror@gmx.de>
 
@@ -1798,7 +1926,7 @@
 
         Reported by: Riccardo Mottola <zuse@libero.it>
 
-2004-01-07  Ito Kazumitsu  <kaz@maczuka.gcd.org>
+2004-01-07  Ito Kazumits <kaz@maczuka.gcd.org>
 
 	* libraries/javalib/kaffe/io/ByteToCharConverter.java,
 	libraries/javalib/kaffe/io/CharToByteConverter.java:
@@ -1813,7 +1941,7 @@
 
         Reported by: Riccardo Mottola <zuse@libero.it>
 
-2004-01-06  Guilhem Lavaux <guilhem@kaffe.org>
+2004-01-06  GuilheLavaux <guilhem@kaffe.org>
 
 	* libraries/javalib/kjc.jar: Regenerated. Removed checkInitializer
 	patch.
@@ -1843,7 +1971,7 @@
 
 	Reported by: Riccardo Mottola <zuse@libero.it>
 
-2004-01-06  Ito Kazumitsu  <kaz@maczuka.gcd.org>
+2004-01-06  Ito Kazumits <kaz@maczuka.gcd.org>
 
 	* libraries/javalib/kaffe/io/ConverterAlias.java:
 	Added new Hashtable useIconv.  
@@ -1877,7 +2005,7 @@
 	libraries/javalib/Makefile.in:
 	Regenerated.
 
-2004-01-03  Ito Kazumitsu  <kaz@maczuka.gcd.org>
+2004-01-03  Ito Kazumits <kaz@maczuka.gcd.org>
 
 	* libraries/javalib/kaffe/io/ConverterAlias.java:
 	Changed "EUC_JP" to "EUC-JP" so that iconv is directly called.
@@ -1888,7 +2016,7 @@
 
 2004-01-03  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2003-12-26  Michael Koch  <konqueror@gmx.de>
 
@@ -1899,9 +2027,9 @@
 
 2004-01-03  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
-	2003-11-28  Ito Kazumitsu  <kaz@maczuka.gcd.org>
+	2003-11-28  Ito Kazumits <kaz@maczuka.gcd.org>
 
         * java/text/SimpleDateFormat.java (compileFormat):
         isLowerCase() and isUpperCase() allow too many characters.
@@ -1914,7 +2042,7 @@
 
 2004-01-03  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2003-12-26  Michael Koch  <konqueror@gmx.de>
 
@@ -1922,7 +2050,7 @@
         (getCurrency): New method.
         (setCurrency): New method.
 
-	2003-11-23  Guilhem Lavaux <guilhem@kaffe.org>
+	2003-11-23  GuilheLavaux <guilhem@kaffe.org>
 
         * java/text/NumberFormat.java:
         (getIntegerInstance) Added the java version in the comments.
@@ -1935,19 +2063,19 @@
         * java/text/NumberFormat.java: Import java.io.InvalidObjectException.
         (readResolve): Reformat.
 
-	2003-11-22  Guilhem Lavaux <guilhem@kaffe.org>
+	2003-11-22  GuilheLavaux <guilhem@kaffe.org>
 
         * java/text/NumberFormat.java
         (NumberFormat.Field): New implemented class to match Java 1.4.
         (getIntegerInstance): Two new Java 1.4 methods.o
 
-	2001-09-04  Tom Tromey  <tromey@redhat.com>
+	2001-09-04  ToTromey  <tromey@redhat.com>
 
         * java/text/NumberFormat.java: Merged with libgcj.
 
 2004-01-03  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2003-12-26  Michael Koch  <konqueror@gmx.de>
 
@@ -1955,7 +2083,7 @@
 
 2004-01-03  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2003-11-27  Dalibor Topic <robilad@kaffe.org>
 
@@ -1963,17 +2091,17 @@
 
 2004-01-03  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
-	2003-11-15  Guilhem Lavaux <guilhem@kaffe.org>
-            Jim Pick  <jim@kaffe.org>
+	2003-11-15  GuilheLavaux <guilhem@kaffe.org>
+            JiPick  <jim@kaffe.org>
 
         * java/text/DecimalFormat.java (getCurrency, setCurrency): New
         methods.
 
 2004-01-03  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.
+	Resynced with GNClasspath.
 
 	2003-12-27  Michael Koch  <konqueror@gmx.de>
 
@@ -1985,7 +2113,7 @@
 
 2004-01-03  Dalibor Topic <robilad@kaffe.org>
 
-	Resynced with GNU Classpath.

*** Patch too long, truncated ***