# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1248210585 -7200
# Node ID 7b08c9be310aba3e78904ff6476f7df4fbf5246b
# Parent  b1bea4cab5946272a273ad24edb0d8f497300fd8# Parent  41561db25db1981f43031c980963a67c05b55b95
merge

diff -r 41561db25db1 -r 7b08c9be310a debian/changelog
--- a/debian/changelog	Tue Jul 21 15:31:59 2009 +0200
+++ b/debian/changelog	Tue Jul 21 23:09:45 2009 +0200
@@ -1,3 +1,9 @@
+cubicweb (3.3.4-2) unstable; urgency=low
+
+  * fix conflicting test files
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Tue, 21 Jul 2009 23:09:03 +0200
+
 cubicweb (3.3.4-1) unstable; urgency=low
 
   * new upstream release
diff -r 41561db25db1 -r 7b08c9be310a debian/rules
--- a/debian/rules	Tue Jul 21 15:31:59 2009 +0200
+++ b/debian/rules	Tue Jul 21 23:09:45 2009 +0200
@@ -50,8 +50,8 @@
 	rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/site-packages/cubicweb/server/test
 	rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/site-packages/cubicweb/sobjects/test
 	rm -rf debian/cubicweb-web/usr/lib/${PY_VERSION}/site-packages/cubicweb/web/test
-	rm -rf debian/cubicweb-etwist/usr/lib/${PY_VERSION}/site-packages/cubicweb/etwist/test
-	rm -rf debian/cubicweb-etwist/usr/lib/${PY_VERSION}/site-packages/cubicweb/ext/test
+	rm -rf debian/cubicweb-twisted/usr/lib/${PY_VERSION}/site-packages/cubicweb/etwist/test
+	rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/site-packages/cubicweb/ext/test
 	rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/site-packages/cubicweb/common/test
 	rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/site-packages/cubicweb/entities/test