tags 339240 patch
thanks

Hi Sam,

I've prepared an NMU to fix this bug in opencv.  The patch for the NMU is
attached, and I'll be uploading the package shortly to the NEW queue.  If
you disagree with any of the changes made, please make a maintainer upload
in its place.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
diff -u opencv-0.9.6/debian/changelog opencv-0.9.6/debian/changelog
--- opencv-0.9.6/debian/changelog
+++ opencv-0.9.6/debian/changelog
@@ -1,3 +1,13 @@
+opencv (0.9.6-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Medium-urgency upload for RC bugfix.
+  * Rename libcvaux0.9-0c2 to libcvaux0.9-0c2a for the C++ mt allocator ABI
+    transition, and conflict/replace libcvaux0.9-0c2 accordingly
+    (closes: #339240).
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Sat,  3 Dec 2005 21:27:40 -0800
+
 opencv (0.9.6-4) unstable; urgency=low
 
   * tests/cv/src/asobel.cpp:
diff -u opencv-0.9.6/debian/control opencv-0.9.6/debian/control
--- opencv-0.9.6/debian/control
+++ opencv-0.9.6/debian/control
@@ -46,7 +46,7 @@
 Package: libcvaux-dev
 Section: libdevel
 Architecture: any
-Depends: libcvaux0.9-0c2 (= ${Source-Version}), libcv-dev (>= 
${Source-Version})
+Depends: libcvaux0.9-0c2a (= ${Source-Version}), libcv-dev (>= 
${Source-Version})
 Description: development files for libcvaux
  This package contains the header files and static library needed to compile
  applications that use the OpenCV (Open Computer Vision) extensions.
@@ -97,11 +97,12 @@
  analysis, structural analysis, motion analysis and object tracking, object
  recognition, camera calibration and 3D reconstruction.
 
-Package: libcvaux0.9-0c2
+Package: libcvaux0.9-0c2a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libcvaux0.9-0
+Conflicts: libcvaux0.9-0, libcvaux0.9-0c2
+Replaces: libcvaux0.9-0, libcvaux0.9-0c2
 Description: computer vision extension library
  This package contains the OpenCV (Open Computer Vision) extensions runtime
  library.
reverted:
--- opencv-0.9.6/debian/libcvaux0.9-0c2.install
+++ opencv-0.9.6.orig/debian/libcvaux0.9-0c2.install
@@ -1 +0,0 @@
-usr/lib/libcvaux*.so.*
only in patch2:
unchanged:
--- opencv-0.9.6.orig/debian/libcvaux0.9-0c2a.install
+++ opencv-0.9.6/debian/libcvaux0.9-0c2a.install
@@ -0,0 +1 @@
+usr/lib/libcvaux*.so.*

Attachment: signature.asc
Description: Digital signature

Reply via email to