merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 05 Mar 2010 18:20:18 +0100
branchstable
changeset 4822 ededce6779b5
parent 4818 9f9bfbcdecfd (current diff)
parent 4821 a198d6392466 (diff)
child 4823 e833520870ee
child 4824 b01973eff0f7
merge
.hgtags
--- a/.hgtags	Fri Mar 05 18:07:39 2010 +0100
+++ b/.hgtags	Fri Mar 05 18:20:18 2010 +0100
@@ -104,3 +104,4 @@
 d2ba93fcb8da95ceab08f48f8149a480215f149c cubicweb-debian-version-3.6.0-1
 4ae30c9ca11b1edad67d25b76fce672171d02023 cubicweb-version-3.6.1
 b9cdfe3341d1228687515d9af8686971ad5e6f5c cubicweb-debian-version-3.6.1-1
+0a16f07112b90fb61d2e905855fece77e5a7e39c cubicweb-debian-version-3.6.1-2
--- a/debian/changelog	Fri Mar 05 18:07:39 2010 +0100
+++ b/debian/changelog	Fri Mar 05 18:20:18 2010 +0100
@@ -1,3 +1,9 @@
+cubicweb (3.6.1-2) unstable; urgency=low
+
+  * remove depends to python-elementtree (included in python>=2.5)
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Fri, 04 Mar 2010 14:43:01 +0100
+
 cubicweb (3.6.1-1) unstable; urgency=low
 
   * new upstream release
--- a/debian/control	Fri Mar 05 18:07:39 2010 +0100
+++ b/debian/control	Fri Mar 05 18:20:18 2010 +0100
@@ -62,7 +62,7 @@
 Package: cubicweb-web
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, cubicweb-common (= ${source:Version}), python-simplejson (>= 1.3), python-elementtree
+Depends: ${python:Depends}, cubicweb-common (= ${source:Version}), python-simplejson (>= 1.3)
 Recommends: python-docutils, python-vobject, fckeditor, python-fyzz, python-pysixt, fop, python-imaging
 Description: web interface library for the CubicWeb framework
  CubicWeb is a semantic web application framework.