[tryton-debian-vcs] tryton-proteus branch debian-wheezy-2.6 created. 7e4953b25ee01529cdb5574a460cd889689d8b0c

[Mathias Behrle]

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-proteus.git;a=commitdiff;h=7e4953b25ee01529cdb5574a460cd889689d8b0c
commit 7e4953b25ee01529cdb5574a460cd889689d8b0c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 12:07:21 2013 +0200

    Releasing debian version 2.6.2-1.

diff --git a/debian/changelog b/debian/changelog
index 677c74a..df7a5fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-proteus (2.6.2-1) experimental; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704409).
+  * Versioning watch file for Tryton branch 2.6.
+  * Adding README.Debian to point out version dependency.
+  * Merging upstream version 2.6.2.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 04 May 2013 02:39:18 +0200
+
 tryton-proteus (2.6.1-2) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit 4c2fa2521213266c28e5276cf502fc3f729f9092
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:14:01 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 6d5c31e..1d0f2ad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2010-2012 Cédric Krier
-           2010-2012 B2CK SPRL
+Copyright: 2010-2013 Cédric Krier
+           2010-2013 B2CK SPRL
 License: LGPL-3+
 
 Files: debian/*
commit 24ea4efca1c79fc415df2f14e8ebbf99f6488519
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:12:40 2013 +0200

    Merging upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index c9af7ca..baf80b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2012-11-05
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index e792a2c..7e8c156 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2012 Cédric Krier.
-Copyright (C) 2010-2012 B2CK SPRL.
+Copyright (C) 2010-2013 Cédric Krier.
+Copyright (C) 2010-2013 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index d817b42..0fe3cf7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 2.6.1
+Version: 2.6.2
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index d817b42..0fe3cf7 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 2.6.1
+Version: 2.6.2
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/proteus/__init__.py b/proteus/__init__.py
index f2ec0cd..beac2fc 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
 '''
 A library to access Tryton's models like a client.
 '''
-__version__ = "2.6.1"
+__version__ = "2.6.2"
 __all__ = ['Model', 'Wizard']
 import sys
 try:
@@ -586,6 +586,9 @@ class Model(object):
     @classmethod
     def get(cls, name, config=None):
         'Get a class for the named Model'
+        if isinstance(name, unicode):
+            name = name.encode('utf-8')
+
         class Spam(Model):
             __metaclass__ = MetaModelFactory(name, config=config)()
         return Spam
@@ -879,7 +882,7 @@ class Wizard(object):
         assert state in self.states
 
         self.state = state
-        while self.state != 'end':
+        while self.state != self.end_state:
             ctx = self._context.copy()
             ctx.update(self._config.context)
             if self.models:
commit 268488a495f8b52aa371e23d40c0653c12f5d67f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 12:39:31 2013 +0200

    Adding README.Debian to point out version dependency.

diff --git a/debian/tryton-proteus.README.Debian b/debian/tryton-proteus.README.Debian
new file mode 100644
index 0000000..d173d13
--- /dev/null
+++ b/debian/tryton-proteus.README.Debian
@@ -0,0 +1,7 @@
+tryton-proteus for Debian
+--------------------------
+
+Note: The Tryton client library proteus can only connect to Tryton servers
+with the same major version (e.g. the first two numbers of the version string).
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 27 Apr 2013 12:00:00 +0200
commit 9e80e03162c343e4cba1e9d57a2ae1d43755f473
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:52 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index a0762c7..e68f74c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*proteus-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*proteus-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-proteus