Copied from Debian.

diff --git a/source/common/ucnv_io.cpp b/source/common/ucnv_io.cpp
index 5dd35d8..4424664 100644
--- a/source/common/ucnv_io.cpp
+++ b/source/common/ucnv_io.cpp
@@ -744,7 +744,7 @@ ucnv_io_getConverterName(const char *alias, UBool *containsOption, UErrorCode *p
              * the name begins with 'x-'. If it does, strip it off and try
              * again.  This behaviour is similar to how ICU4J does it.
              */
-            if (aliasTmp[0] == 'x' || aliasTmp[1] == '-') {
+            if (aliasTmp[0] == 'x' && aliasTmp[1] == '-') {
                 aliasTmp = aliasTmp+2;
             } else {
                 break;
00f954713b195100d0dc5febd3f9f6'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=0c6759d87e00f954713b195100d0dc5febd3f9f6'>refs</a><a class='active' href='/guix/log/tests/store-database.scm'>log</a><a href='/guix/tree/tests/store-database.scm?id=0c6759d87e00f954713b195100d0dc5febd3f9f6'>tree</a><a href='/guix/commit/tests/store-database.scm?id=0c6759d87e00f954713b195100d0dc5febd3f9f6'>commit</a><a href='/guix/diff/tests/store-database.scm?id=0c6759d87e00f954713b195100d0dc5febd3f9f6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/store-database.scm'>
<input type='hidden' name='id' value='0c6759d87e00f954713b195100d0dc5febd3f9f6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=0c6759d87e00f954713b195100d0dc5febd3f9f6'>root</a>/<a href='/guix/log/tests?id=0c6759d87e00f954713b195100d0dc5febd3f9f6'>tests</a>/<a href='/guix/log/tests/store-database.scm?id=0c6759d87e00f954713b195100d0dc5febd3f9f6'>store-database.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/store-database.scm?id=0c6759d87e00f954713b195100d0dc5febd3f9f6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-07-20 15:01:33 +0200'>2018-07-20</span></td><td><a href='/guix/commit/tests/store-database.scm?id=e4752118691e41ae8307649d1abfd4739b3e4bfa'>database: Reset timestamps to one second after the Epoch.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-14 11:17:00 +0200'>2018-06-14</span></td><td><a href='/guix/commit/tests/store-database.scm?id=df2f6400b1fbc282ef4d6dd7124ea1c17adc23c2'>store: Remove 'register-path'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-14 11:17:00 +0200'>2018-06-14</span></td><td><a href='/guix/commit/tests/store-database.scm?id=ef1297e8c74a0358d2538a5dd43d50cde7bf14a3'>database: 'sqlite-register' takes a database, not a file name.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-14 11:16:58 +0200'>2018-06-14</span></td><td><a href='/guix/commit/tests/store-database.scm?id=f8f9f7cabca3f0ea1f8b8cb4fecfc45889bdfb94'>database: Fail registration when encountering unregistered references.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-14 11:16:58 +0200'>2018-06-14</span></td><td><a href='/guix/commit/tests/store-database.scm?id=3931c76154d4f418d5ea9acc5e47bf911d371c24'>database: 'with-database' can now initialize new databases.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-01 15:35:32 +0200'>2018-06-01</span></td><td><a href='/guix/commit/tests/store-database.scm?id=7f9d184d9b688d13ce76eefabaddcfa76bdde2b5'>Add (gnu store database).</a><span class='msg-avail'>...</span></td><td>Caleb Ristvedt</td></tr>