r44885 - in /packages/opencv/trunk/debian: control patches/0013_drop_asm_types_h_kfreebsd.patch

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Wed May 23 03:26:45 2012
New Revision: 44885

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44885
Log:
Update 0013_drop_asm_types_h_kfreebsd.patch

Modified:
    packages/opencv/trunk/debian/control
    packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch

Modified: packages/opencv/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/control?rev=44885&op=diff
==============================================================================
--- packages/opencv/trunk/debian/control (original)
+++ packages/opencv/trunk/debian/control Wed May 23 03:26:45 2012
@@ -210,6 +210,10 @@
 	libopencv-features2d-dev (= ${binary:Version}),
 	libopencv-legacy-dev (= ${binary:Version}),
 	libopencv-contrib-dev (= ${binary:Version}),
+	libopencv-ts-dev (= ${binary:Version}),
+	libopencv-photo-dev (= ${binary:Version}),
+	libopencv-videostab-dev (= ${binary:Version}),
+	libopencv-stitching-dev (= ${binary:Version}),
 	pkg-config
 Description: development files for opencv
  This is a meta package providing development package necessary for

Modified: packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch?rev=44885&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch (original)
+++ packages/opencv/trunk/debian/patches/0013_drop_asm_types_h_kfreebsd.patch Wed May 23 03:26:45 2012
@@ -1,6 +1,8 @@
---- a/modules/highgui/src/cap_libv4l.cpp	2011-12-21 16:53:15.000000000 +0900
-+++ b/modules/highgui/src/cap_libv4l.cpp	2011-12-21 16:54:16.000000000 +0900
-@@ -236,7 +236,9 @@
+diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp
+index 233e6f6..75f8477 100644
+--- a/modules/highgui/src/cap_libv4l.cpp
++++ b/modules/highgui/src/cap_libv4l.cpp
+@@ -235,7 +235,9 @@ make & enjoy!
  #include <sys/mman.h>
  #include <string.h>
  #include <stdlib.h>
@@ -10,9 +12,11 @@
  #include <assert.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
---- a/modules/highgui/src/cap_v4l.cpp	2011-12-21 16:53:06.000000000 +0900
-+++ b/modules/highgui/src/cap_v4l.cpp	2011-12-21 16:53:38.000000000 +0900
-@@ -218,7 +218,9 @@
+diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp
+index 5f9e111..f3fb6f4 100644
+--- a/modules/highgui/src/cap_v4l.cpp
++++ b/modules/highgui/src/cap_v4l.cpp
+@@ -218,7 +218,9 @@ make & enjoy!
  
  #include <string.h>
  #include <stdlib.h>