diff -u freej-0.10git20100110/debian/changelog freej-0.10git20100110/debian/changelog
--- freej-0.10git20100110/debian/changelog
+++ freej-0.10git20100110/debian/changelog
@@ -1,3 +1,10 @@
+freej (0.10git20100110-1ubuntu8) precise; urgency=low
+
+  * Rebuild for opencv 2.3 transition
+  * Fixed FTBFS due to a conflict between defined keywords
+
+ -- Adrien Cunin <adri2000@ubuntu.com>  Mon, 13 Feb 2012 22:58:06 +0100
+
 freej (0.10git20100110-1ubuntu7) precise; urgency=low
 
   * Fix FTBFS:
only in patch2:
unchanged:
--- freej-0.10git20100110.orig/src/opencv_cam_layer.cpp
+++ freej-0.10git20100110/src/opencv_cam_layer.cpp
@@ -20,6 +20,8 @@
 
 #ifdef WITH_OPENCV
 
+#undef True
+#undef False
 #include <cv.h>
 #include <highgui.h>
 
only in patch2:
unchanged:
--- freej-0.10git20100110.orig/src/include/opencv_cam_layer.h
+++ freej-0.10git20100110/src/include/opencv_cam_layer.h
@@ -22,6 +22,8 @@
 #include <config.h>
 #ifdef WITH_OPENCV
 
+#undef True
+#undef False
 #include <cv.h>
 #include <highgui.h>