[tryton-debian-vcs] tryton-modules-party-vcarddav branch debian-wheezy-2.6 created. 7f13c49c7a51d39f87ac28d979c0619ef4014ca4
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.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-party-vcarddav.git;a=commitdiff;h=7f13c49c7a51d39f87ac28d979c0619ef4014ca4
commit 7f13c49c7a51d39f87ac28d979c0619ef4014ca4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 12:07:18 2013 +0200
Releasing debian version 2.6.1-1.
diff --git a/debian/changelog b/debian/changelog
index f31146a..75d7e04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-party-vcarddav (2.6.1-1) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704387).
+ * Versioning watch file for Tryton branch 2.6.
+ * Improving update of major version in Depends.
+ * Merging upstream version 2.6.1.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 04 May 2013 02:40:01 +0200
+
tryton-modules-party-vcarddav (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 58aac63bb32cacf73dfb773ca1210e9c7dbb2ad4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 02:13:01 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index cbad1dd..34d373e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2009-2012 Cédric Krier
+Copyright: 2009-2013 Cédric Krier
2009-2012 Bertrand Chenal
- 2009-2012 B2CK SPRL
+ 2009-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 5cc28c0e7e16ad71107c348f7ccc90dd3645033a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 01:57:01 2013 +0200
Merging upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index 2a0dd2b..5601772 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 8ad4b79..39f9196 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-2012 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 728f9a4..843c499 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.6.0
+Version: 2.6.1
Summary: Tryton module for CardDAV
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/party.py b/party.py
index 94aac3d..8668d6a 100644
--- a/party.py
+++ b/party.py
@@ -271,7 +271,7 @@ class VCard(Report):
raise Exception('Error', 'Report (%s) not find!' % cls.__name__)
action_report = action_reports[0]
- parties = Party(ids)
+ parties = Party.browse(ids)
data = ''.join(cls.create_vcard(party).serialize()
for party in parties)
diff --git a/tryton.cfg b/tryton.cfg
index e9fe934..cc3992b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
depends:
ir
party
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 4ec2583..d4fde30 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.6.0
+Version: 2.6.1
Summary: Tryton module for CardDAV
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/webdav.py b/webdav.py
index ee65adf..4dadbae 100644
--- a/webdav.py
+++ b/webdav.py
@@ -1,6 +1,7 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from pywebdav.lib.errors import DAV_NotFound, DAV_Forbidden
+from pywebdav.lib.constants import COLLECTION, OBJECT
from trytond.tools import reduce_ids
from trytond.transaction import Transaction
from trytond.cache import Cache
@@ -153,7 +154,6 @@ class Collection:
@classmethod
def get_resourcetype(cls, uri, cache=None):
- from DAV.constants import COLLECTION, OBJECT
party_id = cls.vcard(uri)
if party_id:
return OBJECT
@@ -262,7 +262,7 @@ class Collection:
if party_id:
val = Vcard.execute([party_id],
{'id': party_id, 'ids': [party_id]})
- return val[1]
+ return str(val[1])
return super(Collection, cls).get_data(uri, cache=cache)
@classmethod
commit af33e1012a55bad4dfe537a219936286c03199b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index 686b6b8..1b3e84a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-party-vcarddav
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-party (>= 2.6), python-vobject, python-webdav,
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}), python-vobject, python-webdav,
python-pkg-resources
Description: Tryton Application Platform (Party CardDAV Module)
Tryton is a high-level general purpose application platform written in Python
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit 0e9b3b2dadceea243351d8168a980cd9eb857e1d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 24 00:59:42 2013 +0200
Versioning watch file for Tryton branch 2.6.
diff --git a/debian/watch b/debian/watch
index 2b7ded5..5aad624 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://downloads.tryton.org/current/ .*trytond_party_vcarddav-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_party_vcarddav-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-party-vcarddav
More information about the tryton-debian-vcs
mailing list