Your message dated Mon, 08 Oct 2012 20:25:40 +0100
with message-id <1349724340.11774.16.ca...@jacala.jungle.funky-badger.org>
and subject line Re: Bug#687631: pre-approve unblock:
tryton-modules-calendar/2.2.1-1
has caused the Debian Bug report #687631,
regarding pre-approve unblock: tryton-modules-calendar/2.2.1-1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
687631: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687631
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear release managers,
please approve the upload of unblock: tryton-modules-calendar_2.2.1-1.
The new version contains the upstream bug fix release [1].
The fixes are for
* Convert buffer into string for vobject
* No need to browse events when copying
* don't copy the UUID field when an event is copied: create a new one
* Don't eat name inside the loop in get_calendar_field
Mathias
[1] http://news.tryton.org/2012/09/maintenance-releases-for-supported.html
debdiff attached
unblock: tryton-modules-calendar/2.2.1-1
diff -Nru tryton-modules-calendar-2.2.0/calendar.py tryton-modules-calendar-2.2.1/calendar.py
--- tryton-modules-calendar-2.2.0/calendar.py 2011-08-21 11:21:20.000000000 +0200
+++ tryton-modules-calendar-2.2.1/calendar.py 2012-08-07 12:35:53.000000000 +0200
@@ -545,8 +545,8 @@
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 @@
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 @@
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 @@
'''
valarm = None
if alarm.valarm:
- valarm = vobject.readOne(alarm.valarm)
+ valarm = vobject.readOne(str(alarm.valarm))
return valarm
Alarm()
@@ -1357,7 +1376,7 @@
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 -Nru tryton-modules-calendar-2.2.0/CHANGELOG tryton-modules-calendar-2.2.1/CHANGELOG
--- tryton-modules-calendar-2.2.0/CHANGELOG 2011-10-24 18:53:05.000000000 +0200
+++ tryton-modules-calendar-2.2.1/CHANGELOG 2012-09-02 15:51:07.000000000 +0200
@@ -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 -Nru tryton-modules-calendar-2.2.0/COPYRIGHT tryton-modules-calendar-2.2.1/COPYRIGHT
--- tryton-modules-calendar-2.2.0/COPYRIGHT 2011-07-06 09:56:10.000000000 +0200
+++ tryton-modules-calendar-2.2.1/COPYRIGHT 2012-09-02 15:50:28.000000000 +0200
@@ -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 -Nru tryton-modules-calendar-2.2.0/debian/changelog tryton-modules-calendar-2.2.1/debian/changelog
--- tryton-modules-calendar-2.2.0/debian/changelog 2012-06-30 18:11:01.000000000 +0200
+++ tryton-modules-calendar-2.2.1/debian/changelog 2012-09-12 15:54:58.000000000 +0200
@@ -1,3 +1,9 @@
+tryton-modules-calendar (2.2.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.1.
+
+ -- Mathias Behrle <mathi...@m9s.biz> Wed, 12 Sep 2012 15:54:57 +0200
+
tryton-modules-calendar (2.2.0-3) unstable; urgency=low
* Updating maintainers field.
diff -Nru tryton-modules-calendar-2.2.0/PKG-INFO tryton-modules-calendar-2.2.1/PKG-INFO
--- tryton-modules-calendar-2.2.0/PKG-INFO 2011-10-24 18:53:34.000000000 +0200
+++ tryton-modules-calendar-2.2.1/PKG-INFO 2012-09-02 15:51:10.000000000 +0200
@@ -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 -Nru tryton-modules-calendar-2.2.0/trytond_calendar.egg-info/PKG-INFO tryton-modules-calendar-2.2.1/trytond_calendar.egg-info/PKG-INFO
--- tryton-modules-calendar-2.2.0/trytond_calendar.egg-info/PKG-INFO 2011-10-24 18:53:34.000000000 +0200
+++ tryton-modules-calendar-2.2.1/trytond_calendar.egg-info/PKG-INFO 2012-09-02 15:51:09.000000000 +0200
@@ -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 -Nru tryton-modules-calendar-2.2.0/__tryton__.py tryton-modules-calendar-2.2.1/__tryton__.py
--- tryton-modules-calendar-2.2.0/__tryton__.py 2011-10-24 18:53:14.000000000 +0200
+++ tryton-modules-calendar-2.2.1/__tryton__.py 2011-10-24 18:55:30.000000000 +0200
@@ -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': 'i...@b2ck.com',
'website': 'http://www.tryton.org/',
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
On Mon, 2012-10-08 at 10:14 +0200, Mathias Behrle wrote:
> * Betr.: " Re: Bug#687631: pre-approve unblock:
> tryton-modules-calendar/2.2.1-1" (Wed, 03 Oct 2012 19:08:31 +0100):
>
> > Please go ahead, and let us know once the package has been in unstable
> > for a few days.
>
> Package was uploaded to unstable on 2012-10-05.
Unblocked.
Regards,
Adam
--- End Message ---
