[Pkg-ocaml-maint-commits] [ocamlbuild] 01/03: Use dh_ocaml to fill in the right ocaml-base-nox dependency

Ximin Luo infinity0 at debian.org
Mon Oct 31 07:02:52 UTC 2016


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

infinity0 pushed a commit to branch master
in repository ocamlbuild.

commit 009cbe8dc8ce5bb5088c59022b402720827c090e
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Oct 31 07:52:25 2016 +0100

    Use dh_ocaml to fill in the right ocaml-base-nox dependency
---
 debian/changelog | 6 ++++++
 debian/control   | 6 +++---
 debian/rules     | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d565e29..9590825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocamlbuild (0.9.3-2) UNRELEASED; urgency=medium
+
+  * Use dh_ocaml to add the correct OCaml library dependencies.
+
+ -- Ximin Luo <infinity0 at debian.org>  Mon, 31 Oct 2016 07:48:23 +0100
+
 ocamlbuild (0.9.3-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3af0d9b..d512733 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ximin Luo <infinity0 at debian.org>
-Build-Depends: debhelper (>= 9), ocaml-best-compilers
+Build-Depends: debhelper (>= 9), dh-ocaml, ocaml-best-compilers
 Standards-Version: 3.9.8
 Homepage: https://github.com/ocaml/ocamlbuild/
 Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocamlbuild.git
@@ -11,8 +11,8 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/ocamlbuild
 
 Package: ocamlbuild
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}
-# FIXME: ask if the below is really the best solution
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}, ${ocaml:Depends}
+Provides: ${ocaml:Provides}
 Replaces: libfindlib-ocaml (<< 1.6.3-1), ocaml-nox (<< 4.03.0-1)
 Breaks: libfindlib-ocaml (<< 1.6.3-1), ocaml-nox (<< 4.03.0-1)
 Description: Build tool for building OCaml library and programs
diff --git a/debian/rules b/debian/rules
index 162d2ce..aa1344f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 
 
 %:
-	dh $@
+	dh $@ --with ocaml
 
 # see https://pkg-ocaml-maint.alioth.debian.org/ocaml_packaging_policy.txt
 OCAMLABI = $(shell ocamlc -version)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbuild.git



More information about the Pkg-ocaml-maint-commits mailing list