[tryton-debian-vcs] tryton-modules-product-measurements branch upstream-2.6 updated. upstream/2.6.0-1-g4abd536

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product-measurements.git;a=commitdiff;h=upstream/2.6.0-1-g4abd536

commit 4abd53694cd45091db5eb853fffbcfb3a8b99a8b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 24 20:41:37 2015 +0100

    Adding upstream version 2.6.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index c6d5b30..b724e5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2015-02-22
+* 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 7fcb680..61e9a99 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2015 Cédric Krier.
 Copyright (C) 2011-2012 Bertrand Chenal.
-Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-2015 Nicolas Évrard.
+Copyright (C) 2011-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 aec1ae4..5ba4f33 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_product_measurements
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add measurements to product
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tests/test_measurements.py b/tests/test_product_measurements.py
similarity index 100%
rename from tests/test_measurements.py
rename to tests/test_product_measurements.py
diff --git a/tryton.cfg b/tryton.cfg
index 760eb94..f0e356e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     product
diff --git a/trytond_product_measurements.egg-info/PKG-INFO b/trytond_product_measurements.egg-info/PKG-INFO
index c51125f..cdcf350 100644
--- a/trytond_product_measurements.egg-info/PKG-INFO
+++ b/trytond_product_measurements.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-product-measurements
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add measurements to product
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_product_measurements.egg-info/SOURCES.txt b/trytond_product_measurements.egg-info/SOURCES.txt
index 4e782b3..c755ab0 100644
--- a/trytond_product_measurements.egg-info/SOURCES.txt
+++ b/trytond_product_measurements.egg-info/SOURCES.txt
@@ -9,8 +9,20 @@ setup.py
 tryton.cfg
 ./__init__.py
 ./product.py
+./product.xml
+./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
 ./tests/__init__.py
-./tests/test_measurements.py
+./tests/test_product_measurements.py
 doc/index.rst
 locale/bg_BG.po
 locale/ca_ES.po
-- 
tryton-modules-product-measurements