[opencv] 01/03: Revert "Don't build with jasper. Closes: #818207"

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch experimental/master
in repository opencv.

commit e10fb62d24cbbc4f518b4b5778696cfcb002bf09
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jul 8 23:43:31 2016 +0200

    Revert "Don't build with jasper. Closes: #818207"
    
    This reverts commit ec54ad5b3f891ad9810c3ab6496f28264d4b4b45.
---
 debian/control                                         | 18 +++++++++---------
 ...ui3.0-deb0.install => libopencv-highgui3.0.install} |  0
 debian/rules                                           |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index c8390d7..2b93e09 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ 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,
@@ -504,7 +505,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
-	libopencv-highgui3.0-deb0 (= ${binary:Version}),
+	libopencv-highgui3.0 (= ${binary:Version}),
 	libopencv-ml3.0 (= ${binary:Version})
 Description: computer vision Object Detection library
  This package contains the OpenCV (Open Computer Vision) Object Detection
@@ -547,11 +548,12 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
 	libopencv-videoio-dev (= ${binary:Version}),
-	libopencv-highgui3.0-deb0 (= ${binary:Version}),
+	libopencv-highgui3.0 (= ${binary:Version}),
  	libavcodec-dev (>= 0.svn20080206),
 	libavformat-dev,
 	libswscale-dev,
 	libgtk2.0-dev,
+	libjasper-dev (>= 1.900.1),
 	libjpeg-dev,
 	libpng-dev,
 	libtiff-dev,
@@ -573,7 +575,7 @@ Description: development files for libopencv-highgui3.0
  analysis, structural analysis, motion analysis and object tracking, object
  recognition, camera calibration and 3D reconstruction.
 
-Package: libopencv-highgui3.0-deb0
+Package: libopencv-highgui3.0
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -581,8 +583,6 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
 	${shlibs:Depends},
 	libopencv-videoio3.0 (= ${binary:Version})
-Conflicts: libopencv-highgui3.0-deb0
-Replaces: libopencv-highgui3.0-deb0
 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.
@@ -602,7 +602,7 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: ${misc:Depends},
-	libopencv-highgui3.0-deb0 (= ${binary:Version})
+	libopencv-highgui3.0 (= ${binary:Version})
 Description: debugging symbols for libopencv-highgui3.0
  This package contains detached debugging symbols for OpenCV (Open Computer
  Vision) High-level GUI and Media I/O runtime libraries.
@@ -774,7 +774,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
 	libopencv-flann3.0 (= ${binary:Version}),
 	libopencv-ml3.0 (= ${binary:Version}),
-	libopencv-highgui3.0-deb0 (= ${binary:Version}),
+	libopencv-highgui3.0 (= ${binary:Version}),
 Description: computer vision Feature Detection and Descriptor Extraction library
  This package contains the OpenCV (Open Computer Vision) Feature Detection
  and Descriptor Extraction runtime libraries.
@@ -1259,7 +1259,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 	libopencv-calib3d3.0 (= ${binary:Version}),
 	libopencv-ml3.0 (= ${binary:Version}),
 	libopencv-objdetect3.0 (= ${binary:Version}),
-	libopencv-highgui3.0-deb0 (= ${binary:Version}),
+	libopencv-highgui3.0 (= ${binary:Version}),
 	libopencv-video3.0 (= ${binary:Version}),
 	libopencv-photo3.0 (= ${binary:Version})
 Description: Java jni library for the computer vision library
@@ -1293,7 +1293,7 @@ Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-numpy-abi
 	libopencv-features2d3.0 (= ${binary:Version}),
 	libopencv-flann3.0 (= ${binary:Version}),
 	libopencv-ml3.0 (= ${binary:Version}),
-	libopencv-highgui3.0-deb0 (= ${binary:Version}),
+	libopencv-highgui3.0 (= ${binary:Version}),
 	libopencv-videoio3.0 (= ${binary:Version}),
 	libopencv-imgcodecs3.0 (= ${binary:Version}),
 	libopencv-imgproc3.0 (= ${binary:Version})
diff --git a/debian/libopencv-highgui3.0-deb0.install b/debian/libopencv-highgui3.0.install
similarity index 100%
rename from debian/libopencv-highgui3.0-deb0.install
rename to debian/libopencv-highgui3.0.install
diff --git a/debian/rules b/debian/rules
index cdcd6cb..715ab99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ CMAKE_FLAGS = \
 	-DWITH_FFMPEG=ON	\
 	-DWITH_GSTREAMER=OFF	\
 	-DWITH_GTK=ON	\
-	-DWITH_JASPER=OFF	\
+	-DWITH_JASPER=ON	\
 	-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