[tryton-debian-vcs] tryton-client branch debian updated. debian/3.6.0-1-3-gc38cd2f

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed May 20 20:21:12 UTC 2015


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.6.0-1-3-gc38cd2f

commit c38cd2f433df07b18e296051c836a04900ac5487
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed May 20 14:55:29 2015 +0200

    Releasing debian version 3.6.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 33486c6..83a78d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-client (3.6.1-1) unstable; urgency=medium
+
+  * Updating year of debian copyright.
+  * Merging upstream version 3.6.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 20 May 2015 14:55:29 +0200
+
 tryton-client (3.6.0-1) unstable; urgency=medium
 
   * Wrapping and sorting control files (wrap-and-sort -bts).
commit ef3143b5fa02076c6881c22cdcf58b58b24c6222
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed May 20 14:55:28 2015 +0200

    Merging upstream version 3.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index ad67146..347267e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-05-19
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Hide columns containing always the same value
diff --git a/PKG-INFO b/PKG-INFO
index ecfd1fd..eb5c5f6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup-single.nsi b/setup-single.nsi
index 63fc644..360906b 100644
--- a/setup-single.nsi
+++ b/setup-single.nsi
@@ -26,7 +26,6 @@ Section
     File "INSTALL"
     File "LICENSE"
     File "README"
-    File "TODO"
     File "CHANGELOG"
 
     SetOutPath "$PLUGINSDIR\doc"
diff --git a/setup.nsi b/setup.nsi
index 6bfd7f7..a41a27a 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -98,7 +98,6 @@ SectionIn 1 2 RO
     File "INSTALL"
     File "LICENSE"
     File "README"
-    File "TODO"
     File "CHANGELOG"
 
     SetOutPath "$INSTDIR\doc"
diff --git a/setup.py b/setup.py
index 9295544..4d307d2 100644
--- a/setup.py
+++ b/setup.py
@@ -406,7 +406,7 @@ elif sys.platform == 'darwin':
                 Popen(['install_name_tool', '-change', lib, fixed, library]
                     ).wait()
 
-        for file in ('CHANGELOG', 'COPYRIGHT', 'LICENSE', 'README', 'TODO'):
+        for file in ('CHANGELOG', 'COPYRIGHT', 'LICENSE', 'README'):
             shutil.copyfile(os.path.join(os.path.dirname(__file__), file),
                 os.path.join(dist_dir, file + '.txt'))
 
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index ecfd1fd..eb5c5f6 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 61b26b3..7d7e270 100644
--- a/tryton/__init__.py
+++ b/tryton/__init__.py
@@ -1,3 +1,3 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-__version__ = "3.6.0"
+__version__ = "3.6.1"
diff --git a/tryton/gui/window/view_board/action.py b/tryton/gui/window/view_board/action.py
index ecc4bca..23824bf 100644
--- a/tryton/gui/window/view_board/action.py
+++ b/tryton/gui/window/view_board/action.py
@@ -94,7 +94,7 @@ class Action(SignalEvent):
             return
 
         if (self.screen.current_view.view_type == 'tree' and
-                self.screen.current_view.treeview.keyword_open):
+                self.screen.current_view.attributes.get('keyword_open')):
             GenericAction.exec_keyword('tree_open', {
                 'model': self.screen.model_name,
                 'id': self.screen.id_get(),
-- 
tryton-client



More information about the tryton-debian-vcs mailing list