merge stable cubicweb-version-3.5.6
authorAdrien Di Mascio <Adrien.DiMascio@logilab.fr>
Mon, 23 Nov 2009 19:33:56 +0100
branchstable
changeset 3909 4e619e97b3fd
parent 3908 07fa1a2f1a56 (diff)
parent 3905 8117ffd92e6a (current diff)
child 3910 5f7c939301a1
merge
--- a/.hgtags	Mon Nov 23 19:08:13 2009 +0100
+++ b/.hgtags	Mon Nov 23 19:33:56 2009 +0100
@@ -82,3 +82,5 @@
 37d025b2aa7735dae4a861059014c560b45b19e6 cubicweb-debian-version-3.5.4-1
 1eca47d59fd932fe23f643ca239cf2408e5b1856 cubicweb-version-3.5.5
 aad818d9d9b6fdb2ffea56c0a9af718c0b69899d cubicweb-debian-version-3.5.5-1
+b79f361839a7251b35eb8378fbc0773de7c8a815 cubicweb-version-3.5.6
+e6225e8e36c6506c774e0a76acc301d8ae1c1028 cubicweb-debian-version-3.5.6-1
--- a/__pkginfo__.py	Mon Nov 23 19:08:13 2009 +0100
+++ b/__pkginfo__.py	Mon Nov 23 19:33:56 2009 +0100
@@ -7,7 +7,7 @@
 distname = "cubicweb"
 modname = "cubicweb"
 
-numversion = (3, 5, 5)
+numversion = (3, 5, 6)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL'
--- a/debian/changelog	Mon Nov 23 19:08:13 2009 +0100
+++ b/debian/changelog	Mon Nov 23 19:33:56 2009 +0100
@@ -1,3 +1,9 @@
+cubicweb (3.5.6-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Adrien Di Mascio <Adrien.DiMascio@logilab.fr>  Mon, 23 Nov 2009 18:55:01 +0100
+
 cubicweb (3.5.5-1) unstable; urgency=low
 
   * new upstream release
--- a/debian/control	Mon Nov 23 19:08:13 2009 +0100
+++ b/debian/control	Mon Nov 23 19:33:56 2009 +0100
@@ -4,6 +4,7 @@
 Maintainer: Logilab S.A. <contact@logilab.fr>
 Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>,
            Julien Jehannet <julien.jehannet@logilab.fr>,
+           Adrien Di Mascio <Adrien.DiMascio@logilab.fr>,
            Aurélien Campéas <aurelien.campeas@logilab.fr>,
            Nicolas Chauvat <nicolas.chauvat@logilab.fr>
 Build-Depends: debhelper (>= 5), python-dev (>=2.4), python-central (>= 0.5)
@@ -76,7 +77,7 @@
 Package: cubicweb-common
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, graphviz, gettext, python-logilab-mtconverter (>= 0.6.0), python-logilab-common (>= 0.44.0), python-yams (>= 0.25.0), python-rql (>= 0.22.3), python-lxml
+Depends: ${python:Depends}, graphviz, gettext, python-logilab-mtconverter (>= 0.6.0), python-logilab-common (>= 0.45.2), python-yams (>= 0.25.0), python-rql (>= 0.22.3), python-lxml
 Recommends: python-simpletal (>= 4.0)
 Conflicts: cubicweb-core
 Replaces: cubicweb-core