Control: tags 791226 + patch pending On Fri, 03 Jul 2015 at 13:13:16 +0000, Matthias Klose wrote: > Rename the library package, append "v5" to the name of the package > (e.g. libfoo2 -> libfoo2v5).
I have uploaded a NMU to the DELAYED/2 queue with the attached patch. The changes are also available from my clone of the debian-science opencv git repository: <git+ssh://git.debian.org/git/users/smcv/opencv.git>. My NMU also addresses #792715, because it broke the build, but not #794856, which is not a regression (and seems like something that's better for a maintainer to deal with). Regards, S
diffstat for opencv-2.4.9.1+dfsg opencv-2.4.9.1+dfsg changelog | 17 + control | 244 ++++++++++++++----------- libopencv-calib3d2.4.install | 1 libopencv-calib3d2.4v5.install | 1 libopencv-contrib2.4.install | 1 libopencv-contrib2.4v5.install | 1 libopencv-core2.4.install | 1 libopencv-core2.4v5.install | 1 libopencv-features2d2.4.install | 1 libopencv-features2d2.4v5.install | 1 libopencv-flann2.4.install | 1 libopencv-flann2.4v5.install | 1 libopencv-gpu2.4.install | 1 libopencv-gpu2.4v5.install | 1 libopencv-highgui2.4.install | 1 libopencv-highgui2.4v5.install | 1 libopencv-imgproc2.4.install | 1 libopencv-imgproc2.4v5.install | 1 libopencv-legacy2.4.install | 1 libopencv-legacy2.4v5.install | 1 libopencv-ml2.4.install | 1 libopencv-ml2.4v5.install | 1 libopencv-objdetect2.4.install | 1 libopencv-objdetect2.4v5.install | 1 libopencv-ocl2.4.install | 1 libopencv-ocl2.4v5.install | 1 libopencv-photo2.4.install | 1 libopencv-photo2.4v5.install | 1 libopencv-stitching2.4.install | 1 libopencv-stitching2.4v5.install | 1 libopencv-superres2.4.install | 1 libopencv-superres2.4v5.install | 1 libopencv-ts2.4.install | 1 libopencv-ts2.4v5.install | 1 libopencv-video2.4.install | 1 libopencv-video2.4v5.install | 1 libopencv-videostab2.4.install | 1 libopencv-videostab2.4v5.install | 1 patches/Don-t-check-sphinx-build-version.patch | 34 +++ patches/series | 1 40 files changed, 210 insertions(+), 122 deletions(-) diff -Nru opencv-2.4.9.1+dfsg/debian/changelog opencv-2.4.9.1+dfsg/debian/changelog --- opencv-2.4.9.1+dfsg/debian/changelog 2015-05-15 20:34:14.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/changelog 2015-08-19 22:37:02.000000000 +0100 @@ -1,3 +1,20 @@ +opencv (2.4.9.1+dfsg-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Rename library packages for g++5 ABI transition. + Patch provided by Matthias Klose. (Closes: #791226) + * Remove Lintian overrides from Matthias' patch, current Lintian accepts + v5 package names as-is. + * Build-depend on the version of openexr that started its transition. + * Add patch to stop checking the version of sphinx-build (which makes + no difference anyway), fixing arch-indep build (#792715; not closing + that bug here because it is unclear whether it is considered to be a + sphinx bug). + * Deliberately not addressing #794856 in this upload, since it requires + repacking the orig.tar and is not a regression. + + -- Simon McVittie <s...@debian.org> Wed, 19 Aug 2015 22:36:43 +0100 + opencv (2.4.9.1+dfsg-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru opencv-2.4.9.1+dfsg/debian/control opencv-2.4.9.1+dfsg/debian/control --- opencv-2.4.9.1+dfsg/debian/control 2014-09-19 05:51:09.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/control 2015-08-19 22:37:02.000000000 +0100 @@ -12,7 +12,7 @@ libjpeg-dev, libpng-dev, libtiff-dev, - libopenexr-dev (>= 1.4.0), + libopenexr-dev (>= 1.6.1-8.1), libraw1394-dev [linux-any], libdc1394-22-dev [linux-any], libv4l-dev [linux-any], @@ -89,15 +89,15 @@ Package: libcv2.4 Architecture: all Depends: ${misc:Depends}, - libopencv-core2.4, - libopencv-imgproc2.4, - libopencv-flann2.4, - libopencv-features2d2.4, - libopencv-calib3d2.4, - libopencv-objdetect2.4, - libopencv-legacy2.4, - libopencv-video2.4, - libopencv-ml2.4 + libopencv-core2.4v5, + libopencv-imgproc2.4v5, + libopencv-flann2.4v5, + libopencv-features2d2.4v5, + libopencv-calib3d2.4v5, + libopencv-objdetect2.4v5, + libopencv-legacy2.4v5, + libopencv-video2.4v5, + libopencv-ml2.4v5 Description: computer vision library - libcv* translation package This package provide files for translation from libcv2.1 to libcv2.4. . @@ -138,7 +138,7 @@ Package: libhighgui2.4 Architecture: all Depends: ${misc:Depends}, - libopencv-highgui2.4 + libopencv-highgui2.4v5 Description: computer vision library - libhighgui translation package This package provide files for translation from libhighgui2.1 to libhighgui2.4. . @@ -183,14 +183,14 @@ Package: libcvaux2.4 Architecture: all Depends: ${misc:Depends}, - libopencv-core2.4, - libopencv-imgproc2.4, - libopencv-features2d2.4, - libopencv-calib3d2.4, - libopencv-objdetect2.4, - libopencv-legacy2.4, - libopencv-video2.4, - libopencv-contrib2.4 + libopencv-core2.4v5, + libopencv-imgproc2.4v5, + libopencv-features2d2.4v5, + libopencv-calib3d2.4v5, + libopencv-objdetect2.4v5, + libopencv-legacy2.4v5, + libopencv-video2.4v5, + libopencv-contrib2.4v5 Description: computer vision library - libcvaux translation package This package provide files for translation from libcvaux2.1 to libcvaux2.4. . @@ -271,7 +271,7 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, libopencv-core2.4 (= ${binary:Version}), +Depends: ${misc:Depends}, libopencv-core2.4v5 (= ${binary:Version}), zlib1g-dev Description: development files for libopencv-core This package contains the header files and static library needed to compile @@ -287,12 +287,14 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-core2.4 +Package: libopencv-core2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} +Conflicts: libopencv-core2.4 +Replaces: libopencv-core2.4 Description: computer vision core library This package contains the OpenCV (Open Computer Vision) core runtime libraries. . @@ -312,7 +314,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-core-dev (= ${binary:Version}), - libopencv-ml2.4 (= ${binary:Version}) + libopencv-ml2.4v5 (= ${binary:Version}) Description: development files for libopencv-ml This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) Machine Learning library. @@ -327,13 +329,15 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-ml2.4 +Package: libopencv-ml2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-core2.4 (= ${binary:Version}) + libopencv-core2.4v5 (= ${binary:Version}) +Conflicts: libopencv-ml2.4 +Replaces: libopencv-ml2.4 Description: computer vision Machine Learning library This package contains the OpenCV (Open Computer Vision) Machine Learning runtime libraries. @@ -354,7 +358,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-core-dev (= ${binary:Version}), - libopencv-imgproc2.4 (= ${binary:Version}) + libopencv-imgproc2.4v5 (= ${binary:Version}) Description: development files for libopencv-imgproc This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) Image Processing library. @@ -369,13 +373,15 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-imgproc2.4 +Package: libopencv-imgproc2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-core2.4 (= ${binary:Version}) + libopencv-core2.4v5 (= ${binary:Version}) +Conflicts: libopencv-imgproc2.4 +Replaces: libopencv-imgproc2.4 Description: computer vision Image Processing library This package contains the OpenCV (Open Computer Vision) Image Processing runtime libraries. @@ -396,7 +402,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-imgproc-dev (= ${binary:Version}), - libopencv-video2.4 (= ${binary:Version}) + libopencv-video2.4v5 (= ${binary:Version}) Description: development files for libopencv-video This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) Video analysis library. @@ -411,13 +417,15 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-video2.4 +Package: libopencv-video2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-imgproc2.4 (= ${binary:Version}) + libopencv-imgproc2.4v5 (= ${binary:Version}) +Conflicts: libopencv-video2.4 +Replaces: libopencv-video2.4 Description: computer vision Video analysis library This package contains the OpenCV (Open Computer Vision) Video analysis runtime libraries. @@ -438,7 +446,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-highgui-dev (= ${binary:Version}), - libopencv-objdetect2.4 (= ${binary:Version}) + libopencv-objdetect2.4v5 (= ${binary:Version}) Description: development files for libopencv-objdetect This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) Object Detection library. @@ -453,13 +461,15 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-objdetect2.4 +Package: libopencv-objdetect2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-highgui2.4 (= ${binary:Version}) + libopencv-highgui2.4v5 (= ${binary:Version}) +Conflicts: libopencv-objdetect2.4 +Replaces: libopencv-objdetect2.4 Description: computer vision Object Detection library This package contains the OpenCV (Open Computer Vision) Object Detection runtime libraries. @@ -480,7 +490,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-imgproc-dev (= ${binary:Version}), - libopencv-highgui2.4 (= ${binary:Version}), + libopencv-highgui2.4v5 (= ${binary:Version}), libavcodec-dev (>= 0.svn20080206), libavformat-dev, libswscale-dev, @@ -507,14 +517,16 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-highgui2.4 +Package: libopencv-highgui2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, - libopencv-imgproc2.4 (= ${binary:Version}) + libopencv-imgproc2.4v5 (= ${binary:Version}) +Conflicts: libopencv-highgui2.4 +Replaces: libopencv-highgui2.4 Description: computer vision High-level GUI and Media I/O library This package contains the OpenCV (Open Computer Vision) High-level GUI and Media I/O runtime libraries. @@ -535,7 +547,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-features2d-dev (= ${binary:Version}), - libopencv-calib3d2.4 (= ${binary:Version}) + libopencv-calib3d2.4v5 (= ${binary:Version}) Description: development files for libopencv-calib3d This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) Camera Calibration library. @@ -550,13 +562,15 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-calib3d2.4 +Package: libopencv-calib3d2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-features2d2.4 (= ${binary:Version}), + libopencv-features2d2.4v5 (= ${binary:Version}), +Conflicts: libopencv-calib3d2.4 +Replaces: libopencv-calib3d2.4 Description: computer vision Camera Calibration library This package contains the OpenCV (Open Computer Vision) Camera Calibration runtime libraries. @@ -577,7 +591,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-core-dev (= ${binary:Version}), - libopencv-flann2.4 (= ${binary:Version}) + libopencv-flann2.4v5 (= ${binary:Version}) Description: development files for libopencv-flann This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) Clustering and Search @@ -593,13 +607,15 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-flann2.4 +Package: libopencv-flann2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-core2.4 (= ${binary:Version}), + libopencv-core2.4v5 (= ${binary:Version}), +Conflicts: libopencv-flann2.4 +Replaces: libopencv-flann2.4 Description: computer vision Clustering and Search in Multi-Dimensional spaces library This package contains the OpenCV (Open Computer Vision) clustering and search in Multi-Dimensional spaces runtime libraries. @@ -621,7 +637,7 @@ Depends: ${misc:Depends}, libopencv-flann-dev (= ${binary:Version}), libopencv-imgproc-dev (= ${binary:Version}), - libopencv-features2d2.4 (= ${binary:Version}) + libopencv-features2d2.4v5 (= ${binary:Version}) Description: development files for libopencv-features2d This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) Feature Detection and @@ -637,14 +653,16 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-features2d2.4 +Package: libopencv-features2d2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-flann2.4 (= ${binary:Version}), - libopencv-imgproc2.4 (= ${binary:Version}), + libopencv-flann2.4v5 (= ${binary:Version}), + libopencv-imgproc2.4v5 (= ${binary:Version}), +Conflicts: libopencv-features2d2.4 +Replaces: libopencv-features2d2.4 Description: computer vision Feature Detection and Descriptor Extraction library This package contains the OpenCV (Open Computer Vision) Feature Detection and Descriptor Extraction runtime libraries. @@ -668,7 +686,7 @@ libopencv-calib3d-dev (= ${binary:Version}), libopencv-ml-dev (= ${binary:Version}), libopencv-highgui-dev (= ${binary:Version}), - libopencv-legacy2.4 (= ${binary:Version}) + libopencv-legacy2.4v5 (= ${binary:Version}) Description: development files for libopencv-legacy This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) legacy library. @@ -683,16 +701,18 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-legacy2.4 +Package: libopencv-legacy2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-video2.4 (= ${binary:Version}), - libopencv-calib3d2.4 (= ${binary:Version}), - libopencv-ml2.4 (= ${binary:Version}), - libopencv-highgui2.4 (= ${binary:Version}) + libopencv-video2.4v5 (= ${binary:Version}), + libopencv-calib3d2.4v5 (= ${binary:Version}), + libopencv-ml2.4v5 (= ${binary:Version}), + libopencv-highgui2.4v5 (= ${binary:Version}) +Conflicts: libopencv-legacy2.4 +Replaces: libopencv-legacy2.4 Description: computer vision legacy library This package contains the OpenCV (Open Computer Vision) legacy runtime libraries. @@ -717,7 +737,7 @@ libopencv-ml-dev (= ${binary:Version}), libopencv-video-dev (= ${binary:Version}), libopencv-objdetect-dev (= ${binary:Version}), - libopencv-contrib2.4 (= ${binary:Version}) + libopencv-contrib2.4v5 (= ${binary:Version}) Description: development files for libopencv-contrib This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) crotrib library. @@ -732,17 +752,19 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-contrib2.4 +Package: libopencv-contrib2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-calib3d2.4 (= ${binary:Version}), - libopencv-highgui2.4 (= ${binary:Version}), - libopencv-ml2.4 (= ${binary:Version}), - libopencv-video2.4 (= ${binary:Version}), - libopencv-objdetect2.4 (= ${binary:Version}) + libopencv-calib3d2.4v5 (= ${binary:Version}), + libopencv-highgui2.4v5 (= ${binary:Version}), + libopencv-ml2.4v5 (= ${binary:Version}), + libopencv-video2.4v5 (= ${binary:Version}), + libopencv-objdetect2.4v5 (= ${binary:Version}) +Conflicts: libopencv-contrib2.4 +Replaces: libopencv-contrib2.4 Description: computer vision contrib library This package contains the OpenCV (Open Computer Vision) contrib runtime libraries. @@ -763,8 +785,8 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-core-dev (= ${binary:Version}), - libopencv-ts2.4 (= ${binary:Version}) -Description: development files for libopencv-ts2.4 + libopencv-ts2.4v5 (= ${binary:Version}) +Description: development files for libopencv-ts2.4v5 This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) ts library. . @@ -778,13 +800,15 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-ts2.4 +Package: libopencv-ts2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-core2.4 (= ${binary:Version}) + libopencv-core2.4v5 (= ${binary:Version}) +Conflicts: libopencv-ts2.4 +Replaces: libopencv-ts2.4 Description: computer vision ts library This package contains the OpenCV (Open Computer Vision) ts runtime libraries. . @@ -804,8 +828,8 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-imgproc-dev (= ${binary:Version}), - libopencv-photo2.4 (= ${binary:Version}) -Description: development files for libopencv-photo2.4 + libopencv-photo2.4v5 (= ${binary:Version}) +Description: development files for libopencv-photo2.4v5 This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) computational photography library. @@ -820,13 +844,15 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-photo2.4 +Package: libopencv-photo2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-imgproc2.4 (= ${binary:Version}) + libopencv-imgproc2.4v5 (= ${binary:Version}) +Conflicts: libopencv-photo2.4 +Replaces: libopencv-photo2.4 Description: computer vision computational photography library This package contains the OpenCV (Open Computer Vision) computational photography runtime libraries. @@ -851,8 +877,8 @@ libopencv-highgui-dev (= ${binary:Version}), libopencv-photo-dev (= ${binary:Version}), libopencv-gpu-dev (= ${binary:Version}), - libopencv-videostab2.4 (= ${binary:Version}) -Description: development files for libopencv-videostab2.4 + libopencv-videostab2.4v5 (= ${binary:Version}) +Description: development files for libopencv-videostab2.4v5 This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) video stabilization library. @@ -867,17 +893,19 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-videostab2.4 +Package: libopencv-videostab2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-features2d2.4 (= ${binary:Version}), - libopencv-video2.4 (= ${binary:Version}), - libopencv-highgui2.4 (= ${binary:Version}), - libopencv-photo2.4 (= ${binary:Version}), - libopencv-gpu2.4 (= ${binary:Version}) + libopencv-features2d2.4v5 (= ${binary:Version}), + libopencv-video2.4v5 (= ${binary:Version}), + libopencv-highgui2.4v5 (= ${binary:Version}), + libopencv-photo2.4v5 (= ${binary:Version}), + libopencv-gpu2.4v5 (= ${binary:Version}) +Conflicts: libopencv-videostab2.4 +Replaces: libopencv-videostab2.4 Description: computer vision video stabilization library This package contains the OpenCV (Open Computer Vision) video stabilization runtime libraries. @@ -899,8 +927,8 @@ Depends: ${misc:Depends}, libopencv-calib3d-dev (= ${binary:Version}), libopencv-flann-dev (= ${binary:Version}), - libopencv-stitching2.4 (= ${binary:Version}) -Description: development files for libopencv-stitching2.4 + libopencv-stitching2.4v5 (= ${binary:Version}) +Description: development files for libopencv-stitching2.4v5 This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) image stitching library. . @@ -914,14 +942,16 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-stitching2.4 +Package: libopencv-stitching2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-calib3d2.4 (= ${binary:Version}), - libopencv-flann2.4 (= ${binary:Version}) + libopencv-calib3d2.4v5 (= ${binary:Version}), + libopencv-flann2.4v5 (= ${binary:Version}) +Conflicts: libopencv-stitching2.4 +Replaces: libopencv-stitching2.4 Description: computer vision image stitching library This package contains the OpenCV (Open Computer Vision) image stitching runtime libraries. @@ -942,7 +972,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libopencv-core-dev (= ${binary:Version}) -Description: development files for libopencv-gpu2.4 +Description: development files for libopencv-gpu2.4v5 This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) GPU library. . @@ -956,13 +986,15 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-gpu2.4 +Package: libopencv-gpu2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-core2.4 (= ${binary:Version}) + libopencv-core2.4v5 (= ${binary:Version}) +Conflicts: libopencv-gpu2.4 +Replaces: libopencv-gpu2.4 Description: computer vision GPU library This package contains the OpenCV (Open Computer Vision) GPU-accelerated runtime libraries. @@ -985,8 +1017,8 @@ libopencv-highgui-dev (= ${binary:Version}), libopencv-video-dev (= ${binary:Version}), libopencv-gpu-dev (= ${binary:Version}), - libopencv-superres2.4 (= ${binary:Version}) -Description: development files for libopencv-superres2.4 + libopencv-superres2.4v5 (= ${binary:Version}) +Description: development files for libopencv-superres2.4v5 This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) Super Resolution library. . @@ -1000,15 +1032,17 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-superres2.4 +Package: libopencv-superres2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-highgui2.4 (= ${binary:Version}), - libopencv-video2.4 (= ${binary:Version}), - libopencv-gpu2.4 (= ${binary:Version}) + libopencv-highgui2.4v5 (= ${binary:Version}), + libopencv-video2.4v5 (= ${binary:Version}), + libopencv-gpu2.4v5 (= ${binary:Version}) +Conflicts: libopencv-superres2.4 +Replaces: libopencv-superres2.4 Description: computer vision Super Resolution library This package contains the OpenCV (Open Computer Vision) Super Resolution runtime libraries. @@ -1033,8 +1067,8 @@ libopencv-objdetect-dev (= ${binary:Version}), libopencv-highgui-dev (= ${binary:Version}), libopencv-video-dev (= ${binary:Version}), - libopencv-ocl2.4 (= ${binary:Version}) -Description: development files for libopencv-ocl2.4 + libopencv-ocl2.4v5 (= ${binary:Version}) +Description: development files for libopencv-ocl2.4v5 This package contains the header files and static library needed to compile applications that use OpenCV (Open Computer Vision) OpenCL support library. . @@ -1048,17 +1082,19 @@ analysis, structural analysis, motion analysis and object tracking, object recognition, camera calibration and 3D reconstruction. -Package: libopencv-ocl2.4 +Package: libopencv-ocl2.4v5 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-calib3d2.4 (= ${binary:Version}), - libopencv-ml2.4 (= ${binary:Version}), - libopencv-objdetect2.4 (= ${binary:Version}), - libopencv-highgui2.4 (= ${binary:Version}), - libopencv-video2.4 (= ${binary:Version}) + libopencv-calib3d2.4v5 (= ${binary:Version}), + libopencv-ml2.4v5 (= ${binary:Version}), + libopencv-objdetect2.4v5 (= ${binary:Version}), + libopencv-highgui2.4v5 (= ${binary:Version}), + libopencv-video2.4v5 (= ${binary:Version}) +Conflicts: libopencv-ocl2.4 +Replaces: libopencv-ocl2.4 Description: computer vision OpenCL support library This package contains the OpenCV (Open Computer Vision) OpenCL runtime libraries. @@ -1096,13 +1132,13 @@ Package: libopencv2.4-jni Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libopencv-calib3d2.4 (= ${binary:Version}), - libopencv-ml2.4 (= ${binary:Version}), - libopencv-objdetect2.4 (= ${binary:Version}), - libopencv-highgui2.4 (= ${binary:Version}), - libopencv-video2.4 (= ${binary:Version}), - libopencv-contrib2.4 (= ${binary:Version}), - libopencv-photo2.4 (= ${binary:Version}) + libopencv-calib3d2.4v5 (= ${binary:Version}), + libopencv-ml2.4v5 (= ${binary:Version}), + libopencv-objdetect2.4v5 (= ${binary:Version}), + libopencv-highgui2.4v5 (= ${binary:Version}), + libopencv-video2.4v5 (= ${binary:Version}), + libopencv-contrib2.4v5 (= ${binary:Version}), + libopencv-photo2.4v5 (= ${binary:Version}) Description: Java jni library for the computer vision library This package contains Java jni library for the OpenCV (Open Computer Vision) library. diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-calib3d2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-calib3d2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-calib3d2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-calib3d2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_calib3d.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-calib3d2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-calib3d2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-calib3d2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-calib3d2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_calib3d.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-contrib2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-contrib2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-contrib2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-contrib2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_contrib.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-contrib2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-contrib2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-contrib2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-contrib2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_contrib.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-core2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-core2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-core2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-core2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_core.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-core2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-core2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-core2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-core2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_core.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-features2d2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-features2d2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-features2d2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-features2d2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_features2d.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-features2d2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-features2d2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-features2d2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-features2d2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_features2d.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-flann2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-flann2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-flann2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-flann2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_flann.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-flann2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-flann2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-flann2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-flann2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_flann.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-gpu2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-gpu2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-gpu2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-gpu2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_gpu.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-gpu2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-gpu2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-gpu2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-gpu2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_gpu.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-highgui2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-highgui2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-highgui2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-highgui2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_highgui.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-highgui2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-highgui2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-highgui2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-highgui2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_highgui.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-imgproc2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-imgproc2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-imgproc2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-imgproc2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_imgproc.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-imgproc2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-imgproc2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-imgproc2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-imgproc2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_imgproc.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-legacy2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-legacy2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-legacy2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-legacy2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_legacy.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-legacy2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-legacy2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-legacy2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-legacy2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_legacy.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-ml2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-ml2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-ml2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-ml2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_ml.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-ml2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-ml2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-ml2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-ml2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_ml.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-objdetect2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-objdetect2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-objdetect2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-objdetect2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_objdetect.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-objdetect2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-objdetect2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-objdetect2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-objdetect2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_objdetect.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-ocl2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-ocl2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-ocl2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-ocl2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_ocl.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-ocl2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-ocl2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-ocl2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-ocl2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_ocl.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-photo2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-photo2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-photo2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-photo2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_photo.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-photo2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-photo2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-photo2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-photo2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_photo.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-stitching2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-stitching2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-stitching2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-stitching2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_stitching.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-stitching2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-stitching2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-stitching2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-stitching2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_stitching.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-superres2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-superres2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-superres2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-superres2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_superres.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-superres2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-superres2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-superres2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-superres2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_superres.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-ts2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-ts2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-ts2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-ts2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_ts.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-ts2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-ts2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-ts2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-ts2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_ts.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-video2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-video2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-video2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-video2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_video.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-video2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-video2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-video2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-video2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_video.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-videostab2.4.install opencv-2.4.9.1+dfsg/debian/libopencv-videostab2.4.install --- opencv-2.4.9.1+dfsg/debian/libopencv-videostab2.4.install 2014-09-19 03:04:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-videostab2.4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libopencv_videostab.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/libopencv-videostab2.4v5.install opencv-2.4.9.1+dfsg/debian/libopencv-videostab2.4v5.install --- opencv-2.4.9.1+dfsg/debian/libopencv-videostab2.4v5.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/libopencv-videostab2.4v5.install 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libopencv_videostab.so.* diff -Nru opencv-2.4.9.1+dfsg/debian/patches/Don-t-check-sphinx-build-version.patch opencv-2.4.9.1+dfsg/debian/patches/Don-t-check-sphinx-build-version.patch --- opencv-2.4.9.1+dfsg/debian/patches/Don-t-check-sphinx-build-version.patch 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/patches/Don-t-check-sphinx-build-version.patch 2015-08-19 22:37:02.000000000 +0100 @@ -0,0 +1,34 @@ +From: Simon McVittie <s...@debian.org> +Date: Wed, 19 Aug 2015 21:27:54 +0100 +Subject: Don't check sphinx-build version + +It isn't really used for anything anyway, and sphinx-build's +output changed in 1.3 (<https://bugs.debian.org/792715>) resulting +in FTBFS. + +Forwarded: not-needed, upstream have removed the Sphinx docs +--- + cmake/OpenCVDetectPython.cmake | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake +index d02b759..acd69e8 100644 +--- a/cmake/OpenCVDetectPython.cmake ++++ b/cmake/OpenCVDetectPython.cmake +@@ -120,15 +120,9 @@ if(PYTHON_EXECUTABLE) + if(BUILD_DOCS) + find_host_program(SPHINX_BUILD sphinx-build) + if(SPHINX_BUILD) +- execute_process(COMMAND "${SPHINX_BUILD}" +- OUTPUT_QUIET +- ERROR_VARIABLE SPHINX_OUTPUT +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)") +- set(SPHINX_VERSION "${CMAKE_MATCH_1}") ++ set(SPHINX_VERSION "(unknown version)") + set(HAVE_SPHINX 1) + message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}") +- endif() + endif() + endif(BUILD_DOCS) + endif(PYTHON_EXECUTABLE) diff -Nru opencv-2.4.9.1+dfsg/debian/patches/series opencv-2.4.9.1+dfsg/debian/patches/series --- opencv-2.4.9.1+dfsg/debian/patches/series 2015-05-15 15:43:46.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/patches/series 2015-08-19 22:37:02.000000000 +0100 @@ -8,3 +8,4 @@ fix_path_of_opencl_headers libav10.patch optimize_i586.patch +Don-t-check-sphinx-build-version.patch