diffstat of debian/ for opencv_2.4.8+dfsg1-2 opencv_2.4.8+dfsg1-2ubuntu1 changelog | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ control | 16 +++++---- rules | 8 ++++ 3 files changed, 123 insertions(+), 8 deletions(-) diff -Nru opencv-2.4.8+dfsg1/debian/changelog opencv-2.4.8+dfsg1/debian/changelog --- opencv-2.4.8+dfsg1/debian/changelog 2014-02-17 22:10:27.000000000 +0000 +++ opencv-2.4.8+dfsg1/debian/changelog 2014-02-25 11:11:56.000000000 +0000 @@ -1,3 +1,15 @@ +opencv (2.4.8+dfsg1-2ubuntu1) trusty; urgency=medium + + * Merge with Debian, remaining changes: + - In debian/rules don't build OpenGL on armhf; not useful there + - Arch-restrict libopencv-ocl2.4 and libopencv-ocl-dev binary packages + for now, due to 1263801. + - In debian/control disable OpenCL support on ppc64el, FTBFS see bug 1263801. + - add libopencv-ocl-dev to libcv-dev depends + - opencv-data breaks libopencv-dev (<= 2.4.6.1+dfsg-2ubuntu1) + + -- Jonathan Riddell Tue, 25 Feb 2014 11:10:42 +0000 + opencv (2.4.8+dfsg1-2) unstable; urgency=medium * Update debian/control. @@ -22,6 +34,20 @@ -- Nobuhiro Iwamatsu Wed, 12 Feb 2014 16:37:21 +0900 +opencv (2.4.8+dfsg-1ubuntu1) trusty; urgency=medium + + * Merge with Debian unstable, remaining changes: + - In debian/rules don't build OpenGL on armhf; not useful there + - Arch-restrict libopencv-ocl2.4 and libopencv-ocl-dev binary packages + for now, due to 1263801. + - In debian/control disable OpenCL support on ppc64el, FTBFS see bug 1263801. + - add libopencv-ocl-dev to libcv-dev depends + - opencv-data breaks libopencv-dev (<= 2.4.6.1+dfsg-2ubuntu1) + * Drop patch detect_sphinx now upstream + * Drop detect_opencl now upstream + + -- Jonathan Riddell Wed, 12 Feb 2014 16:29:04 +0000 + opencv (2.4.8+dfsg-1) unstable; urgency=low * New upstream release. @@ -53,6 +79,53 @@ -- Nobuhiro Iwamatsu Sat, 23 Nov 2013 11:31:08 +0900 +opencv (2.4.6.1+dfsg-2ubuntu5) trusty; urgency=medium + + * Don't build OpenGL on armhf; not useful there. + + -- Iain Lane Thu, 16 Jan 2014 11:19:15 +0000 + +opencv (2.4.6.1+dfsg-2ubuntu4) trusty; urgency=medium + + * Arch-restrict OpenCL binary packages for now, due to 1263801. + + -- Adam Conrad Tue, 24 Dec 2013 11:54:25 -0700 + +opencv (2.4.6.1+dfsg-2ubuntu3) trusty; urgency=medium + + * Enable TBB support on all, but arm64 (not available). + * Disable OpenCL support on ppc64el, FTBFS see bug 1263801. + + -- Dimitri John Ledkov Mon, 23 Dec 2013 23:43:41 +0000 + +opencv (2.4.6.1+dfsg-2ubuntu2) trusty; urgency=low + + * Add patch detect_sphinx to fix detection of Python Sphinx + + -- Jonathan Riddell Fri, 13 Dec 2013 13:00:18 +0000 + +opencv (2.4.6.1+dfsg-2ubuntu1) trusty; urgency=low + + * Merge with Debian unstable, remaining changes: + - build-dep on ocl-icd-opencl-dev and add libopencv-ocl-dev to libcv-dev depends + and add libopencv-ocl2.4 and libopencv-ocl-dev packages + * Add detect_opencl to build ocl with multiarched libraries + * opencv-data breaks libopencv-dev (<= 2.4.6.1+dfsg-2ubuntu1) + * Add detect_opencl to fix finding opencl library with multiarch + + -- Jonathan Riddell Wed, 11 Dec 2013 16:23:54 +0000 + +opencv (2.4.6.1+dfsg-2) unstable; urgency=low + + [ Anton Gladky ] + * Replace libeigen2-dev by libeigen3-dev. (Closes: #726155) + + [ Nobuhiro Iwamatsu ] + * FTBFS on sparc64. (Closes: #714923) + Add patches/change_type_from_int_to_Atomic_word. + + -- Nobuhiro Iwamatsu Sat, 23 Nov 2013 11:31:08 +0900 + opencv (2.4.6.1+dfsg-1) unstable; urgency=low * Upload to unstable. (Closes: #719998, #716811) @@ -111,6 +184,40 @@ -- Nobuhiro Iwamatsu Fri, 12 Jul 2013 13:00:43 +0900 +opencv (2.4.5+dfsg-0ubuntu5) trusty; urgency=low + + * No change rebuild against libav9. + + -- Dmitrijs Ledkovs Thu, 07 Nov 2013 11:25:28 +0000 + +opencv (2.4.5+dfsg-0ubuntu4) saucy; urgency=low + + * Add libopencv-ocl-dev to depends of libopencv-dev + + -- Jonathan Riddell Thu, 10 Oct 2013 16:58:42 +0100 + +opencv (2.4.5+dfsg-0ubuntu3) saucy; urgency=low + + [ Thomas Bleher ] + * Package missing library libopencv-ocl LP: #1213861 + + [ Jonathan Riddell ] + * Add build-dep on ocl-icd-opencl-dev + + -- Thomas Bleher Mon, 19 Aug 2013 08:21:39 +0200 + +opencv (2.4.5+dfsg-0ubuntu2) saucy; urgency=low + + * Package missing library libopencv-superres + + -- Jonathan Riddell Fri, 28 Jun 2013 14:01:14 +0100 + +opencv (2.4.5+dfsg-0ubuntu1) saucy; urgency=low + + * New upstream release + + -- Jonathan Riddell Wed, 26 Jun 2013 16:44:16 +0100 + opencv (2.4.3+dfsg-1) experimental; urgency=low * New upstream release. diff -Nru opencv-2.4.8+dfsg1/debian/control opencv-2.4.8+dfsg1/debian/control --- opencv-2.4.8+dfsg1/debian/control 2014-02-17 06:50:43.000000000 +0000 +++ opencv-2.4.8+dfsg1/debian/control 2014-02-25 11:29:30.000000000 +0000 @@ -1,7 +1,8 @@ Source: opencv Priority: optional Section: devel -Maintainer: Debian Science Team +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Debian Science Team Uploaders: Sam Hocevar (Debian packages) , Nobuhiro Iwamatsu Build-Depends: debhelper (>= 9), @@ -20,7 +21,7 @@ liblapack-dev (>= 3.2.1), libtbb-dev [i386 amd64 ia64 powerpc ppc64], libeigen3-dev, - ocl-icd-opencl-dev, + ocl-icd-opencl-dev [!ppc64el], python-dev, python-support (>= 0.4.1), python-numpy, @@ -67,7 +68,8 @@ libopencv-objdetect-dev, libopencv-legacy-dev, libopencv-video-dev, - libopencv-ml-dev + libopencv-ml-dev, + libopencv-ocl-dev [!ppc64el] 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 @@ -225,7 +227,7 @@ libopencv-stitching-dev (= ${binary:Version}), libopencv-gpu-dev (= ${binary:Version}), libopencv-superres-dev (= ${binary:Version}), - libopencv-ocl-dev (= ${binary:Version}), + libopencv-ocl-dev (= ${binary:Version}) [!ppc64el], libopencv2.4-java (= ${source:Version}), libopencv2.4-jni (= ${binary:Version}), libcv-dev (= ${binary:Version}), @@ -252,7 +254,7 @@ Section: libdevel Architecture: all Depends: ${misc:Depends} -Breaks: libopencv-dev (<= 2.3.1-12) +Breaks: libopencv-dev (<= 2.4.6.1+dfsg-2ubuntu1) Description: development data for opencv This is a metapackage providing development package necessary for development of OpenCV (Open Computer Vision). @@ -1025,7 +1027,7 @@ Package: libopencv-ocl-dev Section: libdevel -Architecture: any +Architecture: amd64 armhf arm64 i386 powerpc Multi-Arch: same Depends: ${misc:Depends}, libopencv-calib3d-dev (= ${binary:Version}), @@ -1050,7 +1052,7 @@ Package: libopencv-ocl2.4 Section: libs -Architecture: any +Architecture: amd64 armhf arm64 i386 powerpc Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, diff -Nru opencv-2.4.8+dfsg1/debian/rules opencv-2.4.8+dfsg1/debian/rules --- opencv-2.4.8+dfsg1/debian/rules 2014-02-16 23:40:46.000000000 +0000 +++ opencv-2.4.8+dfsg1/debian/rules 2014-02-25 11:20:51.000000000 +0000 @@ -12,6 +12,13 @@ CMAKE_ARCH_FLAGS = -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_SSE3=OFF endif +# No GL on armhf +ifneq ($(DEB_HOST_ARCH),armhf) +CMAKE_ARCH_FLAGS += -DWITH_OPENGL=ON +else +CMAKE_ARCH_FLAGS += -DWITH_OPENGL=OFF +endif + # TBB support ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 ia64 powerpc ppc64)) CMAKE_ARCH_FLAGS += -DWITH_TBB=ON @@ -45,7 +52,6 @@ -DWITH_FFMPEG=ON \ -DWITH_GSTREAMER=OFF \ -DWITH_GTK=ON \ - -DWITH_OPENGL=ON \ -DWITH_JASPER=ON \ -DWITH_JPEG=ON \ -DWITH_PNG=ON \