[tryton-debian-vcs] tryton-modules-party-vcarddav branch debian-wheezy-2.2 created. d95ab724483d2c470add39191c61bf57f56d580a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:04:18 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-party-vcarddav.git;a=commitdiff;h=d95ab724483d2c470add39191c61bf57f56d580a
commit d95ab724483d2c470add39191c61bf57f56d580a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 17:05:15 2013 +0200
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 5d99277..f050dae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-party-vcarddav (2.2.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.2.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 04 May 2013 16:56:59 +0200
+
tryton-modules-party-vcarddav (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit dd13b01c5e3daee603161e506476844ab8cf9035
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 16:50:58 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 8e18927..32e8da5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2009-2012 Cedric Krier
+Copyright: 2009-2013 Cédric Krier
2009-2011 Bertrand Chenal
- 2009-2012 B2CK SPRL
+ 2009-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 4a60d581f6a6db4fa1e1eeda89522f869ff93931
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 15:35:00 2013 +0200
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index 9a576fe..c55750c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.1 - 2012-09-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 0650193..bd944d1 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2013 Cédric Krier.
Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 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 b6b50a4..23bd763 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_party_vcarddav
-Version: 2.2.1
+Version: 2.2.2
Summary: Add CardDAV on parties
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 40383fa..6f053ba 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_CO' : 'vCardDAV de Compañía',
'name_es_ES' : 'Tercero - vCardDAV',
'name_fr_FR': 'Tiers - vCardDAV',
- 'version' : '2.2.1',
+ 'version' : '2.2.2',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 7765405..1fe4365 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-party-vcarddav
-Version: 2.2.1
+Version: 2.2.2
Summary: Add CardDAV on parties
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/webdav.py b/webdav.py
index 594011d..92a8d2f 100644
--- a/webdav.py
+++ b/webdav.py
@@ -253,7 +253,7 @@ class Collection(ModelSQL, ModelView):
val = vcard_obj.execute([party_id],
{'id': party_id, 'ids': [party_id]},
)
- return val[1]
+ return str(val[1])
return super(Collection, self).get_data(uri, cache=cache)
def get_address_data(self, uri, cache=None):
commit 4ae5a4b18e38e3d6dcbb89cc15c7fd2e25775d70
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 50cc76f..5d99277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-party-vcarddav (2.2.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.1.
+ * Refreshing patch 01-support-pywebdav-0.9.8.
+ * Updating year in copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 03 Oct 2012 21:50:29 +0200
+
tryton-modules-party-vcarddav (2.2.0-3) unstable; urgency=low
* Updating maintainers field.
commit f192cd4d22e0bf85555961da81b5918612f87c0b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 21:38:52 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 1707bc7e4e2f6c9204546f32168cbc083a5d5425
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Sep 12 16:55:56 2012 +0200
Refreshing patch 01-support-pywebdav-0.9.8.
diff --git a/debian/patches/01-support-pywebdav-0.9.8 b/debian/patches/01-support-pywebdav-0.9.8
index d32dd6b..cf4dfe3 100644
--- a/debian/patches/01-support-pywebdav-0.9.8
+++ b/debian/patches/01-support-pywebdav-0.9.8
@@ -1,7 +1,7 @@
Author: Mathias Behrle <mathiasb at m9s.biz>
Description: Support new structure of pywebdav > 0.9.4.1.
---- tryton-modules-party-vcarddav.orig/carddav.py 2012-01-02 12:49:50.708128811 +0100
-+++ tryton-modules-party-vcarddav/carddav.py 2012-03-26 16:07:58.090847515 +0200
+--- tryton-modules-party-vcarddav.orig/carddav.py 2011-10-24 23:17:47.000000000 +0200
++++ tryton-modules-party-vcarddav/carddav.py 2012-09-12 16:54:51.489662701 +0200
@@ -1,7 +1,11 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
@@ -16,11 +16,11 @@ Description: Support new structure of pywebdav > 0.9.4.1.
from trytond.protocols.webdav import TrytonDAVInterface, CACHE
from trytond.pool import Pool
from trytond.transaction import Transaction
---- tryton-modules-party-vcarddav.orig/webdav.py 2012-01-02 12:49:50.712128604 +0100
-+++ tryton-modules-party-vcarddav/webdav.py 2012-03-26 16:09:34.807554228 +0200
-@@ -2,7 +2,10 @@
+--- tryton-modules-party-vcarddav.orig/webdav.py 2012-09-12 15:53:56.994986069 +0200
++++ tryton-modules-party-vcarddav/webdav.py 2012-09-12 16:54:51.493662568 +0200
+@@ -1,7 +1,10 @@
+ #This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
- import base64
import urlparse
-from DAV.errors import DAV_NotFound, DAV_Forbidden
+try:
@@ -30,7 +30,7 @@ Description: Support new structure of pywebdav > 0.9.4.1.
from trytond.model import ModelView, ModelSQL
from trytond.tools import reduce_ids
from trytond.transaction import Transaction
-@@ -148,7 +151,10 @@
+@@ -147,7 +150,10 @@
return res
def get_resourcetype(self, uri, cache=None):
commit 79635edcf07ef3f1235fc5cfd865d49e00d9b645
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Sep 12 15:53:57 2012 +0200
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 06decad..9a576fe 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 c00e768..b6b50a4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_party_vcarddav
-Version: 2.2.0
+Version: 2.2.1
Summary: Add CardDAV on parties
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index d6dce77..40383fa 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_CO' : 'vCardDAV de Compañía',
'name_es_ES' : 'Tercero - vCardDAV',
'name_fr_FR': 'Tiers - vCardDAV',
- 'version' : '2.2.0',
+ 'version' : '2.2.1',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/party.py b/party.py
index c3f8fd0..199fc3f 100644
--- a/party.py
+++ b/party.py
@@ -1,6 +1,5 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import base64
import copy
import uuid
from trytond.model import ModelSQL, ModelView, fields
@@ -50,11 +49,23 @@ class Party(ModelSQL, ModelView):
return res
def copy(self, ids, default=None):
+ int_id = isinstance(ids, (int, long))
+ if int_id:
+ ids = [ids]
+
if default is None:
default = {}
- default = default.copy()
- default['uuid'] = self.default_uuid()
- return super(Party, self).copy(ids, default=default)
+
+ new_ids = []
+ for party_id in ids:
+ current_default = default.copy()
+ current_default['uuid'] = self.default_uuid()
+ new_id = super(Party, self).copy(party_id, default=current_default)
+ new_ids.append(new_id)
+
+ if int_id:
+ return new_ids[0]
+ return new_ids
def write(self, ids, vals):
collection_obj = Pool().get('webdav.collection')
@@ -274,7 +285,7 @@ class VCard(Report):
data = ''.join(self.create_vcard(party).serialize() for party in parties)
- return ('vcf', base64.encodestring(data), False, action_report.name)
+ return ('vcf', buffer(data), False, action_report.name)
def create_vcard(self, party):
'''
@@ -286,7 +297,7 @@ class VCard(Report):
import vobject
if party.vcard:
- vcard = vobject.readOne(party.vcard)
+ vcard = vobject.readOne(str(party.vcard))
else:
vcard = vobject.vCard()
if not hasattr(vcard, 'n'):
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 23e55a0..7765405 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-party-vcarddav
-Version: 2.2.0
+Version: 2.2.1
Summary: Add CardDAV on parties
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/webdav.py b/webdav.py
index 68a6156..594011d 100644
--- a/webdav.py
+++ b/webdav.py
@@ -1,6 +1,5 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import base64
import urlparse
from DAV.errors import DAV_NotFound, DAV_Forbidden
from trytond.model import ModelView, ModelSQL
@@ -254,7 +253,7 @@ class Collection(ModelSQL, ModelView):
val = vcard_obj.execute([party_id],
{'id': party_id, 'ids': [party_id]},
)
- return base64.decodestring(val[1])
+ return val[1]
return super(Collection, self).get_data(uri, cache=cache)
def get_address_data(self, uri, cache=None):
@@ -262,11 +261,9 @@ class Collection(ModelSQL, ModelView):
party_id = self.vcard(uri)
if not party_id:
raise DAV_NotFound
- val = vcard_obj.execute([party_id],
- {'id': party_id, 'ids': [party_id]},
- )
- res = base64.decodestring(val[1])
- return res.decode('utf-8')
+ return vcard_obj.execute([party_id],
+ {'id': party_id, 'ids': [party_id]},
+ ).decode('utf-8')
def put(self, uri, data, content_type, cache=None):
import vobject
commit 2b890fd233c525caa3cf5092e27aafcaac48b4c4
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:21:38 2012 +0200
Releasing debian version 2.2.0-3.
diff --git a/debian/changelog b/debian/changelog
index 7a37a18..50cc76f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-party-vcarddav (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:21:32 +0200
+
tryton-modules-party-vcarddav (2.2.0-2) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 9c2b4ace6a5dd648cc9435efd0d35125813c0b11
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 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 f924331..3b97405 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-party-vcarddav.git
commit 1c2d7e87694e64711390226b91bf434cfdf69280
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 08dea775391a47c5498c7476a0658bbac7d53f31
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 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 13b2ef65c8619071b122ca45cb39f5d35fa6084f
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 a699256..f924331 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-party-vcarddav.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-party-vcarddav.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-party-vcarddav.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-party-vcarddav.git
X-Python-Version: >= 2.6
Package: tryton-modules-party-vcarddav
commit e72a673347d5f22cc0e9efe38c9c70423981a70d
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 86c0788..a699256 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-party-vcarddav
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-party-vcarddav
More information about the tryton-debian-vcs
mailing list