[plplot] 04/06: Fix ocaml dependencies

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository plplot.

commit 6a0bf63ac50213b84b9de815f00350504c3397cc
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Sep 23 15:49:02 2017 +0200

    Fix ocaml dependencies
---
 debian/control       | 9 ++++++---
 debian/rules         | 2 +-
 debian/tests/control | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index c129774..788566d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: camlidl,
                cmake (>= 2.6.3),
                debhelper (>= 9),
                default-jdk,
+               dh-ocaml,
                dh-python,
                gfortran,
                gnat,
@@ -588,9 +589,10 @@ Description: Documentation for PLplot, a plotting library
 Package: libplplot-ocaml
 Architecture: any
 Section: ocaml
-Depends: ocaml-base-nox-${F:OCamlABI},
-         ${misc:Depends},
+Depends: ${misc:Depends},
+         ${ocaml:Depends},
          ${shlibs:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the scientific plotting library
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including
@@ -606,9 +608,10 @@ Package: libplplot-ocaml-dev
 Architecture: any
 Section: ocaml
 Depends: libplplot-ocaml,
-         ocaml-base-nox-${F:OCamlABI},
          ${misc:Depends},
+         ${ocaml:Depends},
          ${shlibs:Depends}
+Provides: ${ocaml:Provides}
 Suggests: ocaml-findlib
 Replaces: libplplot-ocaml (<< 5.9.12.0-1)
 Breaks: libplplot-ocaml (<<5.9.12.0-1)
diff --git a/debian/rules b/debian/rules
index c605813..b99db76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 endif
 
 %:
-	dh $@ -Scmake --with python2,python3
+	dh $@ -Scmake --with python2,python3,ocaml
 
 override_dh_auto_configure:
 	xvfb-run dh_auto_configure -- $(CONFIGURE_OPTIONS)
diff --git a/debian/tests/control b/debian/tests/control
index 38c5bd2..5733dab 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,8 +3,8 @@ Depends: libplplot-dev,
          libplplot-java,
          libqsastime-dev,
          plplot-tcl-dev,
-         python-plplot,
-         python-plplot-qt,
+         python3-plplot,
+         python3-plplot-qt,
          libplplot-ada-dev,
          libplplot-ocaml-dev,
          libplplot-lua,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git