[saga] 01/02: Add libopencv-dev as preferred dependency for OpenCV 3.1.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository saga.

commit 8ece1e23f4950d70024000c1d107b31e12015152
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Nov 8 08:04:36 2016 +0100

    Add libopencv-dev as preferred dependency for OpenCV 3.1.
---
 debian/changelog | 2 ++
 debian/control   | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b9ffd5..175dd85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ saga (2.3.1+dfsg-3) UNRELEASED; urgency=medium
   * Team upload.
   * Add patch to fix spelling errors.
   * Limit watch file to 2.3.x LTS releases.
+  * Add libopencv-dev as preferred dependency for OpenCV 3.1.
+    (closes: #841287)
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 15 Oct 2016 02:04:02 +0200
 
diff --git a/debian/control b/debian/control
index ba73127..35bd09f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,16 +6,16 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               libcv-dev,
                libdxflib-dev,
                libexpat-dev,
                libgdal-dev,
                libhpdf-dev,
                libogdi3.2-dev,
-               libopencv-contrib-dev,
                libopencv-core-dev,
+               libopencv-dev | libcv-dev,
+               libopencv-dev | libopencv-contrib-dev,
+               libopencv-dev | libopencv-legacy-dev,
                libopencv-imgproc-dev,
-               libopencv-legacy-dev,
                libopencv-photo-dev,
                libproj-dev,
                libqhull-dev,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git