[tryton-debian-vcs] tryton-modules-stock-package-shipping branch upstream-4.2 updated. upstream/4.2.0-1-g22d4847

[Mathias Behrle]

The following commit has been merged in the upstream-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-package-shipping.git;a=commitdiff;h=upstream/4.2.0-1-g22d4847

commit 22d4847accb1a3f1e86403149b1e02524edf1bb3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 12:14:24 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 1c72ee3..92081fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 4.2.1 - 2017-10-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Initial release
\ No newline at end of file
diff --git a/COPYRIGHT b/COPYRIGHT
index f51e549..0d03c0a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2016 Nicolas Évrard.
-Copyright (C) 2016 B2CK.
+Copyright (C) 2016-2017 Nicolas Évrard.
+Copyright (C) 2016-2017 B2CK.
 
 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 3d1aea8..64304c3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_package_shipping
-Version: 4.2.0
+Version: 4.2.1
 Summary: The package shipping module of the Tryton application platform.
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/setup.py b/setup.py
index 11afe0f..5c01753 100644
--- a/setup.py
+++ b/setup.py
@@ -116,7 +116,7 @@ setup(name=name,
     zip_safe=False,
     entry_points="""
     [trytond.modules]
-    shipping = trytond.modules.stock_package_shipping
+    stock_package_shipping = trytond.modules.stock_package_shipping
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
diff --git a/tryton.cfg b/tryton.cfg
index 23a9e4a..06c41c7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     ir
     res
diff --git a/trytond_stock_package_shipping.egg-info/PKG-INFO b/trytond_stock_package_shipping.egg-info/PKG-INFO
index dc245fe..6ae9acb 100644
--- a/trytond_stock_package_shipping.egg-info/PKG-INFO
+++ b/trytond_stock_package_shipping.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-package-shipping
-Version: 4.2.0
+Version: 4.2.1
 Summary: The package shipping module of the Tryton application platform.
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_stock_package_shipping.egg-info/entry_points.txt b/trytond_stock_package_shipping.egg-info/entry_points.txt
index a7898d4..004d98e 100644
--- a/trytond_stock_package_shipping.egg-info/entry_points.txt
+++ b/trytond_stock_package_shipping.egg-info/entry_points.txt
@@ -1,4 +1,4 @@
 
     [trytond.modules]
-    shipping = trytond.modules.stock_package_shipping
+    stock_package_shipping = trytond.modules.stock_package_shipping
     
\ No newline at end of file
-- 
tryton-modules-stock-package-shipping