[tryton-debian-vcs] tryton-modules-project-plan branch debian-wheezy-2.6 created. 509adec37def9dc13a99178dee115cc77414b20c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:07:03 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-project-plan.git;a=commitdiff;h=509adec37def9dc13a99178dee115cc77414b20c
commit 509adec37def9dc13a99178dee115cc77414b20c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Aug 7 17:00:33 2013 +0200
Releasing debian version 2.6.3-1.
diff --git a/debian/changelog b/debian/changelog
index 2e8a8e6..5206fd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-project-plan (2.6.3-1) unstable; urgency=low
+
+ * Merging upstream version 2.6.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 07 Aug 2013 16:47:17 +0200
+
tryton-modules-project-plan (2.6.2-1) unstable; urgency=low
* Merging upstream version 2.6.2.
commit 66f8332d86ab737160c404c1b9291e862d57182d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Aug 7 16:41:55 2013 +0200
Merging upstream version 2.6.3.
diff --git a/CHANGELOG b/CHANGELOG
index 9557c1c..650678d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2013-07-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.2 - 2013-06-09
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 1648725..e606a68 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index fbdb02d..06847d9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.2
+version=2.6.3
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 637252f..5512798 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index 1542015..cd39fc2 100644
--- a/work.py
+++ b/work.py
@@ -596,9 +596,8 @@ class Work:
yield sibling, delay
- parent = self.parent and self.parent.id or None
siblings = self.search([
- ('parent', '=', parent.id)
+ ('parent', '=', self.parent.id if self.parent else None)
])
refkey = get_key(self)
@@ -615,8 +614,8 @@ class Work:
'back_leveling_delay': delay,
})
- if parent:
- parent.compute_dates()
+ if self.parent:
+ self.parent.compute_dates()
@classmethod
def write(cls, works, values):
commit cab44b1dad542899e4dbe9f8719efdabd1217fe4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Jun 11 13:42:25 2013 +0200
Releasing debian version 2.6.2-1.
diff --git a/debian/changelog b/debian/changelog
index 9ec6861..2e8a8e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-project-plan (2.6.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.6.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 10 Jun 2013 18:20:41 +0200
+
tryton-modules-project-plan (2.6.1-1) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704393).
commit 84d334598210ac7b9c3712f37ab1e111a0daa6d2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 18:12:35 2013 +0200
Merging upstream version 2.6.2.
diff --git a/CHANGELOG b/CHANGELOG
index 286d4b8..9557c1c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-06-09
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.1 - 2013-05-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 2ad35de..1648725 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index d1ae4b5..fbdb02d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.6.2
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index b72839a..637252f 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index d71cc4b..1542015 100644
--- a/work.py
+++ b/work.py
@@ -484,7 +484,7 @@ class Work:
if constraint_finish:
late_finish = self.add_hours(work.company, constraint_finish,
- -work.back_leveling_delay)
+ -(work.back_leveling_delay or 0.0))
else:
late_finish = None
commit 44f6e880b426a630bac9e94bf47d432b4ed15cb5
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 cf74bda..9ec6861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-project-plan (2.6.1-1) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704393).
+ * 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:11 +0200
+
tryton-modules-project-plan (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit e9fe04dd96483a2ee17f1ea24cb2603cda22c715
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 6d57078..edd2549 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: 2009-2012 Bertrand Chenal
- 2009-2012 Cédric Krier
- 2009-2012 B2CK SPRL
+ 2009-2013 Cédric Krier
+ 2009-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 3b304fc19beae4b1f458c1b940437e42a17fcceb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 01:57:07 2013 +0200
Merging upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index 13d6b8d..286d4b8 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 fe93a1f..ff31dda 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 Cédric Krier.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-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 598237f..2ad35de 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 632593d..d1ae4b5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 56b1b75..b72839a 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index 0708b8c..d71cc4b 100644
--- a/work.py
+++ b/work.py
@@ -110,8 +110,8 @@ class Work:
),
])
for req_ref in req_refs:
- _, work_id = req_ref.reference.split(',')
- requests[int(work_id)].append(req_ref.request.id)
+ work_id = req_ref.reference.id
+ requests[work_id].append(req_ref.request.id)
res['requests'] = requests
commit 108c61b20c7b852af8c4eae8b0f729281dff69ad
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 829d930..8e127cc 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,10 @@ X-Python-Version: >= 2.6
Package: tryton-modules-project-plan
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-company (>= 2.6), tryton-modules-timesheet (>= 2.6),
- tryton-modules-project (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-company (>= ${version:major}),
+ tryton-modules-timesheet (>= ${version:major}),
+ tryton-modules-project (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Project Plan 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 772f7c82af53584f281fd3fb9d0e1c261b2d335e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 24 00:59:47 2013 +0200
Versioning watch file for Tryton branch 2.6.
diff --git a/debian/watch b/debian/watch
index 6938afb..0f1575e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://downloads.tryton.org/current/ .*trytond_project_plan-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_project_plan-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-project-plan
More information about the tryton-debian-vcs
mailing list