[tryton-debian-vcs] tryton-modules-project-plan branch debian-wheezy-2.2 created. 7e73e1ef3826183fe3402d217fd5399496132840
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.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-plan.git;a=commitdiff;h=7e73e1ef3826183fe3402d217fd5399496132840
commit 7e73e1ef3826183fe3402d217fd5399496132840
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:27 2013 +0100
Releasing debian version 2.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index ccf0b5e..84e0556 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project-plan (2.2.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.1.
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 24 Feb 2013 22:12:15 +0100
+
tryton-modules-project-plan (2.2.0-2) unstable; urgency=low
[ Mathias Behrle ]
commit 8ce5dbaeaeed7aaed4c9a0c49edcb0abebaf61c6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:09:31 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 3dd0950..191f77d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2009-2011 Bertrand Chenal
- 2009-2011 Cedric Krier
- 2009-2011 B2CK SPRL
+Copyright: 2009-2011 Bertrand Chenal
+ 2009-2012 Cédric Krier
+ 2009-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit d5c912ee25be2a04b5632ed343db07a638086158
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:47 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index a8c4fa1..627ae05 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit 505c612d1e1108fe2f52486ce7a68d00f46963eb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:09 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 766cb8c..a8c4fa1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-plan.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project-plan.git
commit 3b4b49e26a16d5ab3d4e111f752d13a1a7a81c88
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:39:50 2013 +0100
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 0db227b..4255d8b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2012-11-05
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-25
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 8d81a8f..259dafe 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 Cédric Krier.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2012 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 e2c1551..3f2945e 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.2.0
+Version: 2.2.1
Summary: Add planning capabilities on projects.
Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index 41e4a8a..48a96e6 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Planeación de Proyectos',
'name_es_ES': 'Planificación de proyecto',
'name_fr_FR': 'Planification de projet',
- 'version': '2.2.0',
+ 'version': '2.2.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index bc9a528..9c206d2 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.2.0
+Version: 2.2.1
Summary: Add planning capabilities on projects.
Home-page: http://www.tryton.org/
diff --git a/work.py b/work.py
index ea436f0..bea6b87 100644
--- a/work.py
+++ b/work.py
@@ -121,6 +121,7 @@ class Work(ModelSQL, ModelView):
all_ids = list(set(all_ids))
works = self.browse(all_ids)
+ all_works = set(works)
durations = {}
id2work = {}
@@ -139,15 +140,20 @@ class Work(ModelSQL, ModelView):
durations[work.id] = work.effort / (total_allocation / 100.0)
while leafs:
- parents = set()
for work_id in leafs:
work = id2work[work_id]
+ all_works.remove(work)
if not work.active:
continue
if work.parent and work.parent.id in durations:
durations[work.parent.id] += durations[work_id]
- parents.add(work.parent.id)
- leafs = parents
+ next_leafs = set(w.id for w in all_works)
+ for work in all_works:
+ if not work.parent:
+ continue
+ if work.parent.id in next_leafs and work.parent in works:
+ next_leafs.remove(work.parent.id)
+ leafs = next_leafs
res['duration'] = durations
commit cb7d06eeee050ec9c3a9a05ec4acd5a4b7d9691f
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:26:24 2012 +0200
Releasing debian version 2.2.0-2.
diff --git a/debian/changelog b/debian/changelog
index 8909c84..ccf0b5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+tryton-modules-project-plan (2.2.0-2) unstable; urgency=low
+
+ [ Mathias Behrle ]
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 30 Jun 2012 18:26:09 +0200
+
tryton-modules-project-plan (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit d4f178799b21aefaa9e6db8e0e821fa2eb7a1512
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index b5f15a5..766cb8c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-plan.git
commit 73b426e7eb037451a334f57c844c801b55c3b973
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 780bc6890e1bf740eb9a4d05116d317cd4579123
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 1709502..3dd0950 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2009-2011 Bertrand Chenal
- (C) 2009-2011 Cedric Krier
- (C) 2009-2011 B2CK SPRL
+ 2009-2011 Bertrand Chenal
+ 2009-2011 Cedric Krier
+ 2009-2011 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2010-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2010-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 8c7c1b0031550e4cd6884ed63ebb891a3b21cd38
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index c0efc67..b5f15a5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-project-plan.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project-plan.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project-plan.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project-plan.git
X-Python-Version: >= 2.6
Package: tryton-modules-project-plan
commit 247cad29816438c0a2f96b0f7fb7341a21d84b83
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:31 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 0dae36d..c0efc67 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-project-plan
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
--
tryton-modules-project-plan
More information about the tryton-debian-vcs
mailing list