From 6b13d9d9ef19b7a5571edd420ca0c16e4986f9bb Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 23 Dec 2011 08:35:09 -0500
Subject: iconv mapping of U+0385 in TCVN5712-1 is incorrect

---
 ChangeLog              |  6 ++++++
 NEWS                   | 13 +++++++------
 iconvdata/tcvn5712-1.c |  9 ++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d49f945bb0..05eb2e051d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-06  Bruno Haible  <bruno@clisp.org>
+
+	[BZ #13062]
+	* iconvdata/tcvn5712-1.c (comp_table_data): Remove useless and wrong
+	entry for U+00A5 U+0301.
+
 2011-12-22  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #13166]
diff --git a/NEWS b/NEWS
index 8f70f54a28..e94b59f996 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-12-22
+GNU C Library NEWS -- history of user-visible changes.  2011-12-23
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -10,11 +10,12 @@ Version 2.15
 * The following bugs are resolved with this release:
 
   6779, 6783, 9696, 10103, 10709, 11589, 12403, 12847, 12868, 12852, 12874,
-  12885, 12892, 12907, 12922, 12935, 13007, 13021, 13067, 13068, 13085,
-  13088, 13090, 13092, 13096, 13114, 13118, 13123, 13134, 13138, 13147,
-  13150, 13166, 13179, 13185, 13189, 13192, 13268, 13276, 13282, 13291,
-  13305, 13328, 13335, 13337, 13344, 13358, 13367, 13413, 13416, 13423,
-  13439, 13446, 13472, 13484, 13506, 13515, 13523, 13524, 13538, 13540
+  12885, 12892, 12907, 12922, 12935, 13007, 13021, 13062, 13067, 13068,
+  13085, 13088, 13090, 13092, 13096, 13114, 13118, 13123, 13134, 13138,
+  13147, 13150, 13166, 13179, 13185, 13189, 13192, 13268, 13276, 13282,
+  13291, 13305, 13328, 13335, 13337, 13344, 13358, 13367, 13413, 13416,
+  13423, 13439, 13446, 13472, 13484, 13506, 13515, 13523, 13524, 13538,
+  13540
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.
diff --git a/iconvdata/tcvn5712-1.c b/iconvdata/tcvn5712-1.c
index c94dadb2e7..3cfdf468d9 100644
--- a/iconvdata/tcvn5712-1.c
+++ b/iconvdata/tcvn5712-1.c
@@ -1,5 +1,5 @@
 /* Conversion to and from TCVN5712-1.
-   Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2004, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
 
@@ -158,7 +158,7 @@ static const struct
     { 0x01AF, 0x1EEA },
     { 0x01B0, 0x1EEB },
 #define COMP_TABLE_IDX_0301 (COMP_TABLE_IDX_0300 + COMP_TABLE_LEN_0300)
-#define COMP_TABLE_LEN_0301 51
+#define COMP_TABLE_LEN_0301 50
     { 0x0041, 0x00C1 },
     { 0x0043, 0x0106 },
     { 0x0045, 0x00C9 },
@@ -193,8 +193,7 @@ static const struct
     { 0x0077, 0x1E83 },
     { 0x0079, 0x00FD },
     { 0x007A, 0x017A },
-    { 0x00A5, 0x0385 },
-  /*{ 0x00A8, 0x1FEE },*/
+  /*{ 0x00A8, 0x0385 },*//* prefer U+0385 over U+1FEE */
     { 0x00C2, 0x1EA4 },
   /*{ 0x00C5, 0x01FA },*/
   /*{ 0x00C6, 0x01FC },*/
@@ -492,7 +491,7 @@ static const struct
 #include <iconv/loop.c>
 
 
-/* Next, define the conversion function from UCS4 to CP1258.  */
+/* Next, define the conversion function from UCS4 to TCVN5712-1.  */
 
 static const unsigned char from_ucs4[] =
   {
-- 
cgit 1.4.1