[tryton-debian-vcs] tryton-modules-company branch debian-jessie-2.8 updated. debian/2.8.0-3-4-g57e85cd

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-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-company.git;a=commitdiff;h=debian/2.8.0-3-4-g57e85cd

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

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

diff --git a/debian/changelog b/debian/changelog
index 8c1a220..96e6635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-company (2.8.1-1) unstable; urgency=medium
+
+  * Fixing the branch version in the watch file.
+  * Merging upstream version 2.8.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 03 Mar 2015 11:57:56 +0100
+
 tryton-modules-company (2.8.0-3) unstable; urgency=low
 
   * Adapting the rules file to work also with git-buildpackage.
commit cf1bdb7a97aff03a8dab0a53cb9e228b823168ec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:57:55 2015 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 115c003..c3278aa 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-2013 Cédric Krier
+Copyright: 2008-2015 Cédric Krier
            2008-2013 Bertrand Chenal
-           2008-2013 B2CK SPRL
+           2008-2015 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit b48dcc71d46ce6e8e1fb8fb037e6a7d33d7341e1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:57:55 2015 +0100

    Merging upstream version 2.8.1.

diff --git a/CHANGELOG b/CHANGELOG
index e360a9f..054f9be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2015-02-28
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 9192c97..4c7ddcd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2015 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2013 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 c2b7795..0fdc18e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_company
-Version: 2.8.0
+Version: 2.8.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 face119..485f393 100644
--- a/tests/test_company.py
+++ b/tests/test_company.py
@@ -9,6 +9,8 @@ if os.path.isdir(DIR):
     sys.path.insert(0, os.path.dirname(DIR))
 
 import unittest
+import doctest
+
 import trytond.tests.test_tryton
 from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
     test_depends
@@ -162,7 +164,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 0c4e53d..45a68bd 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=2.8.1
 depends:
     currency
     ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 097d169..0ff846a 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: 2.8.0
+Version: 2.8.1
 Summary: Tryton module with companies and employees
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_company.egg-info/SOURCES.txt b/trytond_company.egg-info/SOURCES.txt
index 9bf9841..782fec3 100644
--- a/trytond_company.egg-info/SOURCES.txt
+++ b/trytond_company.egg-info/SOURCES.txt
@@ -12,10 +12,38 @@ setup.py
 tryton.cfg
 ./__init__.py
 ./company.py
+./company.xml
 ./cron.py
+./cron.xml
+./header_A4.odt
+./letter.odt
 ./party.py
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
 ./tests/__init__.py
 ./tests/test_company.py
+./view/company_config_start_form.xml
+./view/company_form.xml
+./view/company_list.xml
+./view/company_tree.xml
+./view/cron_form.xml
+./view/employee_form.xml
+./view/employee_tree.xml
+./view/property_form.xml
+./view/property_tree.xml
+./view/sequence_form.xml
+./view/sequence_tree.xml
+./view/user_form.xml
+./view/user_form_preferences.xml
 doc/index.rst
 locale/bg_BG.po
 locale/ca_ES.po
-- 
tryton-modules-company



More information about the tryton-debian-vcs mailing list