[tryton-debian-vcs] tryton-modules-company branch debian-jessie-3.2 updated. debian/3.2.0-1-8-gdd52b41
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-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-company.git;a=commitdiff;h=debian/3.2.0-1-8-gdd52b41
commit dd52b4195bc219e23c08b27d85786376b79e7379
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 11:59:49 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 d198eb5..e124a06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-company (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> Tue, 03 Mar 2015 11:59:49 +0100
+
tryton-modules-company (3.2.0-1) unstable; urgency=medium
* Removing LC_ALL=C.UTF-8 as build environment.
commit 6a55685c106dd8f02fdfe691955b69b91a75a36f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 11:59:48 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 7744d11a41772912ef9b50f26ffff87dfe2999c8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 11:59:48 2015 +0100
Merging upstream version 3.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 783d149..28ab9b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.1 - 2015-02-28
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
* Read employee according to the context
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 90fb81b..3868a0f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 3.2.0
+Version: 3.2.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 b26414e..668c0cc 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.2.1
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 0a001cb..2055518 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.2.0
+Version: 3.2.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 3da5b64..a05ba53 100644
--- a/trytond_company.egg-info/SOURCES.txt
+++ b/trytond_company.egg-info/SOURCES.txt
@@ -12,10 +12,39 @@ 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
+./locale/sl_SI.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