[tryton-debian-vcs] tryton-neso branch debian updated. debian/3.4.1-1-5-g121c264
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:07:58 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-neso.git;a=commitdiff;h=debian/3.4.1-1-5-g121c264
commit 121c264c09e3fb1a2c240f4c487b61a46fd9cfe4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:59:12 2015 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 259a56e..acc57f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2009-2014 Cédric Krier
+Copyright: 2009-2015 Cédric Krier
2009 Bertrand Chenal
- 2009-2014 B2CK SPRL
+ 2009-2015 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 9fba9c6b967474823436aa7d71c7e86ff887c68e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:10 2015 +0200
Merging upstream version 3.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index f5bb5cb..a1c6395 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.4.1 - 2014-12-03
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
Version 3.4.0 - 2014-10-20
diff --git a/COPYRIGHT b/COPYRIGHT
index d5217c2..2dd3838 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2014 Cédric Krier.
+Copyright (C) 2009-2015 Cédric Krier.
Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009-2014 B2CK SPRL.
+Copyright (C) 2009-2015 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 ad13a55..929c834 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: neso
-Version: 3.4.1
+Version: 3.6.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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: neso
====
diff --git a/bin/neso b/bin/neso
index 72b9a04..de3fc3e 100755
--- a/bin/neso
+++ b/bin/neso
@@ -73,7 +73,6 @@ for i in ('tryton', 'trytond'):
sys.path.insert(0, os.path.dirname(DIR))
import tryton.client
-TrytonClient = tryton.client.TrytonClient()
from trytond.config import config
from tryton.config import get_home_dir
@@ -342,7 +341,13 @@ def DBLogin_run(self):
DBLogin.run = DBLogin_run
-TrytonClient.run()
-CRON_RUNNING = False
-thread.join()
-sys.exit(0)
+
+class NesoClient(tryton.client.TrytonClient):
+ @classmethod
+ def sig_quit(cls, *args, **kwargs):
+ global CRON_RUNNING
+ CRON_RUNNING = False
+ thread.join()
+ super(NesoClient, cls).sig_quit(*args, **kwargs)
+
+NesoClient().run()
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index ad13a55..929c834 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.4.1
+Version: 3.6.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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: neso
====
diff --git a/neso.egg-info/SOURCES.txt b/neso.egg-info/SOURCES.txt
index d840113..672a5e7 100644
--- a/neso.egg-info/SOURCES.txt
+++ b/neso.egg-info/SOURCES.txt
@@ -15,7 +15,6 @@ slovenian.nsh
spanish.nsh
bin/neso
neso/__init__.py
-neso/version.py
neso.egg-info/PKG-INFO
neso.egg-info/SOURCES.txt
neso.egg-info/dependency_links.txt
diff --git a/neso.egg-info/requires.txt b/neso.egg-info/requires.txt
index f976de0..ad6a939 100644
--- a/neso.egg-info/requires.txt
+++ b/neso.egg-info/requires.txt
@@ -1,2 +1,2 @@
-tryton >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+tryton >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
diff --git a/neso/__init__.py b/neso/__init__.py
index c86640b..61b26b3 100644
--- a/neso/__init__.py
+++ b/neso/__init__.py
@@ -1,2 +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.
+# 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"
diff --git a/neso/version.py b/neso/version.py
deleted file mode 100644
index efb8d23..0000000
--- a/neso/version.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-PACKAGE = "neso"
-VERSION = "3.4.1"
-LICENSE = "GPL-3"
-WEBSITE = "http://www.tryton.org/"
diff --git a/setup.py b/setup.py
index 11264a4..0cd3968 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from setuptools import setup, find_packages
import os
@@ -90,6 +90,8 @@ if os.name == 'nt':
'stdnum',
'site',
],
+ 'dll_excludes': ['dnsapi.dll', 'usp10.dll', 'iphlpapi.dll'],
+ 'excludes': ['Tkconstants', 'Tkinter', 'tcl'],
}
}
args['zipfile'] = 'library.zip'
@@ -116,7 +118,7 @@ elif sys.platform == 'darwin':
'packages': ('xml, logging, lxml, genshi, DAV, pytz, email, '
'relatorio, sql', 'stdnum'),
'excludes': 'tryton, trytond',
- 'frameworks': 'librsvg-2.2.dylib',
+ 'frameworks': 'librsvg-2.2.dylib, libjpeg.8.dylib, libtiff.3.dylib',
'plist': {
'CFBundleIdentifier': 'org.tryton.neso',
'CFBundleName': 'Neso',
@@ -136,27 +138,31 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-PACKAGE, VERSION, LICENSE, WEBSITE = None, None, None, None
-execfile(os.path.join('neso', 'version.py'))
-version = VERSION
+
+def get_version():
+ init = read(os.path.join('neso', '__init__.py'))
+ return re.search('__version__ = "([0-9.]*)"', init).group(1)
+
+version = get_version()
major_version, minor_version, _ = version.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+name = 'neso'
download_url = 'http://downloads.tryton.org/%s.%s/' % (
major_version, minor_version)
if minor_version % 2:
version = '%s.%s.dev0' % (major_version, minor_version)
download_url = 'hg+http://hg.tryton.org/%s#egg=%s-%s' % (
- PACKAGE, PACKAGE, version)
+ name, name, version)
-dist = setup(name=PACKAGE,
+dist = setup(name=name,
version=version,
description='Standalone Client/Server for the Tryton Application Platform',
long_description=read('README'),
author='Tryton',
author_email='issue_tracker at tryton.org',
- url=WEBSITE,
+ url='http://www.tryton.org/',
download_url=download_url,
keywords='business application ERP',
packages=find_packages(),
@@ -339,7 +345,7 @@ if os.name == 'nt':
makensis = find_makensis()
if makensis:
from subprocess import Popen
- Popen([makensis, "/DVERSION=" + VERSION,
+ Popen([makensis, "/DVERSION=" + version,
str(os.path.join(os.path.dirname(__file__),
'setup.nsi'))]).wait()
else:
@@ -470,9 +476,9 @@ elif sys.platform == 'darwin':
shutil.copyfile(os.path.join(os.path.dirname(__file__), file),
os.path.join(dist_dir, file + '.txt'))
- dmg_file = os.path.join(os.path.dirname(__file__), 'neso-' + VERSION
+ dmg_file = os.path.join(os.path.dirname(__file__), 'neso-' + version
+ '.dmg')
if os.path.isfile(dmg_file):
os.remove(dmg_file)
Popen(['hdiutil', 'create', dmg_file, '-volname', 'Neso '
- + VERSION, '-fs', 'HFS+', '-srcfolder', dist_dir]).wait()
+ + version, '-fs', 'HFS+', '-srcfolder', dist_dir]).wait()
--
tryton-neso
More information about the tryton-debian-vcs
mailing list