From 3b84cd78d726b1781af870a05532381f79f65270 Mon Sep 17 00:00:00 2001
From: "NARUSE, Yui" <naruse@users.sourceforge.jp>
Date: Thu, 8 Sep 2011 20:53:44 +0900
Subject: [PATCH] Release 2.1.2.

---
 Changes        | 4 ++++
 Makefile       | 2 +-
 NKF.mod/NKF.pm | 2 +-
 dll.rc         | 8 ++++----
 man/nkf.1.pm   | 6 +-----
 nkf.1          | 5 +----
 nkf.1j         | 2 +-
 version.rc     | 8 ++++----
 8 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/Changes b/Changes
index 9b339d0..d31f04d 100644
--- a/Changes
+++ b/Changes
@@ -518,3 +518,7 @@ eucJP-ms 
 CP50220 ¤¬¤¤¤ï¤æ¤ëȾ³Ñ¥«¥Ê¤òÁ´³Ñ¤ËÊÑ´¹¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¤Î¤ò½¤Àµ
 
 ¤½¤Î¾¤Î¥Ð¥°½¤Àµ
+
+.SS nkf 2.1.2
+
+Q-encoded UTF-8 ¤Î¥Ç¥³¡¼¥É¤¬²õ¤ì¤Æ¤¤¤¿¤Î¤ò½¤Àµ [nkf-bug:55125]
diff --git a/Makefile b/Makefile
index d72f474..9bd986c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SHAR = shar
 # SHAR = shar -T
 PERL = perl
 RM = rm -rf
-VERSION = 2.1.1
+VERSION = 2.1.2
 MKDIR = mkdir
 prefix = /usr/local
 
diff --git a/NKF.mod/NKF.pm b/NKF.mod/NKF.pm
index cfaf30b..0e5003b 100644
--- a/NKF.mod/NKF.pm
+++ b/NKF.mod/NKF.pm
@@ -35,7 +35,7 @@ require DynaLoader;
 @EXPORT = qw(
 	nkf	nkf_continue	inputcode
 );
-$VERSION = '2.11';
+$VERSION = '2.12';
 
 bootstrap NKF $VERSION;
 
diff --git a/dll.rc b/dll.rc
index 5613c05..bb7a54f 100755
--- a/dll.rc
+++ b/dll.rc
@@ -1,8 +1,8 @@
 #include <windows.h>
 
 1 VERSIONINFO
-FILEVERSION 2,1,1,0
-PRODUCTVERSION 2,1,1,0
+FILEVERSION 2,1,2,0
+PRODUCTVERSION 2,1,2,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ FILESUBTYPE 0x0L
         {
             VALUE "CompanyName", "project nkf\0"
             VALUE "FileDescription", "Network Kanji Filter\0"
-            VALUE "FileVersion", "2.1.1.0 1\0"
+            VALUE "FileVersion", "2.1.2.0 1\0"
             VALUE "InternalName", "nkf32\0"
             VALUE "LegalCopyright", "Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA); Copyright (C) 2003-2004 T.kaneto\0"
             VALUE "OriginalFilename", "nkf32.c\0"
             VALUE "ProductName", "nkf32.dll\0"
-            VALUE "ProductVersion", "2.1.1.0 1\0"
+            VALUE "ProductVersion", "2.1.2.0 1\0"
         }
     }
     BLOCK "VarFileInfo"
diff --git a/man/nkf.1.pm b/man/nkf.1.pm
index ba9466b..28b2650 100644
--- a/man/nkf.1.pm
+++ b/man/nkf.1.pm
@@ -35,7 +35,7 @@ require DynaLoader;
 @EXPORT = qw(
 	nkf	nkf_continue	inputcode
 );
-$VERSION = '2.11';
+$VERSION = '2.12';
 
 bootstrap NKF $VERSION;
 
@@ -175,10 +175,6 @@ Katakana to Hiragana and Hiragana to Katakana conversion.
 
 Text mode output (MS-DOS)
 
-=item B<-l>
-
-ISO8859-1 (Latin-1) support
-
 =item B<-f[I<m> [- I<n>]]>
 
 Folding on I<m> length with I<n> margin in a line.
diff --git a/nkf.1 b/nkf.1
index 9baecf2..f8ac5e8 100644
--- a/nkf.1
+++ b/nkf.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
-.TH nkf 1 "2010-09-13" "nkf 2.1.1" " "
+.TH nkf 1 "2011-09-08" "nkf 2.1.2" " "
 .SH "NAME"
 nkf \- Network Kanji Filter
 .SH "SYNOPSIS"
@@ -229,9 +229,6 @@ Katakana to Hiragana and Hiragana to Katakana conversion.
 .IP "\fB\-T\fR" 4
 .IX Item "-T"
 Text mode output (\s-1MS\-DOS\s0)
-.IP "\fB\-l\fR" 4
-.IX Item "-l"
-\&\s-1ISO8859\-1\s0 (Latin\-1) support
 .IP "\fB\-f[\f(BIm\fB [\- \f(BIn\fB]]\fR" 4
 .IX Item "-f[m [- n]]"
 Folding on \fIm\fR length with \fIn\fR margin in a line.
diff --git a/nkf.1j b/nkf.1j
index 3194745..d487e9e 100644
--- a/nkf.1j
+++ b/nkf.1j
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "nkf 1"
-.TH nkf 1 "2009-06-26" "nkf 2.1.1" " "
+.TH nkf 1 "2009-06-26" "nkf 2.1.2" " "
 .SH "NAME"
 nkf \- $B%M%C%H%o!<%/MQ4A;z%3!<%IJQ49%U%#%k%?(B
 .SH "SYNOPSIS"
diff --git a/version.rc b/version.rc
index 9d58ca9..ec857c0 100755
--- a/version.rc
+++ b/version.rc
@@ -1,8 +1,8 @@
 #include <windows.h>
 
 1 VERSIONINFO
-FILEVERSION 2,1,1,0
-PRODUCTVERSION 2,1,1,0
+FILEVERSION 2,1,2,0
+PRODUCTVERSION 2,1,2,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ FILESUBTYPE 0x0L
         {
             VALUE "CompanyName", "project nkf\0"
             VALUE "FileDescription", "Network Kanji Filter\0"
-            VALUE "FileVersion", "2.1.1\0"
+            VALUE "FileVersion", "2.1.2\0"
             VALUE "InternalName", "nkf\0"
             VALUE "LegalCopyright", "Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)\0"
             VALUE "OriginalFilename", "nkf.c\0"
             VALUE "ProductName", "nkf.exe\0"
-            VALUE "ProductVersion", "2.1.1\0"
+            VALUE "ProductVersion", "2.1.2\0"
         }
     }
     BLOCK "VarFileInfo"
-- 
2.11.0