[tryton-debian-vcs] tryton-client branch upstream-4.2 updated. upstream/4.2.8-1-gf31834e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 13 10:34:47 UTC 2017
The following commit has been merged in the upstream-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=upstream/4.2.8-1-gf31834e
commit f31834ecddd6fb7eea6bea1dee663813fa2d3a12
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 19:05:13 2017 +0100
Adding upstream version 4.2.9.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index cff5167..5d2fc4a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.9 - 2017-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.8 - 2017-11-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index b38c68a..2e308c6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.2.8
+Version: 4.2.9
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/bin/tryton b/bin/tryton
index 02f319d..b74168b 100755
--- a/bin/tryton
+++ b/bin/tryton
@@ -23,10 +23,19 @@ if hasattr(sys, 'frozen'):
etc, 'gtk-2.0', 'gdk-pixbuf.loaders')
os.environ['GTK_IM_MODULE_FILE'] = os.path.join(
etc, 'gtk-2.0', 'gtk.immodules')
- os.environ.setdefault('SSL_CERT_FILE',
- os.path.join(etc, 'ssl', 'cert.pem'))
- os.environ.setdefault('SSL_CERT_DIR',
- os.path.join(etc, 'ssl', 'certs'))
+ if sys.platform == 'win32':
+ # cx_freeze >= 5 put python modules under lib directory
+ sys.path.append(os.path.join(prefix, 'lib'))
+ os.environ.setdefault('SSL_CERT_FILE',
+ os.path.join(etc, 'ssl', 'cert.pem'))
+ os.environ.setdefault('SSL_CERT_DIR',
+ os.path.join(etc, 'ssl', 'certs'))
+
+ # On first launch the MacOSX app launcher may append an extra unique
+ # argument starting with -psn_. This must be filtered to not crash the
+ # option parser.
+ if sys.platform == 'darwin':
+ sys.argv = [a for a in sys.argv if not a.startswith('-psn_')]
# Disable dbusmenu to show second menu in tabs
diff --git a/darwin/gtk-2.0/gtk.immodules b/darwin/gtk-2.0/gtk.immodules
index e010446..a37ca90 100644
--- a/darwin/gtk-2.0/gtk.immodules
+++ b/darwin/gtk-2.0/gtk.immodules
@@ -2,7 +2,7 @@
# Automatically generated file, do not edit
# Created by gtk-query-immodules-2.0 from gtk+-2.24.30
#
-# ModulesPath = /Users/ced/.gtk-2.0/2.10.0/x86_64-apple-darwin15.5.0/immodules:/Users/ced/.gtk-2.0/2.10.0/immodules:/Users/ced/.gtk-2.0/x86_64-apple-darwin15.5.0/immodules:/Users/ced/.gtk-2.0/immodules:@executable_path/lib/gtk-2.0/2.10.0/x86_64-apple-darwin15.5.0/immodules:/Users/ced/gtk/inst/lib/gtk-2.0/2.10.0/immodules:/Users/ced/gtk/inst/lib/gtk-2.0/x86_64-apple-darwin15.5.0/immodules:/Users/ced/gtk/inst/lib/gtk-2.0/immodules
+# ModulesPath = @executable_path/lib/gtk-2.0/immodules
#
"@executable_path/lib/gtk-2.0/2.10.0/immodules/im-am-et.so"
"am_et" "Amharic (EZ+)" "gtk20" "@executable_path/share/locale" "am"
diff --git a/make-darwin-installer.sh b/make-darwin-installer.sh
index ee844f9..339d633 100644
--- a/make-darwin-installer.sh
+++ b/make-darwin-installer.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-
+set -e
version=`python setup.py --version`
python setup-freeze.py bdist_mac
rm -rf dist
diff --git a/make-win32-installer.sh b/make-win32-installer.sh
index 2c48f1c..56ba1ea 100644
--- a/make-win32-installer.sh
+++ b/make-win32-installer.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-
+set -e
version=`python setup.py --version`
python setup-freeze.py install_exe -d dist
makensis -DVERSION=${version} setup.nsi
diff --git a/setup-freeze.py b/setup-freeze.py
index efcbc73..27ba40d 100644
--- a/setup-freeze.py
+++ b/setup-freeze.py
@@ -1,5 +1,6 @@
import os
import sys
+import user
from subprocess import Popen, PIPE
from cx_Freeze import setup, Executable
@@ -52,12 +53,10 @@ setup(name='tryton',
version=version,
options={
'build_exe': {
- 'compressed': False,
+ 'no_compress': True,
'include_files': include_files,
'silent': True,
'packages': ['gtk'],
- 'icon': os.path.join(
- 'tryton', 'data', 'pixmaps', 'tryton', 'tryton.ico'),
'include_msvcr': True,
},
'bdist_mac': {
@@ -68,4 +67,7 @@ setup(name='tryton',
},
executables=[Executable(
'bin/tryton',
- base='Win32GUI' if sys.platform == 'win32' else None)])
+ base='Win32GUI' if sys.platform == 'win32' else None,
+ icon=os.path.join(
+ 'tryton', 'data', 'pixmaps', 'tryton', 'tryton.ico'),
+ )])
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index b38c68a..2e308c6 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.2.8
+Version: 4.2.9
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 2ca7889..5db0558 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__ = "4.2.8"
+__version__ = "4.2.9"
diff --git a/tryton/config.py b/tryton/config.py
index d0c393e..51b7f21 100644
--- a/tryton/config.py
+++ b/tryton/config.py
@@ -169,7 +169,7 @@ class ConfigManager(object):
CONFIG = ConfigManager()
CURRENT_DIR = os.path.dirname(__file__)
if hasattr(sys, 'frozen'):
- CURRENT_DIR = sys.executable
+ CURRENT_DIR = os.path.dirname(sys.executable)
if not isinstance(CURRENT_DIR, unicode):
CURRENT_DIR = unicode(CURRENT_DIR, sys.getfilesystemencoding())
diff --git a/tryton/data/locale/bg/LC_MESSAGES/tryton.mo b/tryton/data/locale/bg/LC_MESSAGES/tryton.mo
index 5fadcd0..cc59f5f 100644
Binary files a/tryton/data/locale/bg/LC_MESSAGES/tryton.mo and b/tryton/data/locale/bg/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ca/LC_MESSAGES/tryton.mo b/tryton/data/locale/ca/LC_MESSAGES/tryton.mo
index 8f9ba5d..ab4983a 100644
Binary files a/tryton/data/locale/ca/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ca/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/cs/LC_MESSAGES/tryton.mo b/tryton/data/locale/cs/LC_MESSAGES/tryton.mo
index ed46a83..73b7019 100644
Binary files a/tryton/data/locale/cs/LC_MESSAGES/tryton.mo and b/tryton/data/locale/cs/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/de/LC_MESSAGES/tryton.mo b/tryton/data/locale/de/LC_MESSAGES/tryton.mo
index dff96ba..3fce035 100644
Binary files a/tryton/data/locale/de/LC_MESSAGES/tryton.mo and b/tryton/data/locale/de/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es/LC_MESSAGES/tryton.mo b/tryton/data/locale/es/LC_MESSAGES/tryton.mo
index 02d3b18..782fff0 100644
Binary files a/tryton/data/locale/es/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo b/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo
index 775d2a0..a6dbca5 100644
Binary files a/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/fr/LC_MESSAGES/tryton.mo b/tryton/data/locale/fr/LC_MESSAGES/tryton.mo
index 4e7b650..d1e61d4 100644
Binary files a/tryton/data/locale/fr/LC_MESSAGES/tryton.mo and b/tryton/data/locale/fr/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo b/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo
index d3733dc..bbffda0 100644
Binary files a/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo and b/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo b/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo
index 8fe0328..fd11b40 100644
Binary files a/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo and b/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo b/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo
index f6a7891..bc5accc 100644
Binary files a/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/lo/LC_MESSAGES/tryton.mo b/tryton/data/locale/lo/LC_MESSAGES/tryton.mo
index 9364be2..0e21f28 100644
Binary files a/tryton/data/locale/lo/LC_MESSAGES/tryton.mo and b/tryton/data/locale/lo/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/lt/LC_MESSAGES/tryton.mo b/tryton/data/locale/lt/LC_MESSAGES/tryton.mo
index 7be1205..155732c 100644
Binary files a/tryton/data/locale/lt/LC_MESSAGES/tryton.mo and b/tryton/data/locale/lt/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/nl/LC_MESSAGES/tryton.mo b/tryton/data/locale/nl/LC_MESSAGES/tryton.mo
index d3052e4..034f661 100644
Binary files a/tryton/data/locale/nl/LC_MESSAGES/tryton.mo and b/tryton/data/locale/nl/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/pl/LC_MESSAGES/tryton.mo b/tryton/data/locale/pl/LC_MESSAGES/tryton.mo
index de9c8c2..87fd1c6 100644
Binary files a/tryton/data/locale/pl/LC_MESSAGES/tryton.mo and b/tryton/data/locale/pl/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo b/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo
index 5e89d21..ac41d27 100644
Binary files a/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo and b/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ru/LC_MESSAGES/tryton.mo b/tryton/data/locale/ru/LC_MESSAGES/tryton.mo
index 69d0836..9f091c7 100644
Binary files a/tryton/data/locale/ru/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ru/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/sl/LC_MESSAGES/tryton.mo b/tryton/data/locale/sl/LC_MESSAGES/tryton.mo
index ff80845..d3f7c73 100644
Binary files a/tryton/data/locale/sl/LC_MESSAGES/tryton.mo and b/tryton/data/locale/sl/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo b/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo
index ee6c03d..b3807fb 100644
Binary files a/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo and b/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/gui/window/view_form/view/form_gtk/widget.py b/tryton/gui/window/view_form/view/form_gtk/widget.py
index 70c479b..d6291e1 100644
--- a/tryton/gui/window/view_form/view/form_gtk/widget.py
+++ b/tryton/gui/window/view_form/view/form_gtk/widget.py
@@ -171,7 +171,7 @@ class TranslateDialog(NoModal):
label.set_mnemonic_widget(widget)
self.widget.translate_widget_set(widget, fuzzy_value)
self.widget.translate_widget_set_readonly(widget, True)
- yopt = None
+ yopt = 0
if self.widget.expand:
yopt = gtk.EXPAND | gtk.FILL
table.attach(widget, 1, 2, i, i + 1, yoptions=yopt)
diff --git a/tryton/gui/window/view_form/view/list.py b/tryton/gui/window/view_form/view/list.py
index 4381034..9059880 100644
--- a/tryton/gui/window/view_form/view/list.py
+++ b/tryton/gui/window/view_form/view/list.py
@@ -828,7 +828,7 @@ class ViewTree(View):
return True
if drop_info:
path, position = drop_info
- check_path = path
+ check_path = tuple(path)
if position in (gtk.TREE_VIEW_DROP_BEFORE,
gtk.TREE_VIEW_DROP_AFTER):
check_path = path[:-1]
diff --git a/win32/gtk-2.0/gdk-pixbuf.loaders b/win32/gtk-2.0/gdk-pixbuf.loaders
index 4d13e1c..15d85d9 100644
--- a/win32/gtk-2.0/gdk-pixbuf.loaders
+++ b/win32/gtk-2.0/gdk-pixbuf.loaders
@@ -2,7 +2,7 @@
# Automatically generated file, do not edit
# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.35.4
#
-# LoaderDir = C:\msys32\mingw32/lib/gdk-pixbuf-2.0/2.10.0/loaders
+# LoaderDir = lib/gdk-pixbuf-2.0/2.10.0/loaders
#
"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll"
"svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL"
--
tryton-client
More information about the tryton-debian-vcs
mailing list