Merge lp:~barcc/ubuntu/saucy/pyicu/lp1200419 into lp:ubuntu/saucy/pyicu

[B. Clausius]

* Merged from debian version 1.5-2
* Added transitional packages python3-pyicu[-dbg] to migrate to python3-icu[-dbg]

This solves: lp: #1200419, Please provide package python3-icu

[Martin Pitt (pitti)]

Thanks! Uploaded.

review: Approve

[Iain Lane (laney)]

BTW this merge missed Breaks/Replaces from the new package to the old transitional one and so causes upgrade failures. I'm uploading a fix for that now.

  http://wiki.debian.org/Renaming_a_Package

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2013-07-20 21:08:24 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2013-07-20 21:08:24 +0000
@@ -0,0 +1,1 @@
+series
 
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2013-07-20 21:08:24 +0000
@@ -0,0 +1,1 @@
+2
 
=== modified file 'CHANGES'
--- CHANGES	2012-05-10 22:59:17 +0000
+++ CHANGES	2013-07-20 21:08:24 +0000
@@ -1,6 +1,18 @@
 
 For bug <NUM>, see http://bugzilla.osafoundation.org/show_bug.cgi?id=<NUM>
 
+Version 1.4 -> 1.5
+------------------
+  - added wrapper for MessageFormat::format(argumentNames, arguments, ...)
+  - fixed bug in t_transliterator_filteredTransliterate passing UBool for int
+  - added wrapper for DateFormat::format(Calendar)
+  - added wrapper for Calendar::set(UCalendarDateFields field, value)
+  - added wrappers for UnicodeString::toTitle() w/o iterator (Fredrik Roubert)
+  - added support for ICU 50.1
+  - improved test_Collator's testGetSortKey() (Markus Scherer)
+  - added pypi classifiers to PyICU project info, including Python 3 tag
+  - build tested with Python 2.7 and Python 3.3.0
+
 Version 1.3 -> 1.4
 ------------------
   - fixed bug with default tzinfo set on ICUtzinfo type (bug 13038)
 
=== modified file 'PKG-INFO'
--- PKG-INFO	2012-05-10 22:59:17 +0000
+++ PKG-INFO	2013-07-20 21:08:24 +0000
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: PyICU
-Version: 1.4
+Version: 1.5
 Summary: Python extension wrapping the ICU C++ API
 Home-page: http://pyicu.osafoundation.org/
 Author: Open Source Applications Foundation
-Author-email: UNKNOWN
+Author-email: [e-mail]
 License: UNKNOWN
 Description: 
         ---------------------
@@ -238,3 +238,14 @@
                str(ICUtzinfo.getInstance('Pacific/Fiji')) -> 'Pacific/Fiji'
         
 Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: C++
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Software Development :: Localization
+Classifier: Topic :: Software Development :: Internationalization
 
=== modified file 'PyICU.egg-info/PKG-INFO'
--- PyICU.egg-info/PKG-INFO	2012-05-10 22:59:17 +0000
+++ PyICU.egg-info/PKG-INFO	2013-07-20 21:08:24 +0000
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: PyICU
-Version: 1.4
+Version: 1.5
 Summary: Python extension wrapping the ICU C++ API
 Home-page: http://pyicu.osafoundation.org/
 Author: Open Source Applications Foundation
-Author-email: UNKNOWN
+Author-email: [e-mail]
 License: UNKNOWN
 Description: 
         ---------------------
@@ -238,3 +238,14 @@
                str(ICUtzinfo.getInstance('Pacific/Fiji')) -> 'Pacific/Fiji'
         
 Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: C++
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Software Development :: Localization
+Classifier: Topic :: Software Development :: Internationalization
 
=== modified file 'bases.cpp'
--- bases.cpp	2012-05-10 22:59:17 +0000
+++ bases.cpp	2013-07-20 21:08:24 +0000
@@ -1275,7 +1275,15 @@
     Locale *locale;
 
     switch (PyTuple_Size(args)) {
+      case 0:
+        self->object->toTitle(NULL);
+        Py_RETURN_SELF();
       case 1:
+        if (!parseArgs(args, "P", TYPE_CLASSID(Locale), &locale))
+        {
+            self->object->toTitle(NULL, *locale);
+            Py_RETURN_SELF();
+        }
         if (!parseArg(args, "P", TYPE_ID(BreakIterator), &iterator))
         {
             self->object->toTitle(iterator);
 
=== modified file 'calendar.cpp'
--- calendar.cpp	2011-11-13 12:07:46 +0000
+++ calendar.cpp	2013-07-20 21:08:24 +0000
@@ -1136,8 +1136,15 @@
 static PyObject *t_calendar_set(t_calendar *self, PyObject *args)
 {
     int year, month, date, hour, minute, second;
-
+    int field, value;
     switch (PyTuple_Size(args)) {
+      case 2:
+        if (!parseArgs(args, "ii", &field, &value))
+        {
+            self->object->set((UCalendarDateFields) field, value);
+            Py_RETURN_NONE;
+        }
+        break;
       case 3:
         if (!parseArgs(args, "iii", &year, &month, &date))
         {
 
=== modified file 'common.h'
--- common.h	2011-11-13 12:07:46 +0000
+++ common.h	2013-07-20 21:08:24 +0000
@@ -131,6 +131,9 @@
 #include <unicode/search.h>
 #include <unicode/stsearch.h>
 
+#define VERSION_HEX(major, minor, patch) \
+  (((major) << 24) | ((minor) << 16) | ((patch) << 8))
+
 #define U_ICU_VERSION_HEX ((U_ICU_VERSION_MAJOR_NUM << 24) +    \
                            (U_ICU_VERSION_MINOR_NUM << 16) +    \
                            (U_ICU_VERSION_PATCHLEVEL_NUM << 8))
 
=== modified file 'dateformat.cpp'
--- dateformat.cpp	2011-11-13 12:07:46 +0000
+++ dateformat.cpp	2013-07-20 21:08:24 +0000
@@ -609,6 +609,13 @@
             self->object->format(date, _u);
             return PyUnicode_FromUnicodeString(&_u);
         }
+        if (!parseArgs(args, "P", TYPE_ID(Calendar), &calendar))
+        {
+            FieldPosition fp0(0);
+
+            self->object->format(*calendar, _u, fp0);
+            return PyUnicode_FromUnicodeString(&_u);
+        }
         break;
       case 2:
         if (!parseArgs(args, "DP", TYPE_CLASSID(FieldPosition),
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-11-07 23:00:26 +0000
+++ debian/changelog	2013-07-20 21:08:24 +0000
@@ -1,3 +1,40 @@
+pyicu (1.5-2ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.
+  * Added transitional packages python3-pyicu[-dbg] to migrate
+    to python3-icu[-dbg]
+
+ -- B. Clausius <[e-mail]>  Sat, 20 Jul 2013 21:40:05 +0200
+
+pyicu (1.5-2) unstable; urgency=low
+
+  * Rename docs.py to icu_docs.py instead of removing it
+    as it's used in icu (closes: #714048)
+
+ -- Piotr Ożarowski <[e-mail]>  Tue, 25 Jun 2013 19:22:34 +0200
+
+pyicu (1.5-1) unstable; urgency=low
+
+  * Team upload.
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Colin Watson ]
+  * Add Python 3 packages (closes: #671361).
+  * Drop manual cleaning of python-pyicu-dbg, since dh_python2 handles this.
+
+  [ Piotr Ożarowski ]
+  * New upstream release
+  * Convert patches from deprecated dpatch to quilt
+  * Debian source package format changed to 3.0 (quilt)
+  * Add fix_typo_in_deprecation_warning patch (closes: #589031)
+  * Remove docs.py file from binary packages (closes: #603717)
+  * Standards-Version bumped to 3.9.4:
+    - build-arch and build-indep targets added in debian/rules
+
+ -- Piotr Ożarowski <[e-mail]>  Mon, 24 Jun 2013 22:20:56 +0200
+
 pyicu (1.4-1ubuntu3) raring; urgency=low
 
   * Rebuild to drop python3.2 provides.
 
=== modified file 'debian/control'
--- debian/control	2012-05-15 15:38:16 +0000
+++ debian/control	2013-07-20 21:08:24 +0000
@@ -4,12 +4,14 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: Bernd Zeimetz <[e-mail]>
-Build-Depends: dpatch, debhelper (>= 5.0.37.3), python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~), python3-all-dev, python3-all-dbg, libicu-dev
+Build-Depends: debhelper (>= 5.0.37.3), python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~), python3-all-dev, python3-all-dbg, libicu-dev,
+# uncoment below line to run test_LayoutEngine at build time (once all Python versions will be supported by these packages)
+# fonttools, python-numpy-dbg, python3-numpy-dbg
 Build-Conflicts: python-pyicu
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyicu/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyicu/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyicu/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyicu/trunk/
 Homepage: http://pyicu.osafoundation.org/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 
 Package: python-pyicu
 Architecture: any
@@ -33,7 +35,7 @@
  .
  This package contains the extension built for the Python debug interpreter.
 
-Package: python3-pyicu
+Package: python3-icu
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
 Provides: ${python3:Provides}
@@ -42,11 +44,11 @@
  Unicode and locale support. This package provides an extension for
  Python 3 which wraps the ICU C++ API.
 
-Package: python3-pyicu-dbg
+Package: python3-icu-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-pyicu (= ${binary:Version}), python3-dbg
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-icu (= ${binary:Version}), python3-dbg
 Provides: ${python3:Provides}
 Description: Python 3 extension wrapping the ICU C++ API (debug extension)
  ICU is a C++ and C library that provides robust and full-featured
@@ -55,3 +57,20 @@
  .
  This package contains the extension built for the Python 3 debug
  interpreter.
+
+Package: python3-pyicu
+Section: oldlibs
+Architecture: any
+Depends: python3-icu (= ${binary:Version})
+Description: dummy transitional package for PyICU Python 3 extension
+ This is a transitional package to migrate to python3-icu.
+ Once no package depends on it, you may safely remove it.
+
+Package: python3-pyicu-dbg
+Section: oldlibs
+Architecture: any
+Priority: extra
+Depends: python3-icu-dbg (= ${binary:Version})
+Description: dummy transitional package for PyICU Python 3 debug extension
+ This is a transitional package to migrate to python3-icu-dbg.
+ Once no package depends on it, you may safely remove it.
 
=== removed file 'debian/patches/00dpatch.conf'
--- debian/patches/00dpatch.conf	2007-12-06 22:45:38 +0000
+++ debian/patches/00dpatch.conf	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs
 
=== removed file 'debian/patches/00list'
--- debian/patches/00list	2012-06-21 11:32:38 +0000
+++ debian/patches/00list	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-no-setuptools-please
-platform-definitions-fix
 
=== added file 'debian/patches/fix_typo_in_deprecation_warning.patch'
--- debian/patches/fix_typo_in_deprecation_warning.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_typo_in_deprecation_warning.patch	2013-07-20 21:08:24 +0000
@@ -0,0 +1,13 @@
+Index: PyICU-1.5/PyICU.py
+===================================================================
+--- PyICU-1.5.orig/PyICU.py
++++ PyICU-1.5/PyICU.py
+@@ -23,7 +23,7 @@
+ 
+ import warnings as _warnings
+ 
+-_warnings.warn("Module 'PyICU' is deprecated, import 'icu' instead'",
++_warnings.warn("Module 'PyICU' is deprecated, import 'icu' instead",
+                category=DeprecationWarning, stacklevel=2)
+ 
+ from icu import *
 
=== added file 'debian/patches/no-setuptools-please.diff'
--- debian/patches/no-setuptools-please.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/no-setuptools-please.diff	2013-07-20 21:08:24 +0000
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-setuptools-please.dpatch by Bernd Zeimetz <[e-mail]>
+##
+## DP: As usual - do not build with setuptools.
+
+@DPATCH@
+Index: PyICU-1.5/setup.py
+===================================================================
+--- PyICU-1.5.orig/setup.py
++++ PyICU-1.5/setup.py
+@@ -1,10 +1,7 @@
+ 
+ import os, sys
+ 
+-try:
+-    from setuptools import setup, Extension
+-except ImportError:
+-    from distutils.core import setup, Extension
++from distutils.core import setup, Extension
+ 
+ 
+ VERSION = '1.5'
 
=== removed file 'debian/patches/no-setuptools-please.dpatch'
--- debian/patches/no-setuptools-please.dpatch	2007-12-06 22:45:38 +0000
+++ debian/patches/no-setuptools-please.dpatch	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no-setuptools-please.dpatch by Bernd Zeimetz <[e-mail]>
-##
-## DP: As usual - do not build with setuptools.
-
-@DPATCH@
-diff -urNad pyicu~/setup.py pyicu/setup.py
---- pyicu~/setup.py	2007-11-28 19:37:57.000000000 +0100
-+++ pyicu/setup.py	2007-12-05 14:21:57.000000000 +0100
-@@ -1,10 +1,7 @@
- 
- import os, sys
- 
--try:
--    from setuptools import setup, Extension
--except ImportError:
--    from distutils.core import setup, Extension
-+from distutils.core import setup, Extension
- 
- 
- VERSION = '0.8'
 
=== added file 'debian/patches/platform-definitions-fix.diff'
--- debian/patches/platform-definitions-fix.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/platform-definitions-fix.diff	2013-07-20 21:08:24 +0000
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## platform-definitions-fix.dpatch by Jakub Wilk <[e-mail]>
+##
+## DP: Fixing FTBFS due to new platform definitions. Setup.py doesn't need to
+## DP: take care of them in our case.
+
+@DPATCH@
+Index: PyICU-1.5/setup.py
+===================================================================
+--- PyICU-1.5.orig/setup.py
++++ PyICU-1.5/setup.py
+@@ -48,7 +48,7 @@ LIBRARIES = {
+ }
+ 
+ platform = sys.platform
+-if platform.startswith('linux'):
++if platform.startswith('linux') or platform.startswith('gnu'):
+     platform = 'linux'
+ 
+ if 'PYICU_INCLUDES' in os.environ:
 
=== removed file 'debian/patches/platform-definitions-fix.dpatch'
--- debian/patches/platform-definitions-fix.dpatch	2012-05-10 22:59:17 +0000
+++ debian/patches/platform-definitions-fix.dpatch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## platform-definitions-fix.dpatch by Jakub Wilk <[e-mail]>
-##
-## DP: Fixing FTBFS due to new platform definitions. Setup.py doesn't need to
-## DP: take care of them in our case.
-
-@DPATCH@
---- pyicu-0.8.1/setup.py
-+++ pyicu-0.8.1+kbsd/setup.py
-@@ -42,7 +42,7 @@
- }
- 
- platform = sys.platform
--if platform.startswith('linux'):
-+if platform.startswith('linux') or platform.startswith('gnu'):
-     platform = 'linux'
- 
- if 'PYICU_INCLUDES' in os.environ:
 
=== added file 'debian/patches/rename_docs_module.patch'
--- debian/patches/rename_docs_module.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/rename_docs_module.patch	2013-07-20 21:08:24 +0000
@@ -0,0 +1,10 @@
+Index: PyICU-1.5/icu.py
+===================================================================
+--- PyICU-1.5.orig/icu.py
++++ PyICU-1.5/icu.py
+@@ -34,4 +34,4 @@ class ICUError(Exception):
+ class InvalidArgsError(Exception):
+     pass
+ 
+-from docs import *
++from icu_docs import *
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-07-20 21:08:24 +0000
@@ -0,0 +1,4 @@
+no-setuptools-please.diff
+platform-definitions-fix.diff
+fix_typo_in_deprecation_warning.patch
+rename_docs_module.patch
 
=== modified file 'debian/rules'
--- debian/rules	2012-05-15 15:38:16 +0000
+++ debian/rules	2013-07-20 21:08:24 +0000
@@ -4,44 +4,42 @@
 #export DH_VERBOSE=1
 
 PKGNAME:=python-pyicu
-PKG3NAME=python3-pyicu
+PKG3NAME=python3-icu
 PYVERS:=$(shell pyversions -vr)
 PY3VERS:=$(shell py3versions -vr)
 
 -include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
-  py_sitename = site-packages
-  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-  py_sitename_sh = $(py_sitename)
-  py_libdir_sh = $(py_libdir)
-endif
-
-
-include /usr/share/dpatch/dpatch.make
-
-build: patch build-stamp
+
+
+build: build-arch
+build-indep:
+# We have nothing to do by default.
+build-arch: build-stamp
 build-stamp:
 	dh_testdir
-
+	
 	# setup.py modifies test source files when building for Python 3, so
 	# build out of tree.
-	rm -rf build-py2 build-py3
-	mkdir -p build-py2 build-py3
-	cp -a $(filter-out build-py2 build-py3 debian,$(wildcard *)) build-py2/
-	cp -a $(filter-out build-py2 build-py3 debian,$(wildcard *)) build-py3/
-
+	rm -rf build/py2 build/py3
+	mkdir -p build/py2 build/py3
+	cp -a $(filter-out build/py2 build/py3 debian,$(wildcard *)) build/py2/
+	cp -a $(filter-out build/py2 build/py3 debian,$(wildcard *)) build/py3/
+	
 	set -e; \
 	for py in $(PYVERS) $(PY3VERS); do  \
-	    (cd build-py$${py%%.*}; \
+	    (cd build/py$${py%%.*}; \
 	    python$$py setup.py build; \
 	    python$$py-dbg setup.py build); \
 	done
+	set -e; \
+	for file in `find $(CURDIR)/build -type f -name docs.py`; do \
+	  mv "$$file" "`dirname $$file`/icu_docs.py"; done
 
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	set -ex ;\
 	for test in `ls test/*.py`; do \
 	  for py in $(PYVERS) $(PY3VERS); do  \
-	    (cd build-py$${py%%.*}; \
+	    (cd build/py$${py%%.*}; \
 	    PYTHONPATH=`ls -d $$(pwd)/build/lib.*-$$py` \
 	      python$$py $$test ;\
 	    PYTHONPATH=`ls -d $$(pwd)/build/lib_d.*-$$py || ls -d $$(pwd)/build/lib.*-$$py-pydebug` \
@@ -52,14 +50,13 @@
 
 	touch $@
 
-clean: clean-patched unpatch
-clean-patched: patch-stamp
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f install-stamp build-stamp
 	find . -name "*.pyc" -print0 | xargs -0 rm -f
 	find . -name __pycache__ -print0 | xargs -0 rm -rf
-	rm -rf build-py2 build-py3
+	rm -rf build
 	dh_clean 
 
 install: install-stamp
@@ -70,24 +67,25 @@
 	dh_installdirs
 	set -e; \
 	for py in $(PYVERS); do  \
-	    (cd build-py2; \
+	    (cd build/py2; \
 	    python$$py setup.py install --root=$(CURDIR)/debian/$(PKGNAME) --prefix=/usr $(py_setup_install_args) ;\
 	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/$(PKGNAME)-dbg --prefix=/usr $(py_setup_install_args)) ;\
 	done
+	set -e; \
 	for py in $(PY3VERS); do  \
-	    (cd build-py3; \
+	    (cd build/py3; \
 	    python$$py setup.py install --root=$(CURDIR)/debian/$(PKG3NAME) --prefix=/usr $(py_setup_install_args) ;\
 	    python$$py-dbg setup.py install --root=$(CURDIR)/debian/$(PKG3NAME)-dbg --prefix=/usr $(py_setup_install_args)) ;\
 	done
-
+	
 	dh_installdocs
 	dh_installexamples
 	touch install-stamp
 
-binary-indep: build install
+binary-indep: build-indep install
 # We have nothing to do by default.
 
-binary-arch: build install
+binary-arch: build-arch install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGES
@@ -108,6 +106,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install \
-        clean-patched patch unpatch
-
+.PHONY: build clean binary-indep binary-arch binary install
 
=== modified file 'debian/source/format'
--- debian/source/format	2010-06-22 20:59:32 +0000
+++ debian/source/format	2013-07-20 21:08:24 +0000
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)
 
=== modified file 'format.cpp'
--- format.cpp	2011-11-13 12:07:46 +0000
+++ format.cpp	2013-07-20 21:08:24 +0000
@@ -971,7 +971,7 @@
     Formattable *f;
     UnicodeString *u, _u;
     FieldPosition *fp, _fp;
-    int len;
+    int len, u_len;
 
     switch (PyTuple_Size(args)) {
       case 1:
@@ -988,6 +988,7 @@
             return PyUnicode_FromUnicodeString(&_u);
         }
         break;
+
       case 2:
         if (!parseArgs(args, "RP",
                        TYPE_CLASSID(Formattable),
@@ -1003,7 +1004,6 @@
                 
             return PyUnicode_FromUnicodeString(&_u);
         }
-        break;
         if (!parseArgs(args, "RU", TYPE_CLASSID(Formattable),
                        &f, &len, TYPE_CLASSID(Formattable),
                        toFormattableArray, &u))
@@ -1016,9 +1016,27 @@
 
             Py_RETURN_ARG(args, 1);
         }
+#if U_ICU_VERSION_HEX >= VERSION_HEX(4, 0, 0)
+        if (!parseArgs(args, "TR",
+                       TYPE_CLASSID(Formattable),
+                       &u, &u_len,
+                       &f, &len, TYPE_CLASSID(Formattable), toFormattableArray))
+        {
+            STATUS_CALL(
+                {
+                    self->object->format(u, f, len < u_len ? len : u_len,
+                                         _u, status);
+                    delete[] u;
+                    delete[] f;
+                });
+
+            return PyUnicode_FromUnicodeString(&_u);
+        }
+#endif
         break;
+
       case 3:
-        if (!parseArgs(args, "RUP",
+       if (!parseArgs(args, "RUP",
                        TYPE_CLASSID(Formattable),
                        TYPE_CLASSID(FieldPosition),
                        &f, &len, TYPE_CLASSID(Formattable),
 
=== modified file 'layoutengine.cpp'
--- layoutengine.cpp	2012-05-10 22:59:17 +0000
+++ layoutengine.cpp	2013-07-20 21:08:24 +0000
@@ -218,6 +218,16 @@
         return 0;
     }
 
+    virtual LEGlyphID mapCharToGlyph(LEUnicode32 u,
+                                     const LECharMapper *mapper) const {
+      return LEFontInstance::mapCharToGlyph(u, mapper);
+    }
+
+    virtual LEGlyphID mapCharToGlyph(LEUnicode32 u, const LECharMapper *mapper,
+                                     le_bool filterZeroWidth) const {
+      return LEFontInstance::mapCharToGlyph(u, mapper, filterZeroWidth);
+    }
+
     virtual void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const
     {
         PyObject *name = PyString_FromString("getGlyphAdvance");
@@ -706,7 +716,7 @@
     INSTALL_ENUM(ScriptCode, "sind", sindScriptCode);
     INSTALL_ENUM(ScriptCode, "wara", waraScriptCode);
 
-#if U_ICU_VERSION_HEX >= 0x31000000
+#if U_ICU_VERSION_HEX >= VERSION_HEX(49, 0, 0)
     INSTALL_ENUM(ScriptCode, "afak", afakScriptCode);
     INSTALL_ENUM(ScriptCode, "jurc", jurcScriptCode);
     INSTALL_ENUM(ScriptCode, "khoj", khojScriptCode);
 
=== modified file 'numberformat.cpp'
--- numberformat.cpp	2012-05-10 22:59:17 +0000
+++ numberformat.cpp	2013-07-20 21:08:24 +0000
@@ -670,7 +670,7 @@
     return PyErr_SetArgsError((PyObject *) self, "parse", args);
 }
 
-#if U_ICU_VERSION_HEX < 0x31000000  /* < 49.0 */
+#if U_ICU_VERSION_HEX < VERSION_HEX(49, 0, 0)
 static PyObject *t_numberformat_parseCurrency(t_numberformat *self,
                                               PyObject *args)
 {
 
=== modified file 'setup.py'
--- setup.py	2012-05-10 22:59:17 +0000
+++ setup.py	2013-07-20 21:08:24 +0000
@@ -7,7 +7,7 @@
     from distutils.core import setup, Extension
 
 
-VERSION = '1.4'
+VERSION = '1.5'
 
 INCLUDES = {
     'darwin': ['/usr/local/include'],
@@ -88,6 +88,18 @@
       test_suite="test",
       url='http://pyicu.osafoundation.org/',
       author='Open Source Applications Foundation',
+      author_email='[e-mail]',
+      classifiers=['Development Status :: 5 - Production/Stable',
+                   'Environment :: Console',
+                   'Intended Audience :: Developers',
+                   'License :: OSI Approved',
+                   'Operating System :: OS Independent',
+                   'Programming Language :: C++',
+                   'Programming Language :: Python',
+                   'Programming Language :: Python :: 2',
+                   'Programming Language :: Python :: 3',
+                   'Topic :: Software Development :: Localization',
+                   'Topic :: Software Development :: Internationalization'],
       ext_modules=[Extension('_icu',
                              [filename for filename in os.listdir(os.curdir)
                               if filename.endswith('.cpp')],
 
=== removed file 'test/._lohit_hi.ttf'
 Binary files test/._lohit_hi.ttf	2011-11-13 12:07:46 +0000 and test/._lohit_hi.ttf	1970-01-01 00:00:00 +0000 differ
=== modified file 'test/test_Collator.py'
--- test/test_Collator.py	2012-05-10 22:59:17 +0000
+++ test/test_Collator.py	2013-07-20 21:08:24 +0000
@@ -65,31 +65,34 @@
 
     def testGetSortKey(self):
 
-        rules = UnicodeString("");
-        collator = RuleBasedCollator(rules)
+        # Do not test sort key byte sequences directly:
+        # They are unstable, that is, likely to change
+        # with every UCA/CLDR/ICU release.
+        # Instead, test that compare() is consistent with
+        # comparing the equivalent sort keys.
+        collator = Collator.createInstance(Locale.getJapanese())
         collator.setAttribute(UCollAttribute.NORMALIZATION_MODE,
                               UCollAttributeValue.ON)
         collator.setAttribute(UCollAttribute.ALTERNATE_HANDLING,
                               UCollAttributeValue.SHIFTED)
         collator.setAttribute(UCollAttribute.STRENGTH,
+                              UCollAttributeValue.TERTIARY)
+
+        # In Japanese, the following characters should be different
+        # only on quaternary level.
+        hira_ge = u'\u3052'  # Hiragana letter Ge
+        kana_ge = u'\u30B2'  # Katakana letter Ge
+        self.assertEqual(0, collator.compare(hira_ge, kana_ge))
+        hira_ge_key = collator.getSortKey(hira_ge)
+        kana_ge_key = collator.getSortKey(kana_ge)
+        self.assertEqual(hira_ge_key, kana_ge_key)
+
+        collator.setAttribute(UCollAttribute.STRENGTH,
                               UCollAttributeValue.QUATERNARY)
-        collator.setAttribute(UCollAttribute.HIRAGANA_QUATERNARY_MODE,
-                              UCollAttributeValue.ON)
-        s = u'\u3052'
-        k = collator.getSortKey(s)
-        if (sys.version_info >= (3,)):
-            byte2int = lambda c: c
-        else:
-            byte2int = ord
-
-        if ICU_VERSION < '4.6':
-            key = "AC300186DC9D019B0501282800"
-        elif ICU_VERSION < '49.0':
-            key = "791C0186DCFD019B05010D0D00"
-        else:
-            key = "791C0186DA95019B05010D0D00"
-
-        self.assertTrue(key == ''.join(['%02X' %(byte2int(c)) for c in k]))
+        self.assertEqual(-1, collator.compare(hira_ge, kana_ge))
+        hira_ge_key = collator.getSortKey(hira_ge)
+        kana_ge_key = collator.getSortKey(kana_ge)
+        self.assertLess(hira_ge_key, kana_ge_key)
 
     def setupCollator(self, collator):
 
 
=== modified file 'test/test_MessageFormat.py'
--- test/test_MessageFormat.py	2011-11-13 12:07:46 +0000
+++ test/test_MessageFormat.py	2013-07-20 21:08:24 +0000
@@ -88,6 +88,23 @@
 
         self.assertTrue(msgFormat.format(args) == u"Kirti est allée à Paris.")
 
+    def testNamedArgs(self):
+
+        if ICU_VERSION >= '4.0':
+            msg = \
+                '{num_emails_to_send, plural, ' \
+                '=0 {unused plural form} ' \
+                '=1 {One email will be sent.} ' \
+                'other {# emails will be sent.}}'
+
+            messageFormat = MessageFormat(msg, Locale("en"))
+
+            name0 = "num_emails_to_send"
+            arg0 = Formattable(5)
+
+            result = messageFormat.format([name0], [arg0])
+            self.assertTrue(result == u'5 emails will be sent.')
+
 
 if __name__ == "__main__":
     main()
 
=== modified file 'transliterator.cpp'
--- transliterator.cpp	2012-05-10 22:59:17 +0000
+++ transliterator.cpp	2013-07-20 21:08:24 +0000
@@ -472,7 +472,7 @@
 {
     UnicodeString *u, _u;
     t_utransposition *utransposition;
-    UBool incremental;
+    int incremental;
 
     if (!parseArgs(args, "UOB", &UTransPositionType, &u, &utransposition,
                    &incremental))