[tryton-debian-vcs] tryton-server branch debian-wheezy-2.6 updated. debian/2.6.12-1-2-gd0e175d

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Aug 26 16:46:11 UTC 2014


The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/2.6.12-1-2-gd0e175d

commit d0e175d4b1c45489800db600eb76bfb99de9fce7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 26 14:37:42 2014 +0200

    Releasing debian version 2.6.13-1.

diff --git a/debian/changelog b/debian/changelog
index bf5c0bb..b93c95c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (2.6.13-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.13.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 26 Aug 2014 14:37:41 +0200
+
 tryton-server (2.6.12-1) unstable; urgency=medium
 
   * Merging upstream version 2.6.12.
commit 24f0902bf0dd3ff3e71cc799aacb167f5a9574a1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 26 14:37:39 2014 +0200

    Merging upstream version 2.6.13.

diff --git a/CHANGELOG b/CHANGELOG
index e543ab0..5f841fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.13 - 2014-08-03
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.12 - 2014-07-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index e3a0357..d45e659 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.12
+Version: 2.6.13
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index e3a0357..d45e659 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.12
+Version: 2.6.13
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/protocols/xmlrpc.py b/trytond/protocols/xmlrpc.py
index 9fe79c3..d776e66 100644
--- a/trytond/protocols/xmlrpc.py
+++ b/trytond/protocols/xmlrpc.py
@@ -55,7 +55,7 @@ def dump_time(self, value, write):
 
 xmlrpclib.Marshaller.dispatch[Decimal] = dump_decimal
 xmlrpclib.Marshaller.dispatch[type(None)] = \
-        lambda self, value, write: self.dump_bool(bool(value), write)
+        lambda self, value, write: write("<value><nil/></value>")
 xmlrpclib.Marshaller.dispatch[datetime.date] = dump_date
 xmlrpclib.Marshaller.dispatch[datetime.time] = dump_time
 xmlrpclib.Marshaller.dispatch[buffer] = dump_buffer
diff --git a/trytond/version.py b/trytond/version.py
index 5781d75..516733f 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "2.6.12"
+VERSION = "2.6.13"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server



More information about the tryton-debian-vcs mailing list