[tryton-debian-vcs] tryton-modules-stock-supply-forecast branch debian-wheezy-2.6 created. b80aa61a34afec08c9b7ccbefd7b7de78952eafd

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:12:23 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-supply-forecast.git;a=commitdiff;h=b80aa61a34afec08c9b7ccbefd7b7de78952eafd
commit b80aa61a34afec08c9b7ccbefd7b7de78952eafd
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 b0b1b40..0638b60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock-supply-forecast (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:42 +0200
+
 tryton-modules-stock-supply-forecast (2.6.0-1) experimental; urgency=low
 
   * Initial packaging.
commit 0b3b574cab024b7698fdd510f4268be585450b78
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 f4dcab4..44885c8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2011-2012 Cédric Krier
-           2011-2012 B2CK SPRL
+Copyright: 2011-2013 Cédric Krier
+           2011-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit dc38813fed46b9a8ded5839c4422f84c275fe96f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 01:57:21 2013 +0200

    Merging upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 3a2ca59..d1f15d9 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 adbac57..cd6950c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2011-2012 Cédric Krier.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-2013 Cédric Krier.
+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 ae26e32..fa57a20 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,11 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_stock_supply_forecast
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add forecast to supply computation
 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_supply_forecast
         =============================
         
diff --git a/setup.py b/setup.py
index cb70d98..b8248b0 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,8 @@ setup(name='trytond_stock_supply_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_supply_forecast': '.'},
     packages=[
         'trytond.modules.stock_supply_forecast',
diff --git a/tryton.cfg b/tryton.cfg
index f49c22a..c1dfaec 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     stock_supply
diff --git a/trytond_stock_supply_forecast.egg-info/PKG-INFO b/trytond_stock_supply_forecast.egg-info/PKG-INFO
index 8301726..2ccf27b 100644
--- a/trytond_stock_supply_forecast.egg-info/PKG-INFO
+++ b/trytond_stock_supply_forecast.egg-info/PKG-INFO
@@ -1,11 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-stock-supply-forecast
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add forecast to supply computation
 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_supply_forecast
         =============================
         
commit 7e493a33aec895d456bb05d8aba7d24bf1e5baad
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 65ce2f6..e40f2cc 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-stock-supply-forecast
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-stock-supply (>= 2.6), tryton-modules-stock-forecast (>= 2.6),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-stock-supply (>= ${version:major}),
+ tryton-modules-stock-forecast (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Stock Supply 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 8dcd35f6ad48c20189209fbc7db19ee1261321bc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:51 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index 6320c1a..54880c5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_stock_supply_forecast-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_stock_supply_forecast-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-stock-supply-forecast

More information about the tryton-debian-vcs mailing list