[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. debian/3.11.2.A-1-4-g643f79a

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 643f79acbacc3ccb1644b2a1710593ab5731ecdc
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Feb 17 12:46:47 2010 +0100

    Use automatic dependencies computed by dh_ocaml

diff --git a/debian/changelog b/debian/changelog
index 4f80097..9109e09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jocaml (3.11.2.a-1) unstable; urgency=low
 
   * s/A/a/ in version number (Closes: #569893)
+  * Use automatic dependencies computed by dh-ocaml (>= 0.9)
 
  -- Mehdi Dogguy <mehdi at debian.org>  Wed, 17 Feb 2010 12:35:10 +0100
 
diff --git a/debian/control b/debian/control
index 65f74c0..51a5a62 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  libx11-dev,
  libncurses5-dev,
  libgdbm-dev,
- dh-ocaml,
+ dh-ocaml (>= 0.9),
  ocaml-nox (>= 3.11)
 Homepage: http://jocaml.inria.fr/
 Standards-Version: 3.8.3
@@ -21,8 +21,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/jocaml.git
 
 Package: jocaml
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, jocaml-base (=${binary:Version}), ocaml-nox-${F:OCamlABI}
-Provides: jocaml-${F:JOCamlABI}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${ocaml:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: OCaml extended for concurrent and distributed programming
  The JOCaml programming language is an extension of the OCaml language with
  high-level prmitives for communication and synchronization between processes.
@@ -31,8 +35,12 @@ Description: OCaml extended for concurrent and distributed programming
 
 Package: jocaml-base
 Architecture: any
-Provides: jocaml-base-${F:JOCamlABI}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${ocaml:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: Runtime system for JOCaml bytecode executables
  The JOCaml programming language is an extension of the OCaml language with
  high-level prmitives for communication and synchronization between processes.
diff --git a/debian/jocaml-base.install.in b/debian/jocaml-base.install.in
index 2c5832b..fc40ab8 100644
--- a/debian/jocaml-base.install.in
+++ b/debian/jocaml-base.install.in
@@ -1,5 +1,8 @@
 usr/bin/jocamlrun
 @JOCamlStdlibDir@/ld.conf
 @JOCamlStdlibDir@/stublibs/*thread*
- at JOCamlStdlibDir@/threads/*.cma
- at JOCamlStdlibDir@/vmthreads/*.cma
+ at JOCamlStdlibDir@/threads/join.cma
+ at JOCamlStdlibDir@/threads/threads.cma
+ at JOCamlStdlibDir@/vmthreads/join.cma
+ at JOCamlStdlibDir@/vmthreads/threads.cma
+ at JOCamlStdlibDir@/vmthreads/unix.cma
diff --git a/debian/rules b/debian/rules
index 5b7240f..accef33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,5 +64,9 @@ override_dh_auto_install:
 	echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/jocaml.substvars
 	echo 'F:JOCamlABI=$(JOCAML_ABI)' >> debian/jocaml-base.substvars
 
+override_dh_ocaml:
+	dh_ocaml --checksum=$(JOCAML_ABI) --runtime-map=jocaml:jocaml-base -Xtoplevellib.cma \
+		--nodefined-map=jocaml:Topdirs,Toploop,Topmain,Topstart,Condition,Thread,ThreadUnix,Event,Mutex,UnixLabels,Unix
+
 %:
-	dh --with quilt $@
+	dh --with quilt,ocaml $@

-- 
jocaml packaging