[tryton-debian-vcs] tryton-modules-calendar branch debian-wheezy-2.2 created. bc9b621ebb08612da257bdcf5ce4f1883e62d773
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:59:29 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.git;a=commitdiff;h=bc9b621ebb08612da257bdcf5ce4f1883e62d773
commit bc9b621ebb08612da257bdcf5ce4f1883e62d773
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:25 2013 +0100
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 8b724e6..897b4d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-calendar (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:43 +0100
+
tryton-modules-calendar (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit f16498f62a949a30327d08f733783104d1f6cbb7
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 838d01ce0d1723a5c423567003730fb85042090f
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 ddadb61..dedf49c 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 eb7e555dc72fd93ae4402406b678c7593cba6e81
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 df8426f..ddadb61 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.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-calendar.git
commit 669b04f7282def2a87df896fb04165973c5c29c4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:46:14 2013 +0100
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index 3dfb301..552ff9b 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 e2fdd86..245f5e7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_calendar
-Version: 2.2.1
+Version: 2.2.2
Summary: Add CalDAV support
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 0903eb8..5f3efd9 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_ES' : 'Calendario',
'name_fr_FR' : '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/calendar.py b/calendar.py
index e5f6e6b..d547ae6 100644
--- a/calendar.py
+++ b/calendar.py
@@ -554,7 +554,7 @@ class Event(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):
'''
@@ -599,11 +599,13 @@ class Event(ModelSQL, ModelView):
new_id = self.copy(event.id, default={
'calendar': calendar_id,
'occurences': False,
+ 'uuid': event.uuid,
})
for occurence in event.occurences:
self.copy(occurence.id, default={
'calendar': calendar_id,
'parent': new_id,
+ 'uuid': occurence.uuid,
})
else:
parent_ids = self.search([
@@ -616,6 +618,7 @@ class Event(ModelSQL, ModelView):
self.copy(event.id, default={
'calendar': parent.calendar.id,
'parent': parent.id,
+ 'uuid': event.uuid,
})
# Restart the cache for event
collection_obj.event.reset()
@@ -716,11 +719,13 @@ class Event(ModelSQL, ModelView):
new_id = self.copy(event.id, default={
'calendar': calendar_id,
'occurences': False,
+ 'uuid': event.uuid,
})
for occurence in event.occurences:
self.copy(occurence.id, default={
'calendar': calendar_id,
'parent': new_id,
+ 'uuid': occurence.uuid,
})
else:
parent_ids = self.search([
@@ -733,6 +738,7 @@ class Event(ModelSQL, ModelView):
self.copy(event.id, default={
'calendar': parent.calendar.id,
'parent': parent.id,
+ 'uuid': event.uuid,
})
# Restart the cache for event
collection_obj.event.reset()
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index 69e15d0..b0d2a3f 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-calendar
-Version: 2.2.1
+Version: 2.2.2
Summary: Add CalDAV support
Home-page: http://www.tryton.org/
Author: B2CK
commit 1a0e21406a36b5aaad87312323fc60cbf6d16669
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 d4c8488..8b724e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar (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:00 +0200
+
tryton-modules-calendar (2.2.0-3) unstable; urgency=low
* Updating maintainers field.
commit 5f6d12660b99f41bf1224235782d47b438d5c3da
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 21:44:28 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 f2e086c7e516f9b92f90b35d3cd24a5bed5ecf81
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Sep 12 15:53:54 2012 +0200
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index b9c58e4..3dfb301 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)
* Basic support of event time-range filter
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 bf5bc32..e2fdd86 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_calendar
-Version: 2.2.0
+Version: 2.2.1
Summary: Add CalDAV support
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index b4aa5d1..0903eb8 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_ES' : 'Calendario',
'name_fr_FR' : '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/calendar.py b/calendar.py
index 24d3635..e5f6e6b 100644
--- a/calendar.py
+++ b/calendar.py
@@ -545,8 +545,8 @@ class Event(ModelSQL, ModelView):
assert name in ('calendar_owner', 'calendar_read_users',
'calendar_write_users'), 'Invalid name'
res = {}
+ name = name[9:]
for event in self.browse(ids):
- name = name[9:]
if name in ('read_users', 'write_users'):
res[event.id] = [x.id for x in event.calendar[name]]
else:
@@ -738,6 +738,25 @@ class Event(ModelSQL, ModelView):
collection_obj.event.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 event_id in ids:
+ current_default = default.copy()
+ current_default['uuid'] = self.default_uuid()
+ new_id = super(Event, self).copy(event_id, default=current_default)
+ new_ids.append(new_id)
+
+ if int_id:
+ return new_ids[0]
+ return new_ids
+
def delete(self, ids):
attendee_obj = Pool().get('calendar.event.attendee')
collection_obj = Pool().get('webdav.collection')
@@ -1066,7 +1085,7 @@ class Event(ModelSQL, ModelView):
ical = vobject.iCalendar()
vevent = ical.add('vevent')
if event.vevent:
- ical.vevent = vobject.readOne(event.vevent)
+ ical.vevent = vobject.readOne(str(event.vevent))
vevent = ical.vevent
ical.vevent.transformToNative()
if event.summary:
@@ -1239,7 +1258,7 @@ class Alarm(ModelSQL):
'''
valarm = None
if alarm.valarm:
- valarm = vobject.readOne(alarm.valarm)
+ valarm = vobject.readOne(str(alarm.valarm))
return valarm
Alarm()
@@ -1357,7 +1376,7 @@ class Attendee(ModelSQL, ModelView):
res = None
if attendee.attendee:
res = vobject.base.textLineToContentLine(
- attendee.attendee.replace('\r\n ', ''))
+ str(attendee.attendee).replace('\r\n ', ''))
else:
res = vobject.base.ContentLine('ATTENDEE', [], '')
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index 7a50dec..69e15d0 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-calendar
-Version: 2.2.0
+Version: 2.2.1
Summary: Add CalDAV support
Home-page: http://www.tryton.org/
Author: B2CK
commit 7098d613e6a9be9132f6acc8fd27ffbd05d516cb
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:11:02 2012 +0200
Releasing debian version 2.2.0-3.
diff --git a/debian/changelog b/debian/changelog
index 66f44af..d4c8488 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-calendar (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:10:59 +0200
+
tryton-modules-calendar (2.2.0-2) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 9e0a1d397aa79e60f62c1c1bd77cddd658bee40b
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 5507306..df8426f 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.git
commit 04092feef014ce1c98f08886980e6644a0e7398c
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 b058a707a50ffd381c0b2ec09794224b9794dc02
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 4c164602da44e044cce3c271a8ccf548e613f5f2
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 f7f63a0..5507306 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.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-calendar.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-calendar.git
X-Python-Version: >= 2.6
Package: tryton-modules-calendar
commit 54a8567b0a4922a86e7c5e91a1ef390c2a1a9982
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 bff6461..f7f63a0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-calendar
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
More information about the tryton-debian-vcs
mailing list