r46295 - in /packages/opencv/trunk/debian: changelog control

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Thu Sep 19 23:22:10 2013
New Revision: 46295

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46295
Log:
Fix fails to upgrade from testing by opencv-data. (Closes: #722927)

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

Modified: packages/opencv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/changelog?rev=46295&op=diff
==============================================================================
--- packages/opencv/trunk/debian/changelog	(original)
+++ packages/opencv/trunk/debian/changelog	Thu Sep 19 23:22:10 2013
@@ -1,3 +1,10 @@
+opencv (2.4.6.1+dfsg-0exp4) experimental; urgency=low
+
+  * Update debian/control.
+    - Fix fails to upgrade from testing by opencv-data. (Closes: #722927)
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Fri, 20 Sep 2013 08:16:39 +0900
+
 opencv (2.4.6.1+dfsg-0exp3) experimental; urgency=low
 
   * Update patches/pkg-config. (Closes: #678222, #721894)

Modified: packages/opencv/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/control?rev=46295&op=diff
==============================================================================
--- packages/opencv/trunk/debian/control	(original)
+++ packages/opencv/trunk/debian/control	Thu Sep 19 23:22:10 2013
@@ -230,9 +230,6 @@
 	libcvaux-dev (= ${binary:Version}),
 	pkg-config
 Recommends: opencv-data
-Replaces: libopencv-core-dev (<= 2.3.1-8)
-Conflicts: opencv-data (<= 2.4.5+dfsg-1)
-Breaks: libopencv-core-dev (<= 2.3.1-8)
 Description: development files for opencv
  This is a metapackage providing development package necessary for
  development of OpenCV (Open Computer Vision).
@@ -251,6 +248,7 @@
 Section: libdevel
 Architecture: all
 Depends: ${misc:Depends}
+Conflicts: libopencv-core-dev (<= 2.3.1-12)
 Description: development data for opencv
  This is a metapackage providing development package necessary for
  development of OpenCV (Open Computer Vision).