[opencv] 05/07: Don't build with jasper. Closes: #818207
Mattia Rizzolo
mattia at debian.org
Mon Jun 27 05:23:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository opencv.
commit 3f267b4a5fcc07a8c6ed0409ea989a3d0a88eb89
Author: Mattia Rizzolo <mattia at debian.org>
Date: Sun Jun 26 19:23:31 2016 +0000
Don't build with jasper. Closes: #818207
This causes libopencv-highgui to lose symbols, so we need to rename the
package and do a transition.
---
debian/changelog | 7 ++++--
debian/control | 26 ++++++++++------------
...5.install => libopencv-highgui2.4-deb0.install} | 0
debian/rules | 2 +-
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8702c89..5e80162 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ opencv (2.4.9.1+dfsg-2) UNRELEASED; urgency=medium
* Team upload.
* Use HTTPS in Vcs-* fields.
* Disable opengl when building in armhf (in Ubuntu only)
- * Fix typo in README.Debian
- * Remove unused lintian override python-script-but-no-python-dep
+ * Don't build with jasper. Closes: #818207
+ This causes libopencv-highgui to lose symbols, so we need to rename the
+ package and do a transition.
+ * Fix typo in README.Debian.
+ * Remove unused lintian override python-script-but-no-python-dep.
-- Mattia Rizzolo <mattia at debian.org> Sun, 26 Jun 2016 15:12:33 +0000
diff --git a/debian/control b/debian/control
index 58ca033..5a6fec3 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9),
cmake (>= 2.8.7),
libavcodec-dev, libavformat-dev, libswscale-dev, libgtk2.0-dev, libgtkglext1-dev,
libgl1-mesa-dev, libglu1-mesa-dev,
- libjasper-dev (>= 1.900.1),
libjpeg-dev,
libpng-dev,
libtiff-dev,
@@ -138,7 +137,7 @@ Description: Translation package for libhighgui-dev
Package: libhighgui2.4
Architecture: all
Depends: ${misc:Depends},
- libopencv-highgui2.4v5
+ libopencv-highgui2.4-deb0
Description: computer vision library - libhighgui translation package
This package provide files for translation from libhighgui2.1 to libhighgui2.4.
.
@@ -467,7 +466,7 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
- libopencv-highgui2.4v5 (= ${binary:Version})
+ libopencv-highgui2.4-deb0 (= ${binary:Version})
Conflicts: libopencv-objdetect2.4
Replaces: libopencv-objdetect2.4
Description: computer vision Object Detection library
@@ -490,12 +489,11 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libopencv-imgproc-dev (= ${binary:Version}),
- libopencv-highgui2.4v5 (= ${binary:Version}),
+ libopencv-highgui2.4-deb0 (= ${binary:Version}),
libavcodec-dev (>= 0.svn20080206),
libavformat-dev,
libswscale-dev,
libgtk2.0-dev,
- libjasper-dev (>= 1.900.1),
libjpeg-dev,
libpng-dev,
libtiff-dev,
@@ -517,7 +515,7 @@ Description: development files for libopencv-highgui
analysis, structural analysis, motion analysis and object tracking, object
recognition, camera calibration and 3D reconstruction.
-Package: libopencv-highgui2.4v5
+Package: libopencv-highgui2.4-deb0
Section: libs
Architecture: any
Multi-Arch: same
@@ -525,8 +523,8 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
libopencv-imgproc2.4v5 (= ${binary:Version})
-Conflicts: libopencv-highgui2.4
-Replaces: libopencv-highgui2.4
+Conflicts: libopencv-highgui2.4, libopencv-highgui2.4v5
+Replaces: libopencv-highgui2.4, libopencv-highgui2.4v5
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.
@@ -710,7 +708,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-video2.4v5 (= ${binary:Version}),
libopencv-calib3d2.4v5 (= ${binary:Version}),
libopencv-ml2.4v5 (= ${binary:Version}),
- libopencv-highgui2.4v5 (= ${binary:Version})
+ libopencv-highgui2.4-deb0 (= ${binary:Version})
Conflicts: libopencv-legacy2.4
Replaces: libopencv-legacy2.4
Description: computer vision legacy library
@@ -759,7 +757,7 @@ Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-calib3d2.4v5 (= ${binary:Version}),
- libopencv-highgui2.4v5 (= ${binary:Version}),
+ libopencv-highgui2.4-deb0 (= ${binary:Version}),
libopencv-ml2.4v5 (= ${binary:Version}),
libopencv-video2.4v5 (= ${binary:Version}),
libopencv-objdetect2.4v5 (= ${binary:Version})
@@ -901,7 +899,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-features2d2.4v5 (= ${binary:Version}),
libopencv-video2.4v5 (= ${binary:Version}),
- libopencv-highgui2.4v5 (= ${binary:Version}),
+ libopencv-highgui2.4-deb0 (= ${binary:Version}),
libopencv-photo2.4v5 (= ${binary:Version}),
libopencv-gpu2.4v5 (= ${binary:Version})
Conflicts: libopencv-videostab2.4
@@ -1038,7 +1036,7 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
- libopencv-highgui2.4v5 (= ${binary:Version}),
+ libopencv-highgui2.4-deb0 (= ${binary:Version}),
libopencv-video2.4v5 (= ${binary:Version}),
libopencv-gpu2.4v5 (= ${binary:Version})
Conflicts: libopencv-superres2.4
@@ -1091,7 +1089,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-calib3d2.4v5 (= ${binary:Version}),
libopencv-ml2.4v5 (= ${binary:Version}),
libopencv-objdetect2.4v5 (= ${binary:Version}),
- libopencv-highgui2.4v5 (= ${binary:Version}),
+ libopencv-highgui2.4-deb0 (= ${binary:Version}),
libopencv-video2.4v5 (= ${binary:Version})
Conflicts: libopencv-ocl2.4
Replaces: libopencv-ocl2.4
@@ -1135,7 +1133,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-calib3d2.4v5 (= ${binary:Version}),
libopencv-ml2.4v5 (= ${binary:Version}),
libopencv-objdetect2.4v5 (= ${binary:Version}),
- libopencv-highgui2.4v5 (= ${binary:Version}),
+ libopencv-highgui2.4-deb0 (= ${binary:Version}),
libopencv-video2.4v5 (= ${binary:Version}),
libopencv-contrib2.4v5 (= ${binary:Version}),
libopencv-photo2.4v5 (= ${binary:Version})
diff --git a/debian/libopencv-highgui2.4v5.install b/debian/libopencv-highgui2.4-deb0.install
similarity index 100%
rename from debian/libopencv-highgui2.4v5.install
rename to debian/libopencv-highgui2.4-deb0.install
diff --git a/debian/rules b/debian/rules
index 7f9c6d2..15f9328 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ CMAKE_FLAGS = \
-DWITH_FFMPEG=ON \
-DWITH_GSTREAMER=OFF \
-DWITH_GTK=ON \
- -DWITH_JASPER=ON \
+ -DWITH_JASPER=OFF \
-DWITH_JPEG=ON \
-DWITH_PNG=ON \
-DWITH_TIFF=ON \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list