--- a/debian/changelog	Tue Dec 15 19:05:41 2015 +0100
+++ b/debian/changelog	Thu Dec 17 14:55:18 2015 +0100
@@ -1,3 +1,9 @@
+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.

--- a/debian/rules	Tue Dec 15 19:05:41 2015 +0100
+++ b/debian/rules	Thu Dec 17 14:55:18 2015 +0100
@@ -47,6 +47,7 @@
 	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