[tryton-debian-vcs] tryton-modules-calendar-classification branch debian updated. debian/3.8.0-2-5-g5530024
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:10:23 UTC 2016
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-classification.git;a=commitdiff;h=debian/3.8.0-2-5-g5530024
commit 55300246f91f285f5437c70cdc723fd1f7d666b2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:19 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 73473c4..814bb22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-calendar-classification (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:28:02 +0200
+
tryton-modules-calendar-classification (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 680723c28421e0a72a1e3dcaf155a81dffb05bb7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index a2d6f9a..fdb1c71 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2009-2015 Cédric Krier
+Copyright: 2009-2016 Cédric Krier
2009-2012 Bertrand Chenal
- 2009-2015 B2CK SPRL
+ 2009-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
2010-2012 Daniel Baumann <daniel at debian.org>
- 2012-2015 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 46faed9c1dd4a5639478ef88fed16250e9c5aad9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:15 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 0b63427..9c883db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index a20c45d..6adf4fe 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_calendar_classification
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add classification access to events
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index e58f58d..b8538d9 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,9 +4,8 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:calendar.event:"
msgid "Busy"
-msgstr ""
+msgstr "Ocupado"
-#, fuzzy
msgctxt "error:calendar.event:"
msgid "Free"
-msgstr "Gratis"
+msgstr "Libre"
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index 824b918..33c6e27 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -4,8 +4,8 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:calendar.event:"
msgid "Busy"
-msgstr ""
+msgstr "ບໍ່ວ່າງ"
msgctxt "error:calendar.event:"
msgid "Free"
-msgstr ""
+msgstr "ວ່າງ"
diff --git a/tryton.cfg b/tryton.cfg
index ee3443f..aec3558 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
calendar
ir
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 53bba65..00585a0 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-calendar-classification
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add classification access to events
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_calendar_classification.egg-info/SOURCES.txt b/trytond_calendar_classification.egg-info/SOURCES.txt
index 5b6318a..f3b36b1 100644
--- a/trytond_calendar_classification.egg-info/SOURCES.txt
+++ b/trytond_calendar_classification.egg-info/SOURCES.txt
@@ -22,11 +22,13 @@ tryton.cfg
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
+./locale/lo_LA.po
./locale/lt_LT.po
./locale/nl_NL.po
./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
+./locale/zh_CN.po
locale/bg_BG.po
locale/ca_ES.po
locale/cs_CZ.po
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index 6d62a65..c7a978d 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
vobject >= 0.8.0
trytond_calendar >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit a5002e9308bde616f192d667bad2b5e4a1203eb5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:25:57 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 3db1f4b..0b63427 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 718e584..6f27a5e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2015 Cédric Krier.
+Copyright (C) 2009-2016 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2015 B2CK SPRL.
+Copyright (C) 2009-2016 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 e0a0d30..a20c45d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_calendar_classification
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add classification access to events
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_calendar_classification
===============================
@@ -55,6 +55,8 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/calendar_.py b/calendar_.py
index a9a8960..35c93e7 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -44,7 +44,7 @@ class Event:
if Transaction().user:
# Clear the cache as it was not cleaned for confidential
- cache = Transaction().cursor.get_cache()
+ cache = Transaction().get_cache()
cache.pop(cls.__name__, None)
return records
@@ -94,7 +94,7 @@ class Event:
@classmethod
def read(cls, ids, fields_names=None):
Rule = Pool().get('ir.rule')
- cursor = Transaction().cursor
+ cursor = Transaction().connection.cursor()
table = cls.__table__()
if len(set(ids)) != cls.search([('id', 'in', ids)],
count=True):
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
new file mode 100644
index 0000000..824b918
--- /dev/null
+++ b/locale/lo_LA.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:"
+msgid "Busy"
+msgstr ""
+
+msgctxt "error:calendar.event:"
+msgid "Free"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
new file mode 100644
index 0000000..824b918
--- /dev/null
+++ b/locale/zh_CN.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:"
+msgid "Busy"
+msgstr ""
+
+msgctxt "error:calendar.event:"
+msgid "Free"
+msgstr ""
diff --git a/setup.py b/setup.py
index c883ded..4e89d00 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ if minor_version % 2:
requires = ['vobject >= 0.8.0']
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -74,6 +74,8 @@ setup(name=name,
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index 8e96dfc..ee3443f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
calendar
ir
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index ed7a9ae..53bba65 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-calendar-classification
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add classification access to events
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_calendar_classification
===============================
@@ -55,6 +55,8 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_calendar_classification.egg-info/SOURCES.txt b/trytond_calendar_classification.egg-info/SOURCES.txt
index 19375f3..5b6318a 100644
--- a/trytond_calendar_classification.egg-info/SOURCES.txt
+++ b/trytond_calendar_classification.egg-info/SOURCES.txt
@@ -40,11 +40,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
trytond_calendar_classification.egg-info/PKG-INFO
trytond_calendar_classification.egg-info/SOURCES.txt
trytond_calendar_classification.egg-info/dependency_links.txt
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index 0bf93b5..6d62a65 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
vobject >= 0.8.0
-trytond_calendar >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_calendar >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-calendar-classification
More information about the tryton-debian-vcs
mailing list