Update to latest release, 3.2.0. Move bin/trytond to

bin/trytond${PYVERSUFFIX} in post-install to support concurrently installed
versions of python. Upstream dropped support for py26. From CHANGELOG:

* Bug fixes (see mercurial logs for details)
* Add restore_history to ModelSQL
* Add history revisions
* Add the multi selection widget
* Add index to one2many's on_change
* Remove auto-refresh on Action Window
* Add support of domain for non-relation field
* Manage microseconds in JSON-RPC and XML-RPC
* Remove Sha field
* Add password widget
* Add Len to PYSON
* Use bcrypt to hash password if possible
* Use a sequence of ids, values to set fields
* Client side actions on button and wizard
* Add depends attribute to data tag
* Add tree_invisible attribute to button in tree view
* Drop support of Python 2.6
* Deprecate on_change, on_change_with, selection_change_with and autocomplete
  field arguments
* Add fields.depends decorator
* Add run-tests
* Validate only modified and dependant fields on model write
* Improve error messages by showing the failing value
* Remove relation field actions:
    - delete_all
    - unlink_all
    - set
* Rename relation field action unlink into remove
* Use a sequence of records, values in write
* set_context of Transaction.set_user is restricted to root
* Add a "copy" action to One2Many and Many2Many's set method
* Force UTC as timezone (migration script available on tryton-tools)
* Add relation_field for many2one

3 files changed, 30 insertions, 15 deletions

diff --git a/devel/py-trytond/Makefile b/devel/py-trytond/Makefile
index 4e6fbe8a5f1..e8f3073848d 100644
--- a/devel/py-trytond/Makefile
+++ b/devel/py-trytond/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2014/04/13 04:47:15 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2014/05/03 13:17:58 rodent Exp $
 
-DISTNAME=	trytond-3.0.4
+DISTNAME=	trytond-3.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	http://downloads.tryton.org/3.0/
+MASTER_SITES=	http://downloads.tryton.org/3.2/
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://www.tryton.org/
@@ -17,8 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml
 
 USE_LANGUAGES=	# none
 
-REPLACE_PYTHON+=	trytond/tests/test_access.py trytond/tests/test_cache.py
-REPLACE_PYTHON+=	trytond/tests/test_copy.py
+REPLACE_PYTHON+=	trytond/tests/run-tests.py trytond/tests/test_access.py REPLACE_PYTHON+=	trytond/tests/test_cache.py trytond/tests/test_copy.py
 REPLACE_PYTHON+=	trytond/tests/test_exportdata.py
 REPLACE_PYTHON+=	trytond/tests/test_fields.py
 REPLACE_PYTHON+=	trytond/tests/test_importdata.py
@@ -33,7 +32,9 @@ REPLACE_PYTHON+=	trytond/tests/test_trigger.py
 REPLACE_PYTHON+=	trytond/tests/test_tryton.py
 
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2 via py-pycha via py-relatorio
+PYTHON_VERSIONS_INCOMPATIBLE=	26 33 # 26: upstream dropped support; 33: py-gtk2 via py-pycha via py-relatorio
+PY_PATCHPLIST=			yes
+PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "options.mk"
 
@@ -41,6 +42,10 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2 via py-pycha via py-relatorio
 DEPENDS+=	${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app
 .endif
 
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/bin/trytond \
+		${DESTDIR}${PREFIX}/bin/trytond${PYVERSSUFFIX}
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-trytond/PLIST b/devel/py-trytond/PLIST
index aed637caa58..989f445e56e 100644
--- a/devel/py-trytond/PLIST
+++ b/devel/py-trytond/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2014/01/31 12:30:50 rodent Exp $
-bin/trytond
+@comment $NetBSD: PLIST,v 1.2 2014/05/03 13:17:58 rodent Exp $
+bin/trytond${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -225,6 +225,7 @@ ${PYSITELIB}/trytond/ir/view/model_field_list.xml
 ${PYSITELIB}/trytond/ir/view/model_form.xml
 ${PYSITELIB}/trytond/ir/view/model_list.xml
 ${PYSITELIB}/trytond/ir/view/model_print_model_graph_start_form.xml
+${PYSITELIB}/trytond/ir/view/module_config_wizard_done_form.xml
 ${PYSITELIB}/trytond/ir/view/module_config_wizard_first_form.xml
 ${PYSITELIB}/trytond/ir/view/module_config_wizard_item_list.xml
 ${PYSITELIB}/trytond/ir/view/module_config_wizard_other_form.xml
@@ -452,6 +453,9 @@ ${PYSITELIB}/trytond/tests/copy_.pyo
 ${PYSITELIB}/trytond/tests/export_data.py
 ${PYSITELIB}/trytond/tests/export_data.pyc
 ${PYSITELIB}/trytond/tests/export_data.pyo
+${PYSITELIB}/trytond/tests/history.py
+${PYSITELIB}/trytond/tests/history.pyc
+${PYSITELIB}/trytond/tests/history.pyo
 ${PYSITELIB}/trytond/tests/import_data.py
 ${PYSITELIB}/trytond/tests/import_data.pyc
 ${PYSITELIB}/trytond/tests/import_data.pyo
@@ -462,6 +466,9 @@ ${PYSITELIB}/trytond/tests/model.pyo
 ${PYSITELIB}/trytond/tests/mptt.py
 ${PYSITELIB}/trytond/tests/mptt.pyc
 ${PYSITELIB}/trytond/tests/mptt.pyo
+${PYSITELIB}/trytond/tests/run-tests.py
+${PYSITELIB}/trytond/tests/run-tests.pyc
+${PYSITELIB}/trytond/tests/run-tests.pyo
 ${PYSITELIB}/trytond/tests/sequence.xml
 ${PYSITELIB}/trytond/tests/test.py
 ${PYSITELIB}/trytond/tests/test.pyc
@@ -481,6 +488,9 @@ ${PYSITELIB}/trytond/tests/test_exportdata.pyo
 ${PYSITELIB}/trytond/tests/test_fields.py
 ${PYSITELIB}/trytond/tests/test_fields.pyc
 ${PYSITELIB}/trytond/tests/test_fields.pyo
+${PYSITELIB}/trytond/tests/test_history.py
+${PYSITELIB}/trytond/tests/test_history.pyc
+${PYSITELIB}/trytond/tests/test_history.pyo
 ${PYSITELIB}/trytond/tests/test_importdata.py
 ${PYSITELIB}/trytond/tests/test_importdata.pyc
 ${PYSITELIB}/trytond/tests/test_importdata.pyo
@@ -514,6 +524,9 @@ ${PYSITELIB}/trytond/tests/test_trigger.pyo
 ${PYSITELIB}/trytond/tests/test_tryton.py
 ${PYSITELIB}/trytond/tests/test_tryton.pyc
 ${PYSITELIB}/trytond/tests/test_tryton.pyo
+${PYSITELIB}/trytond/tests/test_user.py
+${PYSITELIB}/trytond/tests/test_user.pyc
+${PYSITELIB}/trytond/tests/test_user.pyo
 ${PYSITELIB}/trytond/tests/test_wizard.py
 ${PYSITELIB}/trytond/tests/test_wizard.pyc
 ${PYSITELIB}/trytond/tests/test_wizard.pyo
@@ -544,9 +557,6 @@ ${PYSITELIB}/trytond/tools/datetime_strftime.pyo
 ${PYSITELIB}/trytond/tools/misc.py
 ${PYSITELIB}/trytond/tools/misc.pyc
 ${PYSITELIB}/trytond/tools/misc.pyo
-${PYSITELIB}/trytond/tools/ordereddict.py
-${PYSITELIB}/trytond/tools/ordereddict.pyc
-${PYSITELIB}/trytond/tools/ordereddict.pyo
 ${PYSITELIB}/trytond/tools/singleton.py
 ${PYSITELIB}/trytond/tools/singleton.pyc
 ${PYSITELIB}/trytond/tools/singleton.pyo
diff --git a/devel/py-trytond/distinfo b/devel/py-trytond/distinfo
index e81795a2a97..b9316c96d80 100644
--- a/devel/py-trytond/distinfo
+++ b/devel/py-trytond/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/04/13 04:47:15 rodent Exp $
+$NetBSD: distinfo,v 1.3 2014/05/03 13:17:58 rodent Exp $
 
-SHA1 (trytond-3.0.4.tar.gz) = 7c986ddb0ef6c2e977ea987931beef901f07cf70
-RMD160 (trytond-3.0.4.tar.gz) = 4c9ef653a03decb6b2c774da4ab6d01056df229f
-Size (trytond-3.0.4.tar.gz) = 471482 bytes
+SHA1 (trytond-3.2.0.tar.gz) = b1ea43643487e19340e99d114ea0c26223dcd2ae
+RMD160 (trytond-3.2.0.tar.gz) = 4c0c2665c65d8fefe841d8a5b7426dc64aa1d625
+Size (trytond-3.2.0.tar.gz) = 474102 bytes