diff -u opencv-2.1.0/debian/changelog opencv-2.1.0/debian/changelog
--- opencv-2.1.0/debian/changelog
+++ opencv-2.1.0/debian/changelog
@@ -1,3 +1,11 @@
+opencv (2.1.0-3+squeeze1) stable-proposed-updates; urgency=low
+
+  * Fix install path of opencv-doc (Closes: #610803).
+  * Fix optimize of i386 (Closes: #629414).
+    Add patches/optimize_i486.patch.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Thu, 23 Jun 2011 01:21:57 +0900
+
 opencv (2.1.0-3) unstable; urgency=low
 
   * Fix set opencv minor version on Python (Closes: #600836).
diff -u opencv-2.1.0/debian/opencv-doc.install opencv-2.1.0/debian/opencv-doc.install
--- opencv-2.1.0/debian/opencv-doc.install
+++ opencv-2.1.0/debian/opencv-doc.install
@@ -14,6 +14,6 @@
 usr/share/opencv/doc/*		usr/share/doc/opencv-doc/
-usr/share/opencv/haarcascades	usr/share/doc/opencv-doc/examples/haarcascades
-usr/share/opencv/lbpcascades	usr/share/doc/opencv-doc/examples/lbpcascades
-usr/share/opencv/samples/c	usr/share/doc/opencv-doc/examples/c
-usr/share/opencv/samples/python usr/share/doc/opencv-doc/examples/python
+usr/share/opencv/haarcascades	usr/share/doc/opencv-doc/examples/
+usr/share/opencv/lbpcascades	usr/share/doc/opencv-doc/examples/
+usr/share/opencv/samples/c	usr/share/doc/opencv-doc/examples/
+usr/share/opencv/samples/python usr/share/doc/opencv-doc/examples
 #../../samples/c/Makefile.debian	usr/share/doc/opencv-doc/examples/c/
diff -u opencv-2.1.0/debian/patches/series opencv-2.1.0/debian/patches/series
--- opencv-2.1.0/debian/patches/series
+++ opencv-2.1.0/debian/patches/series
@@ -7,0 +8 @@
+optimize_i486.patch
only in patch2:
unchanged:
--- opencv-2.1.0.orig/debian/patches/optimize_i486.patch
+++ opencv-2.1.0/debian/patches/optimize_i486.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2011-06-15 07:13:04.000000000 +0000
++++ b/CMakeLists.txt	2011-06-15 07:13:15.000000000 +0000
+@@ -760,7 +760,7 @@
+     if(X86)
+         if(NOT X86_64)
+             if(NOT APPLE)
+-                set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686")
++                set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i486")
+             endif()
+         endif()
+     endif()