Update uconv.patch to exactly match upstream SVN r37045.

source/common/unicode/uconfig.h

 /*  
 **********************************************************************
-*   Copyright (C) 2002-2014, International Business Machines
+*   Copyright (C) 2002-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  uconfig.h
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2002sep19
 *   created by: Markus W. Scherer
 */
@@ skipping 179 matching lines @@
 
 /* common/i18n library switches --------------------------------------------- */
 
 /**
  * \def UCONFIG_ONLY_COLLATION
  * This switch turns off modules that are not needed for collation.
  *
  * It does not turn off legacy conversion because that is necessary
  * for ICU to work on EBCDIC platforms (for the default converter).
  * If you want "only collation" and do not build for EBCDIC,
- * then you can define UCONFIG_NO_LEGACY_CONVERSION 1 as well.
+ * then you can define UCONFIG_NO_CONVERSION or UCONFIG_NO_LEGACY_CONVERSION to 1 as well.
  *
  * @stable ICU 2.4
  */
 #ifndef UCONFIG_ONLY_COLLATION
 #   define UCONFIG_ONLY_COLLATION 0
 #endif
 
 #if UCONFIG_ONLY_COLLATION
     /* common library */
 #   define UCONFIG_NO_BREAK_ITERATION 1
@@ skipping 49 matching lines @@
  */
 #ifndef UCONFIG_NO_CONVERSION
 #   define UCONFIG_NO_CONVERSION 0
 #endif
 
 #if UCONFIG_NO_CONVERSION
 #   define UCONFIG_NO_LEGACY_CONVERSION 1
 #endif
 
 /**
- * This switch turns off all the converters NOT listed in
- * the encoding standard : http://encoding.spec.whatwg.org
+ * \def UCONFIG_ONLY_HTML_CONVERSION
+ * This switch turns off all of the converters NOT listed in
+ * the HTML encoding standard:
+ * http://www.w3.org/TR/encoding/#names-and-labels
+ *
+ * This is not possible on EBCDIC platforms
+ * because they need ibm-37 or ibm-1047 default converters.
+ *
+ * @draft ICU 55
  */
-#ifndef UCONFIG_NO_NON_HTML5_CONVERSION
-#define UCONFIG_NO_NON_HTML5_CONVERSION 0
+#ifndef UCONFIG_ONLY_HTML_CONVERSION
+#   define UCONFIG_ONLY_HTML_CONVERSION 0
 #endif
 
 /**
  * \def UCONFIG_NO_LEGACY_CONVERSION
  * This switch turns off all converters except for
  * - Unicode charsets (UTF-7/8/16/32, CESU-8, SCSU, BOCU-1)
  * - US-ASCII
  * - ISO-8859-1
  *
  * Turning off legacy conversion is not possible on EBCDIC platforms
@@ skipping 141 matching lines @@
  * @internal
  */
 #ifndef UCONFIG_NO_FILTERED_BREAK_ITERATION
 #   define UCONFIG_NO_FILTERED_BREAK_ITERATION 0
 
 
 
 #endif
 
 #endif