[tryton-debian-vcs] tryton-neso branch upstream updated. upstream/3.8.2-1-g16ebed8
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:29:38 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-neso.git;a=commitdiff;h=upstream/3.8.2-1-g16ebed8
commit 16ebed85242aace707e15b310912622b3a900d5a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:25 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 9de7ce1..e2dc6a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,4 @@
-Version 3.8.2 - 2016-01-11
-* Bug fixes (see mercurial logs for details)
-
-Version 3.8.1 - 2015-11-02
+Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
Version 3.8.0 - 2015-11-02
diff --git a/COPYRIGHT b/COPYRIGHT
index 2dd3838..d0896c2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2015 Cédric Krier.
+Copyright (C) 2009-2016 Cédric Krier.
Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009-2015 B2CK SPRL.
+Copyright (C) 2009-2016 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/MANIFEST.in b/MANIFEST.in
index f0f35ac..1b6a459 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,7 @@ include INSTALL
include TODO
include CHANGELOG
include setup.nsi
+include Microsoft.VC90.CRT.manifest
include neso.desktop
include *.nsh
include share/pixmaps/neso/*.svg
diff --git a/Microsoft.VC90.CRT.manifest b/Microsoft.VC90.CRT.manifest
new file mode 100644
index 0000000..633945b
--- /dev/null
+++ b/Microsoft.VC90.CRT.manifest
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity
+ version="5.0.0.0"
+ processorArchitecture="x86"
+ name="Tryton"
+ type="win32"
+ />
+ <description>Neso</description>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false">
+ </requestedExecutionLevel>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.VC90.CRT"
+ version="9.0.21022.8"
+ processorArchitecture="x86"
+ publicKeyToken="1fc8b3b9a1e18e3b">
+ </assemblyIdentity>
+ </dependentAssembly>
+ </dependency>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="X86"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+ </dependency>
+</assembly>
diff --git a/PKG-INFO b/PKG-INFO
index a20b737..272b20b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: neso
-Version: 3.8.2
+Version: 4.0.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: neso
====
@@ -62,6 +62,7 @@ Classifier: Intended Audience :: End Users/Desktop
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index a20b737..272b20b 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: neso
-Version: 3.8.2
+Version: 4.0.0
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: neso
====
@@ -62,6 +62,7 @@ Classifier: Intended Audience :: End Users/Desktop
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/neso.egg-info/SOURCES.txt b/neso.egg-info/SOURCES.txt
index e141fe2..f114eab 100644
--- a/neso.egg-info/SOURCES.txt
+++ b/neso.egg-info/SOURCES.txt
@@ -3,6 +3,7 @@ COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
+Microsoft.VC90.CRT.manifest
README
catalan.nsh
english.nsh
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index c83a19a..504bf24 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+tryton >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
diff --git a/neso/__init__.py b/neso/__init__.py
index a2dc5b3..757630d 100644
--- a/neso/__init__.py
+++ b/neso/__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.8.2"
+__version__ = "4.0.0"
diff --git a/setup.nsi b/setup.nsi
index 0c8265d..b81c164 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -55,7 +55,7 @@ Var STARTMENU_FOLDER
;Languages
-!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "English" ; First is the default
!include "english.nsh"
!insertmacro MUI_LANGUAGE "French"
!include "french.nsh"
diff --git a/setup.py b/setup.py
index c157704..9db42e4 100644
--- a/setup.py
+++ b/setup.py
@@ -13,33 +13,6 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
args = {}
-
-languages = (
- 'bg_BG',
- 'ca_ES',
- 'cs_CZ',
- 'de_DE',
- 'es_AR',
- 'es_CO',
- 'es_EC',
- 'es_ES',
- 'es_MX',
- 'fr_FR',
- 'it_IT',
- 'ja_JP',
- 'lt_LT',
- 'nl_NL',
- 'pt_BR',
- 'ru_RU',
- 'sl_SI',
- )
-
-
-def all_languages():
- for lang in languages:
- yield lang
- yield lang.split('_')[0]
-
data_files = []
if os.name == 'nt':
@@ -184,6 +157,7 @@ dist = setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -337,12 +311,10 @@ if os.name == 'nt':
if os.path.isfile(file):
shutil.copy(file, dist_dir)
- for lang in all_languages():
- if os.path.isdir(os.path.join(dist_dir, 'share', 'locale', lang)):
- shutil.rmtree(os.path.join(dist_dir, 'share', 'locale', lang))
- if os.path.isdir(os.path.join(gtk_dir, 'share', 'locale', lang)):
- shutil.copytree(os.path.join(gtk_dir, 'share', 'locale', lang),
- os.path.join(dist_dir, 'share', 'locale', lang))
+ if os.path.isdir(os.path.join(dist_dir, 'share', 'locale')):
+ shutil.rmtree(os.path.join(dist_dir, 'share', 'locale'))
+ shutil.copytree(os.path.join(gtk_dir, 'share', 'locale'),
+ os.path.join(dist_dir, 'share', 'locale'))
if os.path.isdir(os.path.join(dist_dir, 'share', 'themes',
'MS-Windows')):
@@ -453,14 +425,10 @@ elif sys.platform == 'darwin':
shutil.copy(os.path.join(gtk_dir, 'share', 'themes', 'Clearlooks',
'gtk-2.0', 'gtkrc'), os.path.join(resources_dir, 'gtkrc'))
- for lang in all_languages():
- if os.path.isdir(os.path.join(resources_dir, 'share', 'locale',
- lang)):
- shutil.rmtree(os.path.join(resources_dir, 'share', 'locale',
- lang))
- if os.path.isdir(os.path.join(gtk_dir, 'share', 'locale', lang)):
- shutil.copytree(os.path.join(gtk_dir, 'share', 'locale', lang),
- os.path.join(resources_dir, 'share', 'locale', lang))
+ if os.path.isdir(os.path.join(resources_dir, 'share', 'locale')):
+ shutil.rmtree(os.path.join(resources_dir, 'share', 'locale'))
+ shutil.copytree(os.path.join(gtk_dir, 'share', 'locale'),
+ os.path.join(resources_dir, 'share', 'locale'))
# fix pathes within shared libraries
for library in chain(
--
tryton-neso
More information about the tryton-debian-vcs
mailing list