[tryton-debian-vcs] tryton-modules-calendar-todo branch debian-wheezy-2.2 created. 107bfa10f8f69b14548f25ee5bc4e63b2638719b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:00:15 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-calendar-todo.git;a=commitdiff;h=107bfa10f8f69b14548f25ee5bc4e63b2638719b
commit 107bfa10f8f69b14548f25ee5bc4e63b2638719b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:26 2013 +0100
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 896cb1a..9971cdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-calendar-todo (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:10:56 +0100
+
tryton-modules-calendar-todo (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit 70708cafccdd68891deff6fca6219aa2c9323bcd
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 8e18927..4227f73 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:
- 2009-2012 Cedric Krier
+Copyright: 2009-2012 Cédric Krier
2009-2011 Bertrand Chenal
2009-2012 B2CK SPRL
License: GPL-3+
commit 437699f634c95868d902b2d287b0f0b0707f98fe
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 56af3f4..1763903 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 6c819f1be021142044cf509250c23fca7a0de8c6
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 e3f1f3e..56af3f4 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-calendar-todo.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-calendar-todo.git
commit 8096ecdbc1525473c65a80145c211c61b72e3c58
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:46:15 2013 +0100
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index e56db5b..77db8db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-11-05
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.1 - 2012-09-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 4a68e38..e5b8c94 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_calendar_todo
-Version: 2.2.1
+Version: 2.2.2
Summary: Add Todo support on CalDAV
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 0601ce4..7f5e1cb 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_ES': 'Calendario de tareas',
'name_fr_FR' : 'Tâche Calendrier',
'name_ru_RU' : 'Задачи для календаря',
- 'version' : '2.2.1',
+ 'version' : '2.2.2',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/todo.py b/todo.py
index 606e7cd..fd7a394 100644
--- a/todo.py
+++ b/todo.py
@@ -177,7 +177,7 @@ class Todo(ModelSQL, ModelView):
return res
def search_calendar_field(self, name, clause):
- return [('calendar.' + name[9:],) + clause[1:]]
+ return [('calendar.' + name[9:],) + tuple(clause[1:])]
def check_recurrence(self, ids):
'''
@@ -222,11 +222,13 @@ class Todo(ModelSQL, ModelView):
new_id = self.copy(todo.id, default={
'calendar': calendar_id,
'occurences': False,
+ 'uuid': todo.uuid,
})
for occurence in todo.occurences:
self.copy(occurence.id, default={
'calendar': calendar_id,
'parent': new_id,
+ 'uuid': occurence.uuid,
})
else:
parent_ids = self.search([
@@ -239,6 +241,7 @@ class Todo(ModelSQL, ModelView):
self.copy(todo.id, default={
'calendar': parent.calendar.id,
'parent': parent.id,
+ 'uuid': todo.uuid,
})
# Restart the cache for todo
collection_obj.todo.reset()
@@ -336,11 +339,13 @@ class Todo(ModelSQL, ModelView):
new_id = self.copy(todo.id, default={
'calendar': calendar_id,
'occurences': False,
+ 'uuid': todo.uuid,
})
for occurence in todo.occurences:
self.copy(occurence.id, default={
'calendar': calendar_id,
'parent': new_id,
+ 'uuid': occurence.uuid,
})
else:
parent_ids = self.search([
@@ -353,6 +358,7 @@ class Todo(ModelSQL, ModelView):
self.copy(todo.id, default={
'calendar': parent.calendar.id,
'parent': parent.id,
+ 'uuid': todo.uuid,
})
# Restart the cache for todo
collection_obj.todo.reset()
@@ -420,7 +426,7 @@ class Todo(ModelSQL, ModelView):
new_ids = []
for todo_id in ids:
current_default = default.copy()
- current_default['uuid'] = self.default_uuid()
+ current_default.setdefault('uuid', self.default_uuid())
new_id = super(Todo, self).copy(todo_id, default=current_default)
new_ids.append(new_id)
diff --git a/trytond_calendar_todo.egg-info/PKG-INFO b/trytond_calendar_todo.egg-info/PKG-INFO
index dbe21be..d7b3570 100644
--- a/trytond_calendar_todo.egg-info/PKG-INFO
+++ b/trytond_calendar_todo.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-calendar-todo
-Version: 2.2.1
+Version: 2.2.2
Summary: Add Todo support on CalDAV
Home-page: http://www.tryton.org/
Author: B2CK
commit c1d77eb4363e2d0b2efbe90061d8fd7e0539b9d4
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 bdea06f..896cb1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar-todo (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:23 +0200
+
tryton-modules-calendar-todo (2.2.0-3) unstable; urgency=low
* Updating maintainers field.
commit 21f34200ce03305bdd5aeee63dbcb54260dd07a0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 21:42:30 2012 +0200
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index 0a80137..8e18927 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:
- 2009-2011 Cedric Krier
+ 2009-2012 Cedric Krier
2009-2011 Bertrand Chenal
- 2009-2011 B2CK SPRL
+ 2009-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 24359eb2acb6cf56a22ca9f2ddf0f68642225598
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Sep 12 15:53:56 2012 +0200
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 72099a7..e56db5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2012-09-02
+* 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 1245dd5..0650193 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2012 Cédric Krier.
Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+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 782fc36..4a68e38 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_calendar_todo
-Version: 2.2.0
+Version: 2.2.1
Summary: Add Todo support on CalDAV
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 244dd66..0601ce4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_ES': 'Calendario de tareas',
'name_fr_FR' : 'Tâche Calendrier',
'name_ru_RU' : 'Задачи для календаря',
- 'version' : '2.2.0',
+ 'version' : '2.2.1',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/todo.py b/todo.py
index 6226af9..606e7cd 100644
--- a/todo.py
+++ b/todo.py
@@ -409,6 +409,25 @@ class Todo(ModelSQL, ModelView):
collection_obj.todo.reset()
return res
+ def copy(self, ids, default=None):
+ int_id = isinstance(ids, (int, long))
+ if int_id:
+ ids = [ids]
+
+ if default is None:
+ default = {}
+
+ new_ids = []
+ for todo_id in ids:
+ current_default = default.copy()
+ current_default['uuid'] = self.default_uuid()
+ new_id = super(Todo, self).copy(todo_id, default=current_default)
+ new_ids.append(new_id)
+
+ if int_id:
+ return new_ids[0]
+ return new_ids
+
def ical2values(self, todo_id, ical, calendar_id, vtodo=None):
'''
Convert iCalendar to values for create or write
@@ -687,7 +706,7 @@ class Todo(ModelSQL, ModelView):
ical = vobject.iCalendar()
vtodo = ical.add('vtodo')
if todo.vtodo:
- ical.vtodo = vobject.readOne(todo.vtodo)
+ ical.vtodo = vobject.readOne(str(todo.vtodo))
vtodo = ical.vtodo
ical.vtodo.transformToNative()
if todo.summary:
diff --git a/trytond_calendar_todo.egg-info/PKG-INFO b/trytond_calendar_todo.egg-info/PKG-INFO
index 41e6827..dbe21be 100644
--- a/trytond_calendar_todo.egg-info/PKG-INFO
+++ b/trytond_calendar_todo.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-calendar-todo
-Version: 2.2.0
+Version: 2.2.1
Summary: Add Todo support on CalDAV
Home-page: http://www.tryton.org/
Author: B2CK
commit 3a4afe93c626a49496dfb42a54b625bba8c7aca5
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:12:54 2012 +0200
Releasing debian version 2.2.0-3.
diff --git a/debian/changelog b/debian/changelog
index 818d944..bdea06f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-calendar-todo (2.2.0-3) unstable; urgency=low
+
+ * 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:12:45 +0200
+
tryton-modules-calendar-todo (2.2.0-2) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 68d544a46db1fdd26c48b1984c5e9635c6aa26aa
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:28 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 47240ca..e3f1f3e 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-calendar-todo.git
commit 2c4157612f0b0566dffad1760f49dcbeef174ec9
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 4e0b71ef6d84070257a07d2312fcfaa3c5221a65
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:23 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 31cd674..0a80137 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 Cedric Krier
- (C) 2009-2011 Bertrand Chenal
- (C) 2009-2011 B2CK SPRL
+ 2009-2011 Cedric Krier
+ 2009-2011 Bertrand Chenal
+ 2009-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 00e233382a627724c54dc5d8b8821e1537117723
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 baaab13..47240ca 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-calendar-todo.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-todo.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-calendar-todo.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-calendar-todo.git
X-Python-Version: >= 2.6
Package: tryton-modules-calendar-todo
commit 03b4856c08af1a36f8687497a2a2b75a782dc3e3
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:30 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 3a81163..baaab13 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-calendar-todo
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-calendar-todo
More information about the tryton-debian-vcs
mailing list