Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Tue, 21 Jul 2009 23:09:45 +0200
branchstable
changeset 2416 7b08c9be310a
parent 2413 b1bea4cab594 (diff)
parent 2415 41561db25db1 (current diff)
child 2419 e98454c4af87
merge
--- 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
--- 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
cubicweb