[tryton-debian-vcs] tryton-modules-product-cost-fifo branch debian-wheezy-2.6 created. fccbd25021b04b8cb0acf7886f87609e0838a51a

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:05:09 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-product-cost-fifo.git;a=commitdiff;h=fccbd25021b04b8cb0acf7886f87609e0838a51a
commit fccbd25021b04b8cb0acf7886f87609e0838a51a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 12:07:18 2013 +0200

    Releasing debian version 2.6.1-1.

diff --git a/debian/changelog b/debian/changelog
index 5334511..ad501bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-product-cost-fifo (2.6.1-1) experimental; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704389).
+  * 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>  Sat, 04 May 2013 02:40:07 +0200
+
 tryton-modules-product-cost-fifo (2.6.0-3) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit 779f92d4554ccdc4109e9402ed9416cd2dd37a7b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:13:01 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 3c647d6..6bf2702 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2008-2012 Cédric Krier
+Copyright: 2008-2013 Cédric Krier
            2008-2012 Bertrand Chenal
-           2008-2012 B2CK SPRL
+           2008-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 313e922d195817dce429757d68fdd2d98d3303ad
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 01:57:03 2013 +0200

    Merging upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index d32cda0..716b43b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-05-02
+* 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 2057c72..d7165c7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
 Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-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 ffd06b1..e37fdd5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_product_cost_fifo
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add FIFO cost method
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/product.py b/product.py
index f226809..3449c3e 100644
--- a/product.py
+++ b/product.py
@@ -29,6 +29,7 @@ class Template:
         Move = pool.get('stock.move')
         Uom = pool.get('product.uom')
         Location = pool.get('stock.location')
+        Template = pool.get('product.template')
 
         locations = Location.search([
             ('type', '=', 'storage'),
diff --git a/tryton.cfg b/tryton.cfg
index 7273173..86b1899 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_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 8de0eea..6c3e5dc 100644
--- a/trytond_product_cost_fifo.egg-info/PKG-INFO
+++ b/trytond_product_cost_fifo.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-product-cost-fifo
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add FIFO cost method
 Home-page: http://www.tryton.org/
 Author: Tryton
commit f4d128a9a54afff2d8e9acd496d9a23f13f26ce9
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 a1f78c0..f0b7a58 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ X-Python-Version: >= 2.6
 
 Package: tryton-modules-product-cost-fifo
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-product (>= 2.6), tryton-modules-stock (>= 2.6),
- python-pkg-resources
+Depends: ${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 (Product Cost FIFO 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 4e1ad40b409414c3b4d3211d55b2b0a462418e71
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:43 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index 641e138..8a4ec4c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_product_cost_fifo-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_product_cost_fifo-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-product-cost-fifo



More information about the tryton-debian-vcs mailing list