diff --git a/home:entrouvert:cg14-tests/python-entrouvert/_service b/home:entrouvert:cg14-tests/python-entrouvert/_service index 1152671..b056759 100644 --- a/home:entrouvert:cg14-tests/python-entrouvert/_service +++ b/home:entrouvert:cg14-tests/python-entrouvert/_service @@ -2,6 +2,6 @@ repos.entrouvert.org http - /python-entrouvert.git/snapshot/python-entrouvert-803fa50.tar.gz + /python-entrouvert.git/snapshot/python-entrouvert-87131a8.tar.gz diff --git a/home:entrouvert:cg14-tests/python-entrouvert/python-entrouvert.spec b/home:entrouvert:cg14-tests/python-entrouvert/python-entrouvert.spec index 0948fe0..4991c53 100644 --- a/home:entrouvert:cg14-tests/python-entrouvert/python-entrouvert.spec +++ b/home:entrouvert:cg14-tests/python-entrouvert/python-entrouvert.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define tag 6.2.0 -%define minor 0 -%define commit 803fa50 +%define minor 2 +%define commit 87131a8 %define version %{tag}.%{minor}.g%{commit} diff --git a/home:entrouvert:cg14-tests/wcs-au-quotidien/_service b/home:entrouvert:cg14-tests/wcs-au-quotidien/_service index c6389ee..fcd854a 100644 --- a/home:entrouvert:cg14-tests/wcs-au-quotidien/_service +++ b/home:entrouvert:cg14-tests/wcs-au-quotidien/_service @@ -2,6 +2,6 @@ repos.entrouvert.org http - /auquotidien.git/snapshot/auquotidien-743e9b8.tar.gz + /auquotidien.git/snapshot/auquotidien-ace1cdc.tar.gz diff --git a/home:entrouvert:cg14-tests/wcs-au-quotidien/wcs-au-quotidien.spec b/home:entrouvert:cg14-tests/wcs-au-quotidien/wcs-au-quotidien.spec index b363d8d..f5e8625 100644 --- a/home:entrouvert:cg14-tests/wcs-au-quotidien/wcs-au-quotidien.spec +++ b/home:entrouvert:cg14-tests/wcs-au-quotidien/wcs-au-quotidien.spec @@ -1,9 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define tag 1.12.1 -%define commit 743e9b8 +%define tag 1.12.5 +%define commit ace1cdc # si possible, minor = nombre de commit depuis le tag (à la "git describe") -%define minor 1 +%define minor 3 # si minor == 0 #%define version %{tag} diff --git a/home:entrouvert:cg14-tests/wcs/_service b/home:entrouvert:cg14-tests/wcs/_service index b9d4e75..21d64ab 100644 --- a/home:entrouvert:cg14-tests/wcs/_service +++ b/home:entrouvert:cg14-tests/wcs/_service @@ -2,6 +2,6 @@ repos.entrouvert.org http - /wcs.git/snapshot/wcs-ab5846d.tar.gz + /wcs.git/snapshot/wcs-8fcee2f.tar.gz diff --git a/home:entrouvert:cg14-tests/wcs/wcs-log-post-form.patch b/home:entrouvert:cg14-tests/wcs/wcs-log-post-form.patch deleted file mode 100644 index 6355b90..0000000 --- a/home:entrouvert:cg14-tests/wcs/wcs-log-post-form.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/wcs/forms/root.py b/wcs/forms/root.py -index e1215ea..346d33f 100644 ---- a/wcs/forms/root.py -+++ b/wcs/forms/root.py -@@ -316,6 +316,9 @@ class FormPage(Directory): - - session = get_session() - -+ if get_request().get_method() == 'POST': -+ get_logger().debug('POST data: %r', get_request().form) -+ - existing_formdata = None - if editing: - existing_formdata = editing.data diff --git a/home:entrouvert:cg14-tests/wcs/wcs-workflow-id-as-string.patch b/home:entrouvert:cg14-tests/wcs/wcs-workflow-id-as-string.patch deleted file mode 100644 index 8d12b8b..0000000 --- a/home:entrouvert:cg14-tests/wcs/wcs-workflow-id-as-string.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 959e21356fde24e4557312203c665d2a787a36a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= -Date: Tue, 22 Jul 2014 15:36:36 +0200 -Subject: workflows: makes sure workflow id is exported as a string (#5198) - - -diff --git a/wcs/workflows.py b/wcs/workflows.py -index 8e6b870..66b9af3 100644 ---- a/wcs/workflows.py -+++ b/wcs/workflows.py -@@ -207,7 +207,7 @@ class Workflow(StorableObject): - charset = get_publisher().site_charset - root = ET.Element('workflow') - if include_id and self.id and not str(self.id).startswith('_'): -- root.attrib['id'] = self.id -+ root.attrib['id'] = str(self.id) - ET.SubElement(root, 'name').text = unicode(self.name, charset) - - roles_node = ET.SubElement(root, 'roles') --- -cgit v0.10.2 - diff --git a/home:entrouvert:cg14-tests/wcs/wcs.spec b/home:entrouvert:cg14-tests/wcs/wcs.spec index cc9f924..fe72f87 100644 --- a/home:entrouvert:cg14-tests/wcs/wcs.spec +++ b/home:entrouvert:cg14-tests/wcs/wcs.spec @@ -1,9 +1,9 @@ %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define tag 1.12.4 -%define commit ab5846d +%define tag 1.12.5 +%define commit 8fcee2f # si possible, minor = nombre de commit depuis le tag (à la "git describe") -%define minor 5 +%define minor 23 # si minor == 0 #%define version %{tag}