[tryton-debian-vcs] tryton-modules-timesheet-cost branch debian updated. debian/3.4.0-1-4-g57fe739
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 18 10:06:41 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-timesheet-cost.git;a=commitdiff;h=debian/3.4.0-1-4-g57fe739
commit 57fe7392129e05d12cbc04d4f6fac8f9d03235f3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:15:56 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 b4d535d..87abdbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-timesheet-cost (3.4.1-1) unstable; urgency=medium
+
+ * Adding actual upstream signing key.
+ * Merging upstream version 3.4.1.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 18 Feb 2015 10:15:56 +0100
+
tryton-modules-timesheet-cost (3.4.0-1) unstable; urgency=medium
* Updating signing key while using now plain .asc files instead of .pgp
commit 7b8afd2d423e39f1be6784beac22126c5c1f6c6c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:15:55 2015 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 2ee028e..32a7cd9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2014 Cédric Krier
- 2008-2014 B2CK SPRL
+Copyright: 2008-2015 Cédric Krier
+ 2008-2015 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 6340ba7bf8fdf59b01500c34ad17bea6e37af84a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:15:55 2015 +0100
Merging upstream version 3.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index dd64fdd..d30859c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-02-17
+* 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 8d7bc43..0634fbe 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2014 Cédric Krier.
-Copyright (C) 2008-2014 B2CK SPRL.
+Copyright (C) 2008-2015 Cédric Krier.
+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 c9124e8..cb86c0f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_timesheet_cost
-Version: 3.4.0
+Version: 3.4.1
Summary: Tryton module to add cost on timesheet
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tests/test_timesheet_cost.py b/tests/test_timesheet_cost.py
index 41c57eb..1ffea29 100644
--- a/tests/test_timesheet_cost.py
+++ b/tests/test_timesheet_cost.py
@@ -1,6 +1,7 @@
#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 datetime
from decimal import Decimal
@@ -68,7 +69,7 @@ def suite():
suite = trytond.tests.test_tryton.suite()
from trytond.modules.company.tests import test_company
for test in test_company.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(
TimesheetCostTestCase))
diff --git a/tryton.cfg b/tryton.cfg
index cfaa58b..a233157 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.0
+version=3.4.1
depends:
ir
company
diff --git a/trytond_timesheet_cost.egg-info/PKG-INFO b/trytond_timesheet_cost.egg-info/PKG-INFO
index 17e5416..d8ce16d 100644
--- a/trytond_timesheet_cost.egg-info/PKG-INFO
+++ b/trytond_timesheet_cost.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-timesheet-cost
-Version: 3.4.0
+Version: 3.4.1
Summary: Tryton module to add cost on timesheet
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-timesheet-cost
More information about the tryton-debian-vcs
mailing list