[tryton-debian-vcs] tryton-modules-company branch debian updated. debian/3.4.0-1-5-gfb7bcba

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Mar 4 00:33:23 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-modules-company.git;a=commitdiff;h=debian/3.4.0-1-5-gfb7bcba

commit fb7bcbaea66a33d611fd009ee2c5ae486d928838
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:56:07 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 4d96169..2c77982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-company (3.4.1-1) unstable; urgency=medium
+
+  * Adding actual upstream signing key.
+  * Improving boilerplate in d/control (Closes: #771722).
+  * Merging upstream version 3.4.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 03 Mar 2015 11:56:07 +0100
+
 tryton-modules-company (3.4.0-1) unstable; urgency=medium
 
   * Updating signing key while using now plain .asc files instead of .pgp
commit 0ef4ae324beffade50e4a582ec446cbc3fc83378
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:56:06 2015 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index a5019f7..c7771ff 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: 2008-2014 Cédric Krier
+Copyright: 2008-2015 Cédric Krier
            2008-2013 Bertrand Chenal
-           2008-2014 B2CK SPRL
+           2008-2015 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 82ef4b1d9771baf4e3e3b17fef1a0b9c150c1357
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:56:06 2015 +0100

    Merging upstream version 3.4.1.

diff --git a/CHANGELOG b/CHANGELOG
index e1bbccd..53d0aca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-02-28
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.0 - 2014-10-20
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 5134c09..4c7ddcd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2014 Cédric Krier.
+Copyright (C) 2008-2015 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2014 B2CK SPRL.
+Copyright (C) 2008-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 1edd91a..12085d8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_company
-Version: 3.4.0
+Version: 3.4.1
 Summary: Tryton module with companies and employees
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tests/test_company.py b/tests/test_company.py
index b7f5e33..8e648f8 100644
--- a/tests/test_company.py
+++ b/tests/test_company.py
@@ -1,6 +1,8 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 import unittest
+import doctest
+
 import trytond.tests.test_tryton
 from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
     test_depends
@@ -140,7 +142,7 @@ def suite():
     suite = trytond.tests.test_tryton.suite()
     from trytond.modules.currency.tests import test_currency
     for test in test_currency.suite():
-        if test not in suite:
+        if test not in suite and not isinstance(test, doctest.DocTestCase):
             suite.addTest(test)
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
             CompanyTestCase))
diff --git a/tryton.cfg b/tryton.cfg
index 41eac7b..c9e3bc8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.0
+version=3.4.1
 depends:
     currency
     ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 17fdb3e..ed1446f 100644
--- a/trytond_company.egg-info/PKG-INFO
+++ b/trytond_company.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-company
-Version: 3.4.0
+Version: 3.4.1
 Summary: Tryton module with companies and employees
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-company



More information about the tryton-debian-vcs mailing list