# HG changeset patch
# User Julien Cristau <julien.cristau@logilab.fr>
# Date 1450362845 -3600
# Node ID c449f4415d0ccf6096c652eeba9ec8eef348081c
# Parent  7ceb0971c694215c6205179b497f2022b8dd878c# Parent  ca656b4312678d17c007096aa323635618dea0aa
merge with 3.21.5-2

diff -r 7ceb0971c694 -r c449f4415d0c .hgtags
--- a/.hgtags	Wed Dec 16 11:23:48 2015 +0100
+++ b/.hgtags	Thu Dec 17 15:34:05 2015 +0100
@@ -529,3 +529,4 @@
 e0572a786e6b4b0965d405dd95cf5bce754005a2 3.21.5
 e0572a786e6b4b0965d405dd95cf5bce754005a2 debian/3.21.5-1
 e0572a786e6b4b0965d405dd95cf5bce754005a2 centos/3.21.5-1
+228b6d2777e44d7bc158d0b4579d09960acea926 debian/3.21.5-2
diff -r 7ceb0971c694 -r c449f4415d0c debian/changelog
--- a/debian/changelog	Wed Dec 16 11:23:48 2015 +0100
+++ b/debian/changelog	Thu Dec 17 15:34:05 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.
diff -r 7ceb0971c694 -r c449f4415d0c debian/rules
--- a/debian/rules	Wed Dec 16 11:23:48 2015 +0100
+++ b/debian/rules	Thu Dec 17 15:34:05 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