diffstat for opencv-2.4.9.1+dfsg opencv-2.4.9.1+dfsg changelog | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ control | 3 - rules | 8 ++ 3 files changed, 195 insertions(+), 2 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 2016-04-07 14:43:31.000000000 +0000 +++ opencv-2.4.9.1+dfsg/debian/changelog 2016-04-08 16:18:51.000000000 +0000 @@ -1,3 +1,10 @@ +opencv (2.4.9.1+dfsg-1.5ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/rules: Don't build OpenGL on armhf since it's not useful there. + + -- Logan Rosen Fri, 08 Apr 2016 14:13:33 +0000 + opencv (2.4.9.1+dfsg-1.5) unstable; urgency=medium * Non-maintainer upload. @@ -14,6 +21,13 @@ -- Sebastian Ramacher Sun, 06 Mar 2016 23:57:30 +0100 +opencv (2.4.9.1+dfsg-1.3ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - In debian/rules don't build OpenGL on armhf; not useful there + + -- Steve Langasek Thu, 11 Feb 2016 08:26:56 -0800 + opencv (2.4.9.1+dfsg-1.3) UNRELEASED; urgency=medium * Non-maintainer upload. @@ -24,6 +38,26 @@ -- John Paul Adrian Glaubitz Mon, 08 Feb 2016 10:51:45 +0100 +opencv (2.4.9.1+dfsg-1.2ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - In debian/rules don't build OpenGL on armhf; not useful there + * Dropped changes: + - re-enable precompiled headers on arm64. According to the changelog + this was meant to have been done in version 2.4.9+dfsg-1ubuntu4 in + utopic, but we were still disabling them in debian/rules. + - opencv-data breaks libopencv-dev (<= 2.4.6.1+dfsg-2ubuntu1); the + difference in versions no longer matters for upgrades from trusty + (unaffected) or precise (matches Debian breaks). + - drop buggy self build-dependency on libopencv-ml-dev. + - add libopencv-ocl-dev to libcv-dev depends: dropped, no rationale was + given for this divergence from Debian. + * Dropped changes, included in Debian: + - Build-depend on libtbb-dev on ppc64el. + - Rename library packages for g++5 ABI transition. + + -- Steve Langasek Sun, 01 Nov 2015 11:05:04 -0800 + opencv (2.4.9.1+dfsg-1.2) unstable; urgency=medium * Non-maintainer upload. @@ -57,6 +91,51 @@ -- Nobuhiro Iwamatsu Fri, 19 Sep 2014 11:04:13 +0900 +opencv (2.4.9+dfsg-1ubuntu6) wily; urgency=medium + + * Fix up various package interdependencies for the binary renames. + + -- Steve Langasek Thu, 06 Aug 2015 07:19:57 +0000 + +opencv (2.4.9+dfsg-1ubuntu5) wily; urgency=medium + + * Rename library packages for g++5 ABI transition. + + -- Iain Lane Tue, 04 Aug 2015 11:34:21 +0100 + +opencv (2.4.9+dfsg-1ubuntu4) utopic; urgency=medium + + * Build-depend on libtbb-dev on ppc64el. + * Re-enable the OpenCL support on ppc64el. + * Re-enable use of precompiled headers on arm64. + + -- Matthias Klose Mon, 08 Sep 2014 12:06:19 +0200 + +opencv (2.4.9+dfsg-1ubuntu3) utopic; urgency=medium + + * Rebuild against libav11. + + -- Colin Watson Fri, 05 Sep 2014 01:47:49 +0100 + +opencv (2.4.9+dfsg-1ubuntu2) utopic; urgency=medium + + * Restore change to disable use of precompiled headers on arm64, lost in + the previous merge. + + -- Colin Watson Thu, 24 Jul 2014 10:59:53 +0100 + +opencv (2.4.9+dfsg-1ubuntu1) utopic; urgency=medium + + * Merge with Debian, renaming 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) + + -- Rick Timmis (Sick Rimmit) Wed, 23 Jul 2014 17:56:50 +0000 + opencv (2.4.9+dfsg-1) unstable; urgency=medium * New upstream release. (Closes:#753689) @@ -78,6 +157,18 @@ -- Reinhard Tartler Sun, 11 May 2014 09:57:31 -0400 +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. @@ -102,6 +193,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. @@ -133,6 +238,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) @@ -191,6 +343,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.9.1+dfsg/debian/control opencv-2.4.9.1+dfsg/debian/control --- opencv-2.4.9.1+dfsg/debian/control 2015-08-19 21:37:02.000000000 +0000 +++ opencv-2.4.9.1+dfsg/debian/control 2016-04-07 22:14:18.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), diff -Nru opencv-2.4.9.1+dfsg/debian/rules opencv-2.4.9.1+dfsg/debian/rules --- opencv-2.4.9.1+dfsg/debian/rules 2016-04-07 14:43:23.000000000 +0000 +++ opencv-2.4.9.1+dfsg/debian/rules 2016-04-07 22:14:18.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 ppc64el)) 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 \