Merge branch 'branch_0.12.0' into branch_0.12.0-svn

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@4576 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/ChangeLog b/ChangeLog
index c7b2789..f4bae15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+libapache2-mod-chxj (0.12.24-1) unstable; urgency=low
+
+  * Fixed bug.
+    - Convert 0x5c.
+  * Changed Feature.
+    - The conversion object of Z2h.
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Wed,  3 Dec 2008 20:13:55 +0900
+
 libapache2-mod-chxj (0.12.23-1) unstable; urgency=low
 
   * Added new feature.

diff --git a/configure b/configure
index 41021ea..d8793c1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.23.
+# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.24.
 #
 # Report bugs to <konn@users.sourceforge.jp>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='mod_chxj'
 PACKAGE_TARNAME='mod_chxj'
-PACKAGE_VERSION='0.12.23'
-PACKAGE_STRING='mod_chxj 0.12.23'
+PACKAGE_VERSION='0.12.24'
+PACKAGE_STRING='mod_chxj 0.12.24'
 PACKAGE_BUGREPORT='konn@users.sourceforge.jp'
 
 ac_unique_file="src/mod_chxj.c"
@@ -1407,7 +1407,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_chxj 0.12.23 to adapt to many kinds of systems.
+\`configure' configures mod_chxj 0.12.24 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1478,7 +1478,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_chxj 0.12.23:";;
+     short | recursive ) echo "Configuration of mod_chxj 0.12.24:";;
    esac
   cat <<\_ACEOF
 
@@ -1595,7 +1595,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_chxj configure 0.12.23
+mod_chxj configure 0.12.24
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1609,7 +1609,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_chxj $as_me 0.12.23, which was
+It was created by mod_chxj $as_me 0.12.24, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2427,7 +2427,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=mod_chxj
- VERSION=0.12.23
+ VERSION=0.12.24
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21873,7 +21873,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mod_chxj $as_me 0.12.23, which was
+This file was extended by mod_chxj $as_me 0.12.24, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21926,7 +21926,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mod_chxj config.status 0.12.23
+mod_chxj config.status 0.12.24
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.ac b/configure.ac
index 30e5c88..9b2d09b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([mod_chxj],[0.12.23],[konn@users.sourceforge.jp])
+AC_INIT([mod_chxj],[0.12.24],[konn@users.sourceforge.jp])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/mod_chxj.c])
 AC_CANONICAL_TARGET

diff --git a/debian-sarge/changelog b/debian-sarge/changelog
index 3989947..d66d097 100644 (file)
--- a/debian-sarge/changelog
+++ b/debian-sarge/changelog
@@ -1,3 +1,12 @@
+libapache2-mod-chxj (0.12.24-1) unstable; urgency=low
+
+  * Fixed bug.
+    - Convert 0x5c.
+  * Changed Feature.
+    - The conversion object of Z2h.
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Wed,  3 Dec 2008 20:13:55 +0900
+
 libapache2-mod-chxj (0.12.23-1) unstable; urgency=low
 
   * Added new feature.

diff --git a/debian/changelog b/debian/changelog
index bac5e36..ef45018 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libapache2-mod-chxj (0.12.24-1) unstable; urgency=low
+
+  * Fixed bug.
+    - Convert 0x5c.
+  * Changed Feature.
+    - The conversion object of Z2h.
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Wed,  3 Dec 2008 20:13:55 +0900
+
 libapache2-mod-chxj (0.12.23-1) unstable; urgency=low
 
   * Added new feature.

diff --git a/include/config.h b/include/config.h
index 356cb1a..12338ae 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -96,19 +96,19 @@
 #define PACKAGE_NAME "mod_chxj"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mod_chxj 0.12.23"
+#define PACKAGE_STRING "mod_chxj 0.12.24"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "mod_chxj"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.12.23"
+#define PACKAGE_VERSION "0.12.24"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.12.23"
+#define VERSION "0.12.24"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/support/centos/mod-chxj.spec b/support/centos/mod-chxj.spec
index 917d1ff..a7b6aff 100644 (file)
--- a/support/centos/mod-chxj.spec
+++ b/support/centos/mod-chxj.spec
@@ -1,4 +1,4 @@
-%define version 0.12.23
+%define version 0.12.24
 
 Summary: CHTML to HDML,XHTML,JHTML convert module for Apache HTTPD.
 Name:  mod_chxj