From 3df1ef78c851aa758c2268c2f81c17e5eaa5f05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 23:00:17 +0200 Subject: [PATCH 1/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 08172140a4..d75dd22b28 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.0 +version=2.6.1 depends: ir stock From 08cf5aa2157a9f4e6d394dc3bb75669d5897d951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 13 Mar 2013 17:23:20 +0100 Subject: [PATCH 2/5] Fix unittest suite (transplanted from 6381c20cf23119a3b29720a01417780b11f85b65) --- tests/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/__init__.py b/tests/__init__.py index 96d4ef91da..2a975fae3c 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,4 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -from .test_stock_lot import suite +from .test_stock_split import suite From ba58d9c40529d1fbaf240823c56e29ab10e6777b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:32:58 +0200 Subject: [PATCH 3/5] Prepare release 2.6.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 210505eaef..7631b52dd6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.1 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 747ae18d7e..7668cfad83 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ -Copyright (C) 2012 Cédric Krier. -Copyright (C) 2012 B2CK SPRL. +Copyright (C) 2012-2013 Cédric Krier. +Copyright (C) 2012-2013 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 From 3086ba456a9a5fee943e537cc057767a924d060c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:32:59 +0200 Subject: [PATCH 4/5] Added tag 2.6.1 for changeset 5901c9d5e13c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index aa507abc38..526d6b4b04 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 28368573eba198c3524a0ef44c5d1318a71a25b6 2.4.0 04196701d026d86eb57f91c6e38cddecf257d63f 2.6.0 +5901c9d5e13ced1336b78f022d42c0b15c47d9d0 2.6.1 From 73623dbef00f98c7942f59c2fc482da837317779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:33:08 +0200 Subject: [PATCH 5/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index d75dd22b28..82270a8526 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.1 +version=2.6.2 depends: ir stock