[tryton-debian-vcs] tryton-modules-timesheet-cost branch debian-jessie-3.2 updated. debian/3.2.0-1-8-ge75a705

Wed Feb 18 10:06:42 UTC 2015

The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-timesheet-cost.git;a=commitdiff;h=debian/3.2.0-1-8-ge75a705

commit e75a7054914c579088ca6ce35997028290b16c12
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 18 10:17:51 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 94b5f7e..5350abe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-timesheet-cost (3.2.1-1) unstable; urgency=medium
+
+  * Updating signing key while using now plain .asc files instead of .pgp
+    binaries.
+  * Adding actual upstream signing key.
+  * Updating to Standards-Version: 3.9.6, no changes needed.
+  * Setting the branch in the watch file to the fixed version 3.2.
+  * Adding actual upstream signing key.
+  * Merging upstream version 3.2.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 18 Feb 2015 10:17:51 +0100
+
 tryton-modules-timesheet-cost (3.2.0-1) unstable; urgency=medium
 
   * Removing  LC_ALL=C.UTF-8 as build environment.
commit c8cc8b1337f1e22d7a9082d47d545797efe66381
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 18 10:17:50 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 86b15d3e5305b6f7a78d776f6bddda4d0a21ba99
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 18 10:17:50 2015 +0100

    Merging upstream version 3.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index a77894f..f400b27 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.1 - 2015-02-17
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.0 - 2014-04-21
 * 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 74cbbf1..7800263 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_timesheet_cost
-Version: 3.2.0
+Version: 3.2.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 24194ea..e9f2ac3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.0
+version=3.2.1
 depends:
     ir
     company
diff --git a/trytond_timesheet_cost.egg-info/PKG-INFO b/trytond_timesheet_cost.egg-info/PKG-INFO
index 77efbee..6f54f3f 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.2.0
+Version: 3.2.1
 Summary: Tryton module to add cost on timesheet
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_timesheet_cost.egg-info/SOURCES.txt b/trytond_timesheet_cost.egg-info/SOURCES.txt
index 79fd4fa..bbf1d87 100644
--- a/trytond_timesheet_cost.egg-info/SOURCES.txt
+++ b/trytond_timesheet_cost.egg-info/SOURCES.txt
@@ -9,9 +9,25 @@ setup.py
 tryton.cfg
 ./__init__.py
 ./company.py
+./company.xml
 ./timesheet.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
+./locale/sl_SI.po
 ./tests/__init__.py
 ./tests/test_timesheet_cost.py
+./view/employee_cost_price_form.xml
+./view/employee_cost_price_tree.xml
+./view/employee_form.xml
 locale/bg_BG.po
 locale/ca_ES.po
 locale/cs_CZ.po
-- 
tryton-modules-timesheet-cost

