[Pkg-scicomp-commits] opencv/trunk/debian [BROKEN EMAIL]

SVN commit 4760 by iwamatsu:

Update debian/control and debian/changelog

 M  +14 -0     opencv/trunk/debian/changelog  
 M  +0 -6      opencv/trunk/debian/control  


--- opencv/trunk/debian/changelog #4759:4760
@@ -1,3 +1,17 @@
+opencv (2.0.0-3) unstable; urgency=low
+
+  * Remove libcv1, libhighgui1 and libcvaux1 from Conflicts and Replaces.
+    (Closes: #560283)
+  * Remove cvconfig.h from libcv-dev package. (Closes: #559857)
+    Update libcv-dev.install and backport r2242 of commit from upstream.
+    Thanks to Filippo Giunchedi.
+    debian/patches/110_backport_r2242.diff 
+  * Fix FTBFS with GCC 4.4. (Closes: #562742)
+    Backport r2255 of commit from upstream. Thanks to Filippo Giunchedi.
+    debian/patches/110_backport_r2255.diff
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Thu, 07 Jan 2010 20:48:47 +0900
+
 opencv (2.0.0-2) unstable; urgency=low
 
   * Add cvconfig.h to libcv-dev. (Closes: #559857)
--- opencv/trunk/debian/control #4759:4760
@@ -89,8 +89,6 @@
 Package: libcv4
 Section: libs
 Architecture: any
-Conflicts: libcv1
-Replaces: libcv1
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: computer vision library
  This package contains the OpenCV (Open Computer Vision) runtime libraries.
@@ -108,8 +106,6 @@
 Package: libcvaux4
 Section: libs
 Architecture: any
-Conflicts: libcvaux1
-Replaces: libcvaux1
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: computer vision extension library
  This package contains the OpenCV (Open Computer Vision) extensions runtime
@@ -128,8 +124,6 @@
 Package: libhighgui4
 Section: libs
 Architecture: any
-Conflicts: libhighgui1
-Replaces: libhighgui1
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: computer vision GUI library
  This package contains the OpenCV (Open Computer Vision) GUI library.