Commit 0340127a authored by Julien Cristau's avatar Julien Cristau
Browse files

merge with 3.21.5-2

......@@ -529,3 +529,4 @@ d3b92d3a7db098b25168beef9b3ee7b36263a652 centos/3.21.4-1
e0572a786e6b4b0965d405dd95cf5bce754005a2 3.21.5
e0572a786e6b4b0965d405dd95cf5bce754005a2 debian/3.21.5-1
e0572a786e6b4b0965d405dd95cf5bce754005a2 centos/3.21.5-1
228b6d2777e44d7bc158d0b4579d09960acea926 debian/3.21.5-2
cubicweb (3.21.5-2) unstable; urgency=medium
* Fix conflict between cubicweb-server and cubicweb-dev.
-- Julien Cristau <julien.cristau@logilab.fr> Thu, 17 Dec 2015 14:56:07 +0100
cubicweb (3.21.5-1) unstable; urgency=medium
* New upstream release.
......
......@@ -47,6 +47,7 @@ install: build
dh_lintian
# Remove unittests directory (should be available in cubicweb-dev only)
rm -rf debian/cubicweb-server/usr/lib/python2*/*-packages/cubicweb/dataimport/test
rm -rf debian/cubicweb-server/usr/lib/python2*/*-packages/cubicweb/server/test
rm -rf debian/cubicweb-server/usr/lib/python2*/*-packages/cubicweb/hooks/test
rm -rf debian/cubicweb-server/usr/lib/python2*/*-packages/cubicweb/sobjects/test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment