[tryton-debian-vcs] tryton-modules-calendar branch debian updated. debian/3.0.0-2-2-g3a4edc3

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Dec 11 13:46:48 UTC 2013


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar.git;a=commitdiff;h=debian/3.0.0-2-2-g3a4edc3

commit 3a4edc3023fd1a3aa270bf49a74d6810e44c998b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 14:46:08 2013 +0100

    Releasing debian version 3.0.1-1.

diff --git a/debian/changelog b/debian/changelog
index ddc3a4e..eb92dd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-calendar (3.0.1-1) unstable; urgency=low
+
+  * Merging upstream version 3.0.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 11 Dec 2013 12:59:50 +0100
+
 tryton-modules-calendar (3.0.0-2) unstable; urgency=low
 
   * Pointing VCS fields to new location on alioth.debian.org.
commit 8e20b91145f7bdeeb0bcc888fc18f520258fbbff
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 12:57:48 2013 +0100

    Merging upstream version 3.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index 32778ca..8da512a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.1 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.0 - 2013-10-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 2845884..9569404 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_calendar
-Version: 3.0.0
+Version: 3.0.1
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/calendar_.py b/calendar_.py
index 83fed4f..8abcc3b 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -631,14 +631,14 @@ class Event(ModelSQL, ModelView):
             'location': self.location.id if self.location else None,
             'status': self.status,
             'organizer': self.organizer,
-            'rdates': [('delete_all',)] + ('create', [rdate._date2update()
-                for rdate in self.rdates]),
-            'exdates': [('delete_all',)] + ('create', [exdate._date2update()
-                for exdate in self.exdates]),
-            'rrules': [('delete_all',)] + ('create', [rrule._date2update()
-                for rrule in self.rrules]),
-            'exrules': [('delete_all',)] + ('create', [exrule._date2update()
-                for exrule in self.exrules]),
+            'rdates': [('delete_all',)] + [('create', [rdate._date2update()
+                        for rdate in self.rdates])],
+            'exdates': [('delete_all',)] + [('create', [exdate._date2update()
+                        for exdate in self.exdates])],
+            'rrules': [('delete_all',)] + [('create', [rrule._date2update()
+                        for rrule in self.rrules])],
+            'exrules': [('delete_all',)] + [('create', [exrule._date2update()
+                        for exrule in self.exrules])],
             }
 
     @classmethod
@@ -806,7 +806,7 @@ class Event(ModelSQL, ModelView):
         Alarm = pool.get('calendar.event.alarm')
         Rdate = pool.get('calendar.event.rdate')
         Exdate = pool.get('calendar.event.exdate')
-        Rrule = pool.get('calendar.rrule')
+        Rrule = pool.get('calendar.event.rrule')
         Exrule = pool.get('calendar.event.exrule')
 
         vevents = []
diff --git a/tryton.cfg b/tryton.cfg
index 6b62a9f..bdc9497 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.0
+version=3.0.1
 depends:
     ir
     res
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index 4345681..26a661b 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-calendar
-Version: 3.0.0
+Version: 3.0.1
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-calendar



More information about the tryton-debian-vcs mailing list