[tryton-debian-vcs] tryton-modules-stock-forecast branch debian-wheezy-2.6 created. aa700ee431a1d21349c14948c99f721c4b939d8b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:10:34 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-forecast.git;a=commitdiff;h=aa700ee431a1d21349c14948c99f721c4b939d8b
commit aa700ee431a1d21349c14948c99f721c4b939d8b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 12:07:19 2013 +0200
Releasing debian version 2.6.1-1.
diff --git a/debian/changelog b/debian/changelog
index 6fdd063..fa81339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-stock-forecast (2.6.1-1) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704401).
+ * 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:21 +0200
+
tryton-modules-stock-forecast (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 708c781304e46bdd1f9992c2b2292396f6bd3c99
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 ebce8d3bb37e67dd83b54024fec363513db7c041
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 01:57:12 2013 +0200
Merging upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index 120e31b..d03df42 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 f60862b..659e39b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,11 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_stock_forecast
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module with stock forecasts
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
+Download-URL: http://downloads.tryton.org/2.6/
Description: trytond_stock_forecast
=====================
diff --git a/forecast.py b/forecast.py
index e24d9dc..f52988c 100644
--- a/forecast.py
+++ b/forecast.py
@@ -542,7 +542,7 @@ class ForecastComplete(Wizard):
Collect products for which there is an outgoing stream between
the given location and the destination.
"""
- if self.choose.products:
+ if getattr(self.choose, 'products', None):
return {'products': [x.id for x in self.choose.products]}
pbl = self._get_product_quantity()
products = []
@@ -569,7 +569,7 @@ class ForecastComplete(Wizard):
for product in Product.browse(product_ids):
prod2uom[product.id] = product.default_uom.id
- if self.choose.products:
+ if getattr(self.choose, 'products', None):
products = [x.id for x in self.choose.products]
else:
products = None
diff --git a/setup.py b/setup.py
index 67dc643..7eb32a9 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,8 @@ setup(name='trytond_stock_forecast',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.stock_forecast': '.'},
packages=[
'trytond.modules.stock_forecast',
diff --git a/tryton.cfg b/tryton.cfg
index ab31c67..942063f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
depends:
company
ir
diff --git a/trytond_stock_forecast.egg-info/PKG-INFO b/trytond_stock_forecast.egg-info/PKG-INFO
index 47f48f2..6a7492a 100644
--- a/trytond_stock_forecast.egg-info/PKG-INFO
+++ b/trytond_stock_forecast.egg-info/PKG-INFO
@@ -1,11 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-stock-forecast
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module with stock forecasts
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
+Download-URL: http://downloads.tryton.org/2.6/
Description: trytond_stock_forecast
=====================
commit 266254409335a63f0fd1fdc833781ac8ce2ab458
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 e72dcfd..7b070c5 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,11 @@ X-Python-Version: >= 2.6
Package: tryton-modules-stock-forecast
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-company (>= 2.6), tryton-modules-product (>= 2.6),
- tryton-modules-stock (>= 2.6), python-dateutil, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-company (>= ${version:major}),
+ tryton-modules-product (>= ${version:major}),
+ tryton-modules-stock (>= ${version:major}),
+ python-dateutil, python-pkg-resources
Description: Tryton Application Platform (Stock Forecast 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 bad0f5b0e1195587cd693b76bb19edb8f63aca63
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 2246c5c..832e002 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://downloads.tryton.org/current/ .*trytond_stock_forecast-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_stock_forecast-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-stock-forecast
More information about the tryton-debian-vcs
mailing list