diff -Nru ecb-2.40+cvs20110608/debian/changelog ecb-2.40+cvs20110608/debian/changelog
--- ecb-2.40+cvs20110608/debian/changelog	2011-06-08 20:54:08.000000000 +0000
+++ ecb-2.40+cvs20110608/debian/changelog	2011-11-01 13:24:25.000000000 +0000
@@ -1,3 +1,9 @@
+ecb (2.40+cvs20110608-2) unstable; urgency=low
+
+  * add temporary conflicts on cedet (Closes: #644185)
+
+ -- Mike O'Connor <stew@debian.org>  Tue, 01 Nov 2011 09:23:54 -0400
+
 ecb (2.40+cvs20110608-1) unstable; urgency=low
 
   * New Maintainer
diff -Nru ecb-2.40+cvs20110608/debian/control ecb-2.40+cvs20110608/debian/control
--- ecb-2.40+cvs20110608/debian/control	2011-06-09 04:50:46.000000000 +0000
+++ ecb-2.40+cvs20110608/debian/control	2011-11-01 12:44:29.000000000 +0000
@@ -10,6 +10,7 @@
 Package: ecb
 Architecture: all
 Depends: emacs23 | emacsen, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Conflicts: cedet
 Homepage: http://ecb.sourceforge.net
 Description: code browser for Emacs supporting several languages
  ECB is source code browser for Emacs. It is a global