r44218 - in /packages/opencv/trunk/debian: changelog control rules

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Wed Dec 21 01:07:40 2011
New Revision: 44218

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44218
Log:
 Adjusted version for Replaces and Breaks of libopencv-core-dev.

Modified:
    packages/opencv/trunk/debian/changelog
    packages/opencv/trunk/debian/control
    packages/opencv/trunk/debian/rules

Modified: packages/opencv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/changelog?rev=44218&op=diff
==============================================================================
--- packages/opencv/trunk/debian/changelog (original)
+++ packages/opencv/trunk/debian/changelog Wed Dec 21 01:07:40 2011
@@ -1,3 +1,14 @@
+opencv (2.3.1-2) unstable; urgency=low
+
+  * Update debian/control.
+    - Adjusted version for Replaces and Breaks of libopencv-core-dev.
+      (Closes: #651988). Thanks to Ansgar Burchardt.
+  * Fix build on kfreeBSD. (Closes: #651872)
+    Add patches/0013_drop_asm_types_h_kfreebsd.patch.
+    Thanks to Julien Cristau.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Tue, 20 Dec 2011 17:10:11 +0900
+
 opencv (2.3.1-1) unstable; urgency=low
 
   * Upload to unstable.

Modified: packages/opencv/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/control?rev=44218&op=diff
==============================================================================
--- packages/opencv/trunk/debian/control (original)
+++ packages/opencv/trunk/debian/control Wed Dec 21 01:07:40 2011
@@ -61,7 +61,7 @@
 	libopencv-video-dev,
 	libopencv-ml-dev,
 	libopencv-gpu-dev
-Conflicts: libcvaux-dev (<= 2.1.0-4), libhighgui-dev (<= 2.1.0-4)
+Conflicts: libcvaux-dev (<= 2.1.0-7), libhighgui-dev (<= 2.1.0-7)
 Description: Translation package for libcv-dev
  This package provide files for translation from libcv-dev to
  subdivided packages.
@@ -221,8 +221,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-core2.3 (= ${binary:Version}),
 	zlib1g-dev ,pkg-config
-Replaces: libcv-dev (<= 2.1.0-4)
-Breaks: libcv-dev (<= 2.1.0-4)
+Replaces: libcv-dev (<< 2.3.1-1)
+Breaks: libcv-dev (<< 2.3.1-1)
 Description: development files for libopencv-core
  This package contains the header files and static library needed to compile
  applications that use OpenCV (Open Computer Vision) core.

Modified: packages/opencv/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/rules?rev=44218&op=diff
==============================================================================
--- packages/opencv/trunk/debian/rules (original)
+++ packages/opencv/trunk/debian/rules Wed Dec 21 01:07:40 2011
@@ -53,7 +53,7 @@
 	-DWITH_1394=ON	\
 	-DWITH_V4L=ON	\
 	-DWITH_XINE=OFF	\
-	-DBUILD_TESTS=OFF \
+	-DBUILD_TESTS=ON \
 	-DBUILD_LATEX_DOCS=ON \
 	-DCMAKE_SKIP_RPATH=ON