Author: yamakenz
Date: Mon May 12 05:36:31 2008
New Revision: 5486
Modified:
branches/1.5/NEWS
branches/1.5/RELNOTE
branches/1.5/configure.ac
branches/1.5/scm/lazy-load.scm
branches/1.5/uim/uim.h
Log:
* Port r5484, 5485 from trunk
Modified: branches/1.5/NEWS
==============================================================================
--- branches/1.5/NEWS (original)
+++ branches/1.5/NEWS Mon May 12 05:36:31 2008
@@ -1,3 +1,11 @@
+Overview of changes from 1.5.0 to 1.5.1
+=======================================
+* Fixes
+ - uim Scheme library
+ * Fix unescaped strings in generated loader.scm which causes uim
+ initialization error on m17n-vi-han (bug #15901)
+
+
Overview of changes from 1.5.0-beta2 to 1.5.0
=============================================
* Fixes
Modified: branches/1.5/RELNOTE
==============================================================================
--- branches/1.5/RELNOTE (original)
+++ branches/1.5/RELNOTE Mon May 12 05:36:31 2008
@@ -1,17 +1,10 @@
-uim 1.5.0 Release Note
+uim 1.5.1 Release Note
======================
About This Release
------------------
-This distribution of uim 1.5.0 is latest stable release of uim.
-
-This release achieved both considerable internal improvement and many
-user-visible new feature additions.
-
-The complicated legacy C part of uim which prevented extensions, design
-improvements and automated input method tests have been turned into Scheme
-codes or optimized out.
+This distribution of uim 1.5.1 is latest stable release of uim.
Please report us if you find a problem.
@@ -22,6 +15,18 @@
What's New
----------
+Several bug fixes against 1.5.0. See NEWS for the detailed changes.
+
+
+What's New in 1.5.0
+-------------------
+
+This release achieved both considerable internal improvement and many
+user-visible new feature additions.
+
+The complicated legacy C part of uim which prevented extensions, design
+improvements and automated input method tests have been turned into Scheme
+codes or optimized out.
See NEWS for the fully detailed changes.
Modified: branches/1.5/configure.ac
==============================================================================
--- branches/1.5/configure.ac (original)
+++ branches/1.5/configure.ac Mon May 12 05:36:31 2008
@@ -1,5 +1,5 @@
AC_PREREQ(2.60b)
-AC_INIT([uim], [1.5.0], [EMAIL PROTECTED])
+AC_INIT([uim], [1.5.1], [EMAIL PROTECTED])
AC_CONFIG_SRCDIR([uim/uim.c])
AC_CONFIG_HEADERS([uim/config.h])
AM_INIT_AUTOMAKE([1.10 dist-bzip2])
Modified: branches/1.5/scm/lazy-load.scm
==============================================================================
--- branches/1.5/scm/lazy-load.scm (original)
+++ branches/1.5/scm/lazy-load.scm Mon May 12 05:36:31 2008
@@ -91,8 +91,8 @@
" (" (symbol->string name) "\n"
" \"" (im-lang im) "\"\n"
" \"" (im-encoding im) "\"\n"
- " \"" (im-name-label im) "\"\n"
- " \"" (im-short-desc im) "\"\n"
+ " " (string-escape (im-name-label im)) "\n"
+ " " (string-escape (im-short-desc im)) "\n"
" \"" (im-module-name im) "\")\n"
)))
im-names)))
Modified: branches/1.5/uim/uim.h
==============================================================================
--- branches/1.5/uim/uim.h (original)
+++ branches/1.5/uim/uim.h Mon May 12 05:36:31 2008
@@ -43,7 +43,7 @@
#define UIM_VERSION_MAJOR (1)
#define UIM_VERSION_MINOR (5)
-#define UIM_VERSION_PATCHLEVEL (0)
+#define UIM_VERSION_PATCHLEVEL (1)
#define UIM_VERSION_REQUIRE(major, minor, patchlevel) \
((major) < UIM_VERSION_MAJOR
\
|| ((major) == UIM_VERSION_MAJOR && (minor) < UIM_VERSION_MINOR)
\
