[tryton-debian-vcs] tryton-modules-calendar-classification branch debian updated. debian/2.8.0-3-4-ge6dd979
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:33:28 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-calendar-classification.git;a=commitdiff;h=debian/2.8.0-3-4-ge6dd979
commit e6dd97962ca7caf46c1cb6527002ab4f4698b383
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:08 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 81572c6..5930e22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-calendar-classification (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:53:40 +0100
+
tryton-modules-calendar-classification (2.8.0-3) unstable; urgency=low
* Removing pydist-overrides, it is no more needed.
commit 189614cd22b7780d21cb77c8e9d56f46c2b187e8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index 0e4c3d5..0c777b1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-calendar-classification.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit e76756daf05de98a015e7806bff1ee5fd6c0e0da
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:20 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 8b345bf..0e4c3d5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-calendar-classification.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-calendar-classification.git
commit 1b0b2d7ac4e24f9ae966063573884eb57327d48e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:34 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index b82e27d..8376d07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index c38777f..8a69a7d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_calendar_classification
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add classification access to events
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_calendar_classification
===============================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/calendar_.py b/calendar_.py
index c0dfd8c..bef4230 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -24,7 +24,7 @@ class Event:
@classmethod
def search(cls, domain, offset=0, limit=None, order=None, count=False,
- query_string=False):
+ query=False):
if Transaction().user:
domain = domain[:]
domain = [domain,
@@ -40,7 +40,7 @@ class Event:
],
]
return super(Event, cls).search(domain, offset=offset, limit=limit,
- order=order, count=count, query_string=query_string)
+ order=order, count=count, query=query)
@classmethod
def create(cls, vlist):
@@ -89,19 +89,19 @@ class Event:
def read(cls, ids, fields_names=None):
Rule = Pool().get('ir.rule')
cursor = Transaction().cursor
+ table = cls.__table__()
if len(set(ids)) != cls.search([('id', 'in', ids)],
count=True):
cls.raise_user_error('access_error', cls.__doc__)
writable_ids = []
- domain1, domain2 = Rule.domain_get(cls.__name__, mode='write')
- if domain1:
+ domain = Rule.domain_get(cls.__name__, mode='write')
+ if domain:
for i in range(0, len(ids), cursor.IN_MAX):
sub_ids = ids[i:i + cursor.IN_MAX]
- red_sql, red_ids = reduce_ids('id', sub_ids)
- cursor.execute('SELECT id FROM "' + cls._table + '" '
- 'WHERE ' + red_sql + ' AND (' + domain1 + ')',
- red_ids + domain2)
+ red_sql = reduce_ids(table.id, sub_ids)
+ cursor.execute(*table.select(table.id,
+ where=red_sql & table.id.in_(domain)))
writable_ids.extend(x[0] for x in cursor.fetchall())
else:
writable_ids = ids
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index d0b9c6d..4b684c3 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -7,13 +7,5 @@ msgid "Busy"
msgstr "Occupé"
msgctxt "error:calendar.event:"
-msgid "Busy"
-msgstr "Occupé"
-
-msgctxt "error:calendar.event:"
-msgid "Free"
-msgstr "Libre"
-
-msgctxt "error:calendar.event:"
msgid "Free"
msgstr "Libre"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..e9ceab5
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:calendar.event:"
+msgid "Busy"
+msgstr "Zasedeno"
+
+msgctxt "error:calendar.event:"
+msgid "Free"
+msgstr "Prosto"
diff --git a/setup.py b/setup.py
index 356c0d7..7467f5c 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(name='trytond_calendar_classification',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tryton.cfg b/tryton.cfg
index c636627..484a029 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
calendar
ir
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 7749c45..e7abb11 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add classification access to events
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_calendar_classification
===============================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_calendar_classification.egg-info/SOURCES.txt b/trytond_calendar_classification.egg-info/SOURCES.txt
index e73b944..ff569b1 100644
--- a/trytond_calendar_classification.egg-info/SOURCES.txt
+++ b/trytond_calendar_classification.egg-info/SOURCES.txt
@@ -18,6 +18,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.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 7a60220..b9ade18 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 >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_calendar >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-calendar-classification
More information about the tryton-debian-vcs
mailing list