From 2be54a13a6af61326dc257aaa7354fa99b7b16d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 22 Oct 2012 23:00:00 +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 2130e932c1..1f19805b61 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     account_invoice
     carrier

From c3c3ab6d05b99553e8198531c162f1b1aeb63aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 27 Mar 2013 22:45:15 +0100
Subject: [PATCH 2/5] Fix wrong depends on sale_shipment_cost_method
 (transplanted from 6454af59837665161b123e575ce790b70ae483e0)

---
 sale.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sale.py b/sale.py
index 4fecfa2bd5..1fe7254d74 100644
--- a/sale.py
+++ b/sale.py
@@ -20,8 +20,7 @@ class Configuration:
                 ], 'Sale Shipment Cost Method',
             states={
                 'required': Bool(Eval('context', {}).get('company', 0)),
-                },
-            depends=['company']))
+                }))
 
     @staticmethod
     def default_sale_shipment_cost_method():

From 63cb12124a2bd415171eb694aa49b5c9099b90ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 9 Jun 2013 22:49:49 +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 7324ddf488..563c09fb82 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-06-09
+* 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 36d37787aa..1b2e231b46 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2013 Cédric Krier.
 Copyright (C) 2011 Bertrand Chenal.
 Copyright (C) 2011-2012 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-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 2fb1dd7e176ba0b17741d2ac3b63b9f9a0bcf6ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 9 Jun 2013 22:49:51 +0200
Subject: [PATCH 4/5] Added tag 2.6.1 for changeset 9de2e103b564

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5e23d6a8b3..1b240cc815 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2,3 +2,4 @@
 36b22ce15af6266455a7344bdb1b7708658a3918 2.2.0
 8b23387948920fbc4acf986227a563387b1086f5 2.4.0
 f45b4c88b84945e0238c9ae55e5c8cd19deb58a8 2.6.0
+9de2e103b564cee966d0a33b284a2a93ead48664 2.6.1

From f1019fb0e1b42b4435911bbf9a0dead7ff4453cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 9 Jun 2013 22:50:01 +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 1f19805b61..3ad7a2ecee 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     account_invoice
     carrier