[tryton-debian-vcs] tryton-modules-timesheet branch debian-wheezy-2.2 created. 1d99b225f6385b318bbf58c3d0ee38cddd74727d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:12:43 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-timesheet.git;a=commitdiff;h=1d99b225f6385b318bbf58c3d0ee38cddd74727d
commit 1d99b225f6385b318bbf58c3d0ee38cddd74727d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:29 2013 +0100
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 6ae33d3..4ce739b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-timesheet (2.2.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.2.
+ * 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:14:08 +0100
+
tryton-modules-timesheet (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit 9a76dab1a3e37ec6b9ffa5a62fb522bd8075cefc
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 c45c9f8..1bd3064 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2008-2011 Cedric Krier
+Copyright: 2008-2012 Cédric Krier
2008-2011 Bertrand Chenal
2008-2012 B2CK SPRL
License: GPL-3+
commit 0eb7decc4945399e3ef9f9b14ec2941edd6fcf09
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 fde67ca..60d5e89 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 2a72ca60eff566703aa3c4e3072f2ac0394e2a3f
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 dd19523..fde67ca 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-timesheet.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-timesheet.git
commit e3d0e55437da884e070186a3c9e3e2cc535d56b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:46:24 2013 +0100
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index 331ee88..27c57db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-12-23
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.1 - 2012-09-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index f654cd7..26f578f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2012 Cédric Krier.
Copyright (C) 2008-2011 Bertrand Chenal.
Copyright (C) 2008-2012 B2CK SPRL.
diff --git a/PKG-INFO b/PKG-INFO
index 4eff3d9..7735c68 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_timesheet
-Version: 2.2.1
+Version: 2.2.2
Summary: Timesheet Module with:
- Work
- Timesheet line
diff --git a/__tryton__.py b/__tryton__.py
index 38a08a4..ea76f6b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Partes de trabajo',
'name_fr_FR': 'Feuille de présence',
'name_nl_NL': 'Tijdregistratie',
- 'version': '2.2.1',
+ 'version': '2.2.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/line.py b/line.py
index b3107dc..d8dcd1a 100644
--- a/line.py
+++ b/line.py
@@ -19,7 +19,7 @@ class Line(ModelSQL, ModelView):
hours = fields.Float('Hours', digits=(16, 2), required=True)
work = fields.Many2One('timesheet.work', 'Work',
required=True, select=1, domain=[
- ('timesheet_available', '=', 'True'),
+ ('timesheet_available', '=', True),
])
description = fields.Char('Description')
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 602e375..9c323fa 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-timesheet
-Version: 2.2.1
+Version: 2.2.2
Summary: Timesheet Module with:
- Work
- Timesheet line
commit 76f57607fd35d25c8e9ae567ec01385347fc4172
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 23:00:00 2012 +0200
Releasing debian version 2.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index bc4fa96..6ae33d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-timesheet (2.2.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.1.
+ * Updating year in copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 03 Oct 2012 21:50:38 +0200
+
tryton-modules-timesheet (2.2.0-2) unstable; urgency=low
[ Mathias Behrle ]
commit 37641ac473e275558c0db30133b6d687a2d63a0a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 21:40:24 2012 +0200
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index 022b33e..c45c9f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Files: *
Copyright:
2008-2011 Cedric Krier
2008-2011 Bertrand Chenal
- 2008-2011 B2CK SPRL
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 3782f664c0735302e3b7929c9ceadf777c930ef6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Sep 12 15:53:57 2012 +0200
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index e519b5a..331ee88 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2012-09-01
+* 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 3d2324b..f654cd7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2008-2011 Cédric Krier.
Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-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 ed7202c..4eff3d9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_timesheet
-Version: 2.2.0
+Version: 2.2.1
Summary: Timesheet Module with:
- Work
- Timesheet line
diff --git a/__tryton__.py b/__tryton__.py
index 35fe407..38a08a4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Partes de trabajo',
'name_fr_FR': 'Feuille de présence',
'name_nl_NL': 'Tijdregistratie',
- 'version': '2.2.0',
+ 'version': '2.2.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 4d00859..602e375 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-timesheet
-Version: 2.2.0
+Version: 2.2.1
Summary: Timesheet Module with:
- Work
- Timesheet line
diff --git a/work.py b/work.py
index 4e32e2a..2671816 100644
--- a/work.py
+++ b/work.py
@@ -80,7 +80,7 @@ class Work(ModelSQL, ModelView):
('parent', 'child_of', ids),
])
# force inactive ids to be in all_ids
- all_ids = all_ids + ids
+ all_ids = list(set(all_ids + ids))
clause = "SELECT work, sum(hours) FROM timesheet_line "\
"WHERE work IN (%s) "\
% ",".join(('%s',) * len(all_ids))
commit 6542b1b55aa40531037df03321aa4784403dad45
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:35:29 2012 +0200
Releasing debian version 2.2.0-2.
diff --git a/debian/changelog b/debian/changelog
index 2d1c9d1..bc4fa96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+tryton-modules-timesheet (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:35:25 +0200
+
tryton-modules-timesheet (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit a549e5cb53b1dbbf476525b383f9ef70598ce5f8
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 6d158f3..dd19523 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-timesheet.git
commit 646be2f3479a36bb61f3e79167cf0cd56eb5e22f
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:37 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 7428998fa09ff3dc886737a2b738c53cbaad788c
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:25 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index d2ad74d..022b33e 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) 2008-2011 Cedric Krier
- (C) 2008-2011 Bertrand Chenal
- (C) 2008-2011 B2CK SPRL
+ 2008-2011 Cedric Krier
+ 2008-2011 Bertrand Chenal
+ 2008-2011 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 63c91cedd5288187d348e26b9d6ee5d033befa42
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 affcfab..6d158f3 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-timesheet.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-timesheet.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-timesheet.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-timesheet.git
X-Python-Version: >= 2.6
Package: tryton-modules-timesheet
commit 3e7d1895de0055eff29c842f2a2a447ba06e9bac
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:32 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 755abd8..affcfab 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-timesheet
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-timesheet
More information about the tryton-debian-vcs
mailing list