[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch debian-wheezy-2.6 created. 945e48bbef012aba65fe65bd277c1ee5381938ac

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:09:27 UTC 2013 

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-sale-shipment-cost.git;a=commitdiff;h=945e48bbef012aba65fe65bd277c1ee5381938ac
commit 945e48bbef012aba65fe65bd277c1ee5381938ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Jun 11 13:42:26 2013 +0200

    Releasing debian version 2.6.1-1.

diff --git a/debian/changelog b/debian/changelog
index 724f7f9..1268668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-sale-shipment-cost (2.6.1-1) unstable; urgency=low
+
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.1.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 10 Jun 2013 18:21:17 +0200
+
 tryton-modules-sale-shipment-cost (2.6.0-1) experimental; urgency=low
 
   * Initial packaging.
commit 524ec7a6fe514e77fb449bd3822533b1abd1b630
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jun 10 18:17:48 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index ac9d42f..e9a7c54 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-2013 Cédric Krier
            2011 Bertrand Chenal
            2011-2012 Nicolas Évrard
-           2011-2012 B2CK SPRL
+           2011-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 38be2f60a62a3ed092c96dc544ffc2fad072109c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jun 10 18:10:40 2013 +0200

    Merging upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 7324ddf..563c09f 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 36d3778..1b2e231 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
diff --git a/PKG-INFO b/PKG-INFO
index 7b41686..21199ee 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_sale_shipment_cost
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module for sale shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index 4fecfa2..1fe7254 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():
diff --git a/tryton.cfg b/tryton.cfg
index 2130e93..1f19805 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     account_invoice
     carrier
diff --git a/trytond_sale_shipment_cost.egg-info/PKG-INFO b/trytond_sale_shipment_cost.egg-info/PKG-INFO
index 631612d..9d987cb 100644
--- a/trytond_sale_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_sale_shipment_cost.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-sale-shipment-cost
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module for sale shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
commit b4832ed675316e108e51595eb04dd1d6f93a9f39
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:48 2013 +0200

    Improving update of major version in Depends.
    
    Pulling the major version for Depends directly from the package version.
    Thanks to Ilya Melnikov for pushing the idea.

diff --git a/debian/control b/debian/control
index 0a02e18..4bd8223 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,12 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-sale-shipment-cost
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-account-invoice (>= 2.6), tryton-modules-carrier (>= 2.6), 
- tryton-modules-currency (>= 2.6), tryton-modules-sale (>= 2.6),
- tryton-modules-stock (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-account-invoice (>= ${version:major}),
+ tryton-modules-carrier (>= ${version:major}),
+ tryton-modules-currency (>= ${version:major}),
+ tryton-modules-sale (>= ${version:major}),
+ tryton-modules-stock (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Sale Shipment Cost Module)
  Tryton is a high-level general purpose application platform written in Python
  and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
 %:
 	dh ${@} --with python2
 
@@ -8,5 +10,8 @@ override_dh_auto_clean:
 
 	rm -rf *.egg-info
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -z9
commit b57a9170d344ccd917fdf6cc0aba5c88a21db379
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:49 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index 0e06a4f..99f37ab 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_sale_shipment_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_sale_shipment_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-sale-shipment-cost

More information about the tryton-debian-vcs mailing list