[tryton-debian-vcs] tryton-modules-stock-supply branch debian-wheezy-2.6 updated. debian/2.6.3-1-3-g17a9086

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Feb 18 10:05:50 UTC 2015


The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply.git;a=commitdiff;h=debian/2.6.3-1-3-g17a9086

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

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

diff --git a/debian/changelog b/debian/changelog
index 20f8521..7168427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-stock-supply (2.6.4-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.4.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 18 Feb 2015 10:25:29 +0100
+
 tryton-modules-stock-supply (2.6.3-1) unstable; urgency=medium
 
   * Merging upstream version 2.6.3.
commit 2de8daa19ba6b7af2a60d146a8d904c3bed63a49
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 18 10:25:29 2015 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 2d55ea5..88471ca 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-2012 Bertrand Chenal
-           2008-2014 B2CK SPRL
+           2008-2015 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 9da93472dac7553453f76f51a065404579f06cd6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 18 10:25:29 2015 +0100

    Merging upstream version 2.6.4.

diff --git a/CHANGELOG b/CHANGELOG
index 94b7b6f..941fd83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.4 - 2015-02-17
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.3 - 2014-11-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 9925e7d..34d4187 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-2012 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 5612bc1..bb34298 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply
-Version: 2.6.3
+Version: 2.6.4
 Summary: Tryton module for stock supply
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py
index a2bb45a..90dcb1c 100644
--- a/tests/test_stock_supply.py
+++ b/tests/test_stock_supply.py
@@ -10,6 +10,7 @@ if os.path.isdir(DIR):
     sys.path.insert(0, os.path.dirname(DIR))
 
 import unittest
+import doctest
 import datetime
 from decimal import Decimal
 import trytond.tests.test_tryton
@@ -135,11 +136,11 @@ 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)
     from trytond.modules.account.tests import test_account
     for test in test_account.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(
         StockSupplyTestCase))
diff --git a/tryton.cfg b/tryton.cfg
index 168bb4b..0492970 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.3
+version=2.6.4
 depends:
     account
     ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index bac91fd..da341d6 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-supply
-Version: 2.6.3
+Version: 2.6.4
 Summary: Tryton module for stock supply
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock-supply



More information about the tryton-debian-vcs mailing list