[opencv] 07/09: Use dh_numpy instead of hardconding the numpy ABI number.

Mattia Rizzolo mattia at debian.org
Mon Apr 3 19:18:08 UTC 2017


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

mattia pushed a commit to branch master
in repository opencv.

commit 49cc508c0f3ad398d5db426daf67cff3ff6db9b2
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Apr 3 20:32:08 2017 +0200

    Use dh_numpy instead of hardconding the numpy ABI number.
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/control | 6 ++----
 debian/rules   | 5 +++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index a98fde4..14ea384 100644
--- a/debian/control
+++ b/debian/control
@@ -927,8 +927,7 @@ Description: Java jni library for the computer vision library
 Package: python-opencv
 Section: python
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-numpy-abi9,
-	python-numpy (>= 1:1.6.1),
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
 	libopencv-viz3.1 (= ${binary:Version}),
 	libopencv-shape3.1 (= ${binary:Version}),
 	libopencv-superres3.1 (= ${binary:Version}),
@@ -962,8 +961,7 @@ Description: Python bindings for the computer vision library
 Package: python3-opencv
 Section: python
 Architecture: any
-Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3-numpy-abi9,
-	python3-numpy (>= 1:1.6.1),
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends},
 	libopencv-viz3.0 (= ${binary:Version}),
 	libopencv-shape3.0 (= ${binary:Version}),
 	libopencv-superres3.0 (= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index 56f502f..587d34d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,3 +132,8 @@ override_dh_install:
 	rm -rf debian/tmp/usr/share/OpenCV/doc/html/jquery.js
 
 	dh_install -O--buildsystem=cmake --list-missing
+
+override_dh_gencontrol:
+	dh_numpy
+	dh_numpy3
+	dh_gencontrol

-- 
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