[tryton-debian-vcs] tryton-neso branch debian-jessie-3.4 updated. debian/3.4.1-1-7-gf817477
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jul 15 14:23:12 UTC 2015
The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-neso.git;a=commitdiff;h=debian/3.4.1-1-7-gf817477
commit f8174779b27b3ff54d5eea2cf5e7be650d89e538
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 15 14:21:38 2015 +0200
Releasing debian version 3.4.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index cbf66c4..b4d2ca4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-neso (3.4.2-1) unstable; urgency=medium
+
+ * Adding actual upstream signing key.
+ * Improving boilerplate in d/control (Closes: #771722).
+ * Wrapping and sorting control files (wrap-and-sort -bts).
+ * Setting the branch in the watch file to the fixed version 3.4.
+ * Merging upstream version 3.4.2.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 15 Jul 2015 14:21:38 +0200
+
tryton-neso (3.4.1-1) unstable; urgency=medium
* Merging upstream version 3.4.1.
commit 8ed0a8ea0a31ca25ccbe89d6ab1940dcba7c150d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 15 14:21:37 2015 +0200
Updating copyright file.
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 ddef0f89162e801810a9e6870c0fa9e62f102d3b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 15 14:21:37 2015 +0200
Merging upstream version 3.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index f5bb5cb..0adad38 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.1 - 2014-12-03
* Bug fixes (see mercurial logs for details)
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..f35e9a9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: neso
-Version: 3.4.1
+Version: 3.4.2
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/bin/neso b/bin/neso
index 72b9a04..3377aed 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):
+
+ def quit_mainloop(self):
+ global CRON_RUNNING
+ CRON_RUNNING = False
+ thread.join()
+ super(NesoClient, self).quit_mainloop()
+
+NesoClient().run()
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index ad13a55..f35e9a9 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: neso
-Version: 3.4.1
+Version: 3.4.2
Summary: Standalone Client/Server for the Tryton Application Platform
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/neso/version.py b/neso/version.py
index efb8d23..87558e1 100644
--- a/neso/version.py
+++ b/neso/version.py
@@ -1,6 +1,6 @@
#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"
+VERSION = "3.4.2"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-neso
More information about the tryton-debian-vcs
mailing list