[tryton-debian-vcs] tryton-modules-stock-product-location branch debian-wheezy-2.6 created. b1e433b9ad9c161ce57e1a00a4b22844606c84e9

[Mathias Behrle]

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-stock-product-location.git;a=commitdiff;h=b1e433b9ad9c161ce57e1a00a4b22844606c84e9
commit b1e433b9ad9c161ce57e1a00a4b22844606c84e9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:54:32 2013 +0200

    Releasing debian version 2.6.1-1.

diff --git a/debian/changelog b/debian/changelog
index 20a6c33..81da201 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-stock-product-location (2.6.1-1) unstable; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes:
+    #704404).
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 17 Oct 2013 13:22:30 +0200
+
 tryton-modules-stock-product-location (2.6.0-3) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit 5edd3d903ae17a08ea574bae6e650351acabf2f3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:21:31 2013 +0200

    Merging upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 64c426e..6ac306e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 2b82bd1..d1b5dee 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_stock_product_location
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add default location on product
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/product.py b/product.py
index 49a5a96..5072162 100644
--- a/product.py
+++ b/product.py
@@ -13,4 +13,5 @@ class Product:
     locations = fields.One2Many('stock.product.location', 'product',
         'Default Locations', states={
             'invisible': ~Eval('type').in_(['goods', 'assets']),
-            })
+            },
+        depends=['type'])
diff --git a/tryton.cfg b/tryton.cfg
index 90dbb7f..e43c2ce 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_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index 10a60d2..7e8ae23 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-stock-product-location
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add default location on product
 Home-page: http://www.tryton.org/
 Author: Tryton
commit 284ad40e1aad802aadcde5d56a91d93594a7ecdd
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 30e418b..5cc7939 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-stock-product-location
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-product (>= 2.6), tryton-modules-stock (>= 2.6),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-product (>= ${version:major}),
+ tryton-modules-stock (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Stock Product Location 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 2bd8e923dbe4af1564d1d31620ea9991716bfc3e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:50 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index 796d954..9327166 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_stock_product_location-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_stock_product_location-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-stock-product-location