[tryton-debian-vcs] tryton-modules-calendar branch debian-squeeze-1.8 created. cca3945a75077e83257868ace9e037035256ed48
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-squeeze-1.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar.git;a=commitdiff;h=cca3945a75077e83257868ace9e037035256ed48
commit cca3945a75077e83257868ace9e037035256ed48
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 11 19:42:12 2011 +0200
Releasing debian version 1.8.2-0~60squeeze1.
diff --git a/debian/changelog b/debian/changelog
index 2c643ca..534fc59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-calendar (1.8.2-0~60squeeze1) squeeze-backports-1.8; urgency=low
+
+ * Merging upstream version 1.8.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 11 Oct 2011 19:41:03 +0200
+
tryton-modules-calendar (1.8.0-0~60squeeze1) squeeze-backports-1.8; urgency=low
* Moving from deprecated python-support to dh_python2.
commit 59a9949b18a61f73d91c2bcdfe5dedb3eb8349da
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 11 19:40:52 2011 +0200
Merging upstream version 1.8.2.
diff --git a/CHANGELOG b/CHANGELOG
index 4869665..1b03f07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.2 - 2011-09-10
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.1 - 2011-02-13
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index c5e22a2..cd6e5f9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_calendar
-Version: 1.8.1
+Version: 1.8.2
Summary: Add CalDAV support
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 07b6402..06bf1f6 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO' : 'Calendario',
'name_es_ES' : 'Calendario',
'name_fr_FR' : 'Calendrier',
- 'version' : '1.8.1',
+ 'version': '1.8.2',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/calendar.py b/calendar.py
index d5204e8..bec5a57 100644
--- a/calendar.py
+++ b/calendar.py
@@ -280,7 +280,7 @@ class Calendar(ModelSQL, ModelView):
if not calendar_id:
raise DAV_Forbidden
calendar = self.browse(calendar_id)
- if calendar.owner.id != user:
+ if calendar.owner.id != Transaction().user:
raise DAV_Forbidden
ical = vobject.readOne(data)
if ical.method.value == 'REQUEST' \
@@ -675,6 +675,8 @@ class Event(ModelSQL, ModelView):
'SET sequence = sequence + 1 ' \
'WHERE ' + red_sql, red_ids)
+ if not values:
+ return res
for event in self.browse(ids):
if event.calendar.owner \
and (event.organizer == event.calendar.owner.email \
@@ -688,18 +690,20 @@ class Event(ModelSQL, ModelView):
attendee_emails = [x.email for x in event.parent.attendees
if x.status != 'declined'
and x.email != event.parent.organizer]
- if attendee_emails:
- with Transaction().set_user(0):
- event_ids = self.search([
- ('uuid', '=', event.uuid),
- ('calendar.owner.email', 'in', attendee_emails),
- ('id', '!=', event.id),
- ('recurrence', '=', event.recurrence or False),
- ])
- for event2 in self.browse(event_ids):
- if event2.calendar.owner.email in attendee_emails:
- attendee_emails.remove(
- event2.calendar.owner.email)
+ with Transaction().set_user(0):
+ event_ids = self.search([
+ ('uuid', '=', event.uuid),
+ ('id', '!=', event.id),
+ ('recurrence', '=', event.recurrence or False),
+ ])
+ for event2 in self.browse(event_ids):
+ if event2.calendar.owner.email in attendee_emails:
+ attendee_emails.remove(
+ event2.calendar.owner.email)
+ else:
+ event_ids.remove(event2.id)
+ self.delete(event2.id)
+ if event_ids:
self.write(event_ids, self._event2update(event))
if attendee_emails:
with Transaction().set_user(0):
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index e6c9d58..0489bbe 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: 1.8.1
+Version: 1.8.2
Summary: Add CalDAV support
Home-page: http://www.tryton.org/
Author: B2CK
commit 21e8425a226ea38d620397231228fb42d82eee83
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 20 13:08:32 2011 +0200
Releasing debian version 1.8.0-0~60squeeze1.
diff --git a/debian/changelog b/debian/changelog
index 09c012f..2c643ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar (1.8.0-0~60squeeze1) squeeze-backports-1.8; urgency=low
+
+ * Moving from deprecated python-support to dh_python2.
+ * Rebuilding for squeeze-backports-1.8.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 19 Sep 2011 19:31:57 +0200
+
tryton-modules-calendar (1.8.0-2) unstable; urgency=low
* Changing my email address.
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..9aad9d3
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,5 @@
+python_dateutil python-dateutil
+vobject python-vobject
+PyWebDAV python-webdav
+pytz python-tz
+
commit 27ce7e619f537648a65bf4d64c8310dabf6a2e77
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 20 12:59:31 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index 0126468..d63791f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,18 +6,18 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.1
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
+X-Python-Version: >= 2.5
Package: tryton-modules-calendar
Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8), python-dateutil,
python-tz, python-vobject, python-webdav, python-pkg-resources
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Calendar Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 000210b..e32b791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh ${@}
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
--
tryton-modules-calendar
More information about the tryton-debian-vcs
mailing list