[tryton-debian-vcs] tryton-modules-project branch debian-wheezy-2.2 created. f1a61d09cf8ff98e297bdfb5d23fa087d4a2c12a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:06:38 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.git;a=commitdiff;h=f1a61d09cf8ff98e297bdfb5d23fa087d4a2c12a
commit f1a61d09cf8ff98e297bdfb5d23fa087d4a2c12a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Nov 21 12:04:36 2013 +0100
Removing inadvertently commited .pc directory.
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
commit bf0a53cd6a5cbdd35ca52f384687a2b77a30f509
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 88a8f39..468fd81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project (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:11:54 +0100
+
tryton-modules-project (2.2.0-2) unstable; urgency=low
[ Mathias Behrle ]
commit 3864f029fd0d69ffbb3dd42e43426becf5bc8956
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 0fa03fe..7e08337 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2008-2011 Cedric Krier
- 2008-2011 B2CK SPRL
+Copyright: 2008-2012 Cédric Krier
+ 2008-2012 B2CK SPRL
2009-2011 Bertrand Chenal
License: GPL-3+
commit 5cf4e9957d07d461415aa6950cd75cc09cfab467
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 c87c744..dcdc4e7 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 473cf1747a6470e456f90172a47c2b01de1cd384
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 0067bb3..c87c744 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.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project.git
commit c4adfcba844ca349cc98717e5074305d31e4ae70
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:39:49 2013 +0100
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index db70548..b4966ed 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-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 2ff157b..b1d44e3 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 B2CK SPRL.
Copyright (C) 2009-2011 Bertrand Chenal.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 3361dcb..43900c9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_project
-Version: 2.2.0
+Version: 2.2.1
Summary: Project Module with:
- Project management
diff --git a/__tryton__.py b/__tryton__.py
index 0664ecc..1d944e5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Proyectos',
'name_es_ES': 'Proyecto',
'name_fr_FR': '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.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index 412d685..5c18076 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-project
-Version: 2.2.0
+Version: 2.2.1
Summary: Project Module with:
- Project management
diff --git a/work.py b/work.py
index bfa4650..d8185fd 100644
--- a/work.py
+++ b/work.py
@@ -222,15 +222,20 @@ class Work(ModelSQL, ModelView):
leafs.add(work.id)
while leafs:
- parents = set()
for work_id in leafs:
work = id2work[work_id]
+ works.remove(work)
if not work.active:
continue
if work.parent and work.parent.id in res:
res[work.parent.id] += res[work_id]
- parents.add(work.parent.id)
- leafs = parents
+ next_leafs = set((w.id for w in works))
+ for work in 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
return res
commit d806341d6cf73eddf4970e6dbf2ccca3152c63f9
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:25:29 2012 +0200
Releasing debian version 2.2.0-2.
diff --git a/debian/changelog b/debian/changelog
index dbecce8..88a8f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+tryton-modules-project (2.2.0-2) unstable; urgency=low
+
+ [ Mathias Behrle ]
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in 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:25:25 +0200
+
tryton-modules-project (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit 1be658fbde1ce9f278f3f79dd575291d63a360e5
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 ce36eab..0067bb3 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.git
commit ce60c906811be9bef8ce77c89567d53dd7d238e9
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 41af0b100f0dfa9ae50fb0f625b43e63a76edcfe
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 c0fb258..0fa03fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2008-2011 Cedric Krier
- (C) 2008-2011 B2CK SPRL
- (C) 2009-2011 Bertrand Chenal
+ 2008-2011 Cedric Krier
+ 2008-2011 B2CK SPRL
+ 2009-2011 Bertrand Chenal
License: GPL-3+
Files: icons/*
@@ -13,8 +13,8 @@ License: public-domain
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 6d514f6f1a41ada95f3a97aa06d583116cea190b
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 32ca04e..ce36eab 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.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-project.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-project.git
X-Python-Version: >= 2.6
Package: tryton-modules-project
commit ff5703c5fe6c5602e01b7e9b91d1baad65fc1821
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 b6bc0cd..32ca04e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-project
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
More information about the tryton-debian-vcs
mailing list