[tryton-debian-vcs] tryton-modules-country branch debian-wheezy-2.6 updated. debian/2.6.0-3-5-g0f69cef

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Dec 11 18:48:28 UTC 2013


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-modules-country.git;a=commitdiff;h=debian/2.6.0-3-5-g0f69cef

commit 0f69cefe4f087e2bdfcf18f09d3d55b678981875
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 19:47:10 2013 +0100

    Releasing debian version 2.6.1-1.

diff --git a/debian/changelog b/debian/changelog
index 120a860..a18854f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-country (2.6.1-1) unstable; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes:
+    #704379).
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 11 Dec 2013 19:28:56 +0100
+
 tryton-modules-country (2.6.0-3) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit 92f3287e0a4abdeb9d2687194de56aba92300d25
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 19:24:10 2013 +0100

    Merging upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 6d1399c..e5e7c54 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 32ecdf1..6c938ea 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_country
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module with countries
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/country.py b/country.py
index a91a24d..fe07b9d 100644
--- a/country.py
+++ b/country.py
@@ -29,9 +29,9 @@ class Country(ModelSQL, ModelView):
 
     @classmethod
     def search_rec_name(cls, name, clause):
-        if cls.search([('code',) + clause[1:]], limit=1):
-            return [('code',) + clause[1:]]
-        return [(cls._rec_name,) + clause[1:]]
+        if cls.search([('code',) + tuple(clause[1:])], limit=1):
+            return [('code',) + tuple(clause[1:])]
+        return [(cls._rec_name,) + tuple(clause[1:])]
 
     @classmethod
     def create(cls, vals):
@@ -147,9 +147,9 @@ class Subdivision(ModelSQL, ModelView):
 
     @classmethod
     def search_rec_name(cls, name, clause):
-        if cls.search([('code',) + clause[1:]], limit=1):
-            return [('code',) + clause[1:]]
-        return [(cls._rec_name,) + clause[1:]]
+        if cls.search([('code',) + tuple(clause[1:])], limit=1):
+            return [('code',) + tuple(clause[1:])]
+        return [(cls._rec_name,) + tuple(clause[1:])]
 
     @classmethod
     def create(cls, vals):
diff --git a/tryton.cfg b/tryton.cfg
index 164f132..9d690ee 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     res
diff --git a/trytond_country.egg-info/PKG-INFO b/trytond_country.egg-info/PKG-INFO
index f14460b..4c47b51 100644
--- a/trytond_country.egg-info/PKG-INFO
+++ b/trytond_country.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-country
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module with countries
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-country



More information about the tryton-debian-vcs mailing list