[tryton-debian-vcs] tryton-modules-stock-lot branch debian-wheezy-2.6 created. eb0711605b64dfe086023653e7c17208a584c608

Wed Nov 27 17:11:14 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-stock-lot.git;a=commitdiff;h=eb0711605b64dfe086023653e7c17208a584c608
commit eb0711605b64dfe086023653e7c17208a584c608
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 12:07:20 2013 +0200

    Releasing debian version 2.6.1-1.

diff --git a/debian/changelog b/debian/changelog
index 0e8c1b7..bc656da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock-lot (2.6.1-1) experimental; 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>  Sat, 04 May 2013 02:40:25 +0200
+
 tryton-modules-stock-lot (2.6.0-1) experimental; urgency=low
 
   * Initial packaging.
commit 74ccce675b9ab477c7edce749e2636fc4c9efc08
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 900682e..ea76765 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 2012 Cédric Krier
-           2012 B2CK SPRL
+           2012-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 95de091dece22b20e499d7437e77ba919d986f62
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 01:57:14 2013 +0200

    Merging upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 210505e..7631b52 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 747ae18..3b6e5e2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
 Copyright (C) 2012 Cédric Krier.
-Copyright (C) 2012 B2CK SPRL.
+Copyright (C) 2012-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 a38a3d5..aed4625 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_stock_lot
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module for lot of products
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/stock.py b/stock.py
index 3a9bfb1..2e74bf6 100644
--- a/stock.py
+++ b/stock.py
@@ -47,6 +47,7 @@ class Move:
         "Check if lot is required"
         for move in moves:
             if (move.state == 'done'
+                    and move.internal_quantity
                     and not move.lot
                     and move.product.lot_is_required(
                         move.from_location, move.to_location)):
diff --git a/tryton.cfg b/tryton.cfg
index c26f57d..347ca9b 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_lot.egg-info/PKG-INFO b/trytond_stock_lot.egg-info/PKG-INFO
index f3cce79..0c6bbc4 100644
--- a/trytond_stock_lot.egg-info/PKG-INFO
+++ b/trytond_stock_lot.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-stock-lot
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module for lot of products
 Home-page: http://www.tryton.org/
 Author: Tryton
commit b6a79e33d4ea2506c1800a559509c82ae879b02b
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 a9ef43a..ec17eea 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-stock-lot
 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 Lot 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 8c28fcec310bc23014972f4298d1e04271023130
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 bc8a224..4092bd7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_stock_lot-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_stock_lot-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-stock-lot

