[tryton-debian-vcs] tryton-modules-carrier-weight branch debian-wheezy-2.6 updated. debian/2.6.1-1-3-g2b280b8
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:51:56 UTC 2014
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-carrier-weight.git;a=commitdiff;h=debian/2.6.1-1-3-g2b280b8
commit 2b280b8a4adecf8fb8d085760afc31838d199845
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:25:47 2014 +0100
Releasing debian version 2.6.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index ccb7942..1badd8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-carrier-weight (2.6.2-1) unstable; urgency=medium
+
+ * Merging upstream version 2.6.2.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 12 Nov 2014 13:25:46 +0100
+
tryton-modules-carrier-weight (2.6.1-1) unstable; urgency=low
* Versioning watch file for Tryton branch 2.6.
commit ab6427ed751c703b46cbc3dd3f54e24a083bb0ef
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:25:46 2014 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 776b559..8c00bd9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2011-2012 Cédric Krier
+Copyright: 2011-2014 Cédric Krier
2011-2012 Bertrand Chenal
2011 Nicolas Évrard
- 2011-2012 B2CK SPRL
+ 2011-2014 B2CK SPRL
License: GPL-3+
Files: debian/*
commit a09d846fa654de54833aab022003bbb0c12bb589
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:25:46 2014 +0100
Merging upstream version 2.6.2.
diff --git a/CHANGELOG b/CHANGELOG
index 26c116b..db18e7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.1 - 2013-12-04
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7fcb680..3731ce2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2014 Cédric Krier.
Copyright (C) 2011-2012 Bertrand Chenal.
Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-2014 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 c0713aa..c60a59b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_carrier_weight
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module to add cost method "on weight" on carrier
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tests/scenario_carrier_weight.rst b/tests/scenario_carrier_weight.rst
index 3ff2c17..a401b59 100644
--- a/tests/scenario_carrier_weight.rst
+++ b/tests/scenario_carrier_weight.rst
@@ -17,6 +17,7 @@ Imports::
Create database::
>>> config = config.set_trytond()
+ >>> config.pool.test = True
Install carrier_weight, purchase_shipment_cost and sale_shipment_cost::
diff --git a/tryton.cfg b/tryton.cfg
index f12fe01..fff7577 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.6.2
depends:
carrier
company
diff --git a/trytond_carrier_weight.egg-info/PKG-INFO b/trytond_carrier_weight.egg-info/PKG-INFO
index 9fac515..5c4bdd1 100644
--- a/trytond_carrier_weight.egg-info/PKG-INFO
+++ b/trytond_carrier_weight.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-carrier-weight
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module to add cost method "on weight" on carrier
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_carrier_weight.egg-info/SOURCES.txt b/trytond_carrier_weight.egg-info/SOURCES.txt
index 4877f01..9170293 100644
--- a/trytond_carrier_weight.egg-info/SOURCES.txt
+++ b/trytond_carrier_weight.egg-info/SOURCES.txt
@@ -9,9 +9,22 @@ setup.py
tryton.cfg
./__init__.py
./carrier.py
+./carrier.xml
./sale.py
./stock.py
+./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/scenario_carrier_weight.rst
./tests/test_carrier_weight.py
doc/index.rst
locale/bg_BG.po
--
tryton-modules-carrier-weight
More information about the tryton-debian-vcs
mailing list