Major changes in debian/rules
authorStephane Glondu <steph@glondu.net>
Sun, 15 Feb 2009 14:00:23 +0000 (15:00 +0100)
committerStephane Glondu <steph@glondu.net>
Sun, 15 Feb 2009 23:19:32 +0000 (00:19 +0100)
 * more extensive use of debhelper 7
 * do no longer use deprecated dh_movefiles and *.files
 * get closer to CDBS API
 * add a build cache (for Debian debugging)
 * ship labltk examples in a tarball
 * reflect original locations of camlp4 *.mli files in binary packages

39 files changed:
debian/camlp4-extra.dirs.in
debian/camlp4-extra.files.in [deleted file]
debian/camlp4-extra.install.in [new file with mode: 0644]
debian/camlp4.dirs.in
debian/camlp4.files.in [deleted file]
debian/camlp4.install.in [new file with mode: 0644]
debian/camlp4.links [deleted file]
debian/camlp4.links.in [new file with mode: 0644]
debian/clean
debian/control
debian/control.in
debian/ld.conf.in
debian/ocaml-base-nox.dirs.in
debian/ocaml-base-nox.files.in [deleted file]
debian/ocaml-base-nox.install.in
debian/ocaml-base-nox.postinst.in
debian/ocaml-base-nox.prerm.in
debian/ocaml-base.dirs.in
debian/ocaml-base.files.in [deleted file]
debian/ocaml-base.install.in [new file with mode: 0644]
debian/ocaml-compiler-libs.dirs.in
debian/ocaml-compiler-libs.install.in
debian/ocaml-interp.dirs.in
debian/ocaml-interp.files.in [deleted file]
debian/ocaml-interp.install.in
debian/ocaml-native-compilers.install
debian/ocaml-nox.dirs.in
debian/ocaml-nox.install.in
debian/ocaml-nox.links [deleted file]
debian/ocaml-nox.links.in [new file with mode: 0644]
debian/ocaml-nox.lintian-overrides.in [new file with mode: 0644]
debian/ocaml-nox.override.in [deleted file]
debian/ocaml-nox.postinst.in
debian/ocaml-source.install.in
debian/ocaml.dirs.in
debian/ocaml.docs [deleted file]
debian/ocaml.examples [new file with mode: 0644]
debian/ocaml.install.in
debian/rules

index 8e3c72513a53fc55950b72e4ce5557ec9ed37bf2..eb57f50b00f10631bbca054b04d3c7720aa8f5ff 100644 (file)
@@ -1,2 +1,2 @@
 usr/bin
-usr/lib/ocaml/#OcamlABI#/camlp4
+@OCamlStdlibDir@/camlp4
diff --git a/debian/camlp4-extra.files.in b/debian/camlp4-extra.files.in
deleted file mode 100644 (file)
index 4b7e972..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-usr/bin/camlp4boot
-usr/bin/camlp4of
-usr/bin/camlp4rf
-usr/bin/camlp4oof
-usr/bin/camlp4orf
-usr/bin/camlp4prof
-usr/lib/ocaml/#OcamlABI#/camlp4/camlp4of.cma
-usr/lib/ocaml/#OcamlABI#/camlp4/camlp4rf.cma
-usr/lib/ocaml/#OcamlABI#/camlp4/camlp4oof.cma
-usr/lib/ocaml/#OcamlABI#/camlp4/camlp4orf.cma
-OPT: usr/bin/camlp4of.opt
-OPT: usr/bin/camlp4rf.opt
-OPT: usr/bin/camlp4oof.opt
-OPT: usr/bin/camlp4orf.opt
diff --git a/debian/camlp4-extra.install.in b/debian/camlp4-extra.install.in
new file mode 100644 (file)
index 0000000..ce865bd
--- /dev/null
@@ -0,0 +1,14 @@
+usr/bin/camlp4boot
+usr/bin/camlp4of
+usr/bin/camlp4rf
+usr/bin/camlp4oof
+usr/bin/camlp4orf
+usr/bin/camlp4prof
+@OCamlStdlibDir@/camlp4/camlp4of.cma
+@OCamlStdlibDir@/camlp4/camlp4rf.cma
+@OCamlStdlibDir@/camlp4/camlp4oof.cma
+@OCamlStdlibDir@/camlp4/camlp4orf.cma
+OPT: usr/bin/camlp4of.opt
+OPT: usr/bin/camlp4rf.opt
+OPT: usr/bin/camlp4oof.opt
+OPT: usr/bin/camlp4orf.opt
index 8e3c72513a53fc55950b72e4ce5557ec9ed37bf2..eb57f50b00f10631bbca054b04d3c7720aa8f5ff 100644 (file)
@@ -1,2 +1,2 @@
 usr/bin
-usr/lib/ocaml/#OcamlABI#/camlp4
+@OCamlStdlibDir@/camlp4
diff --git a/debian/camlp4.files.in b/debian/camlp4.files.in
deleted file mode 100644 (file)
index 859b5b0..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/camlp4
-usr/bin/camlp4o
-usr/bin/camlp4r
-usr/bin/mkcamlp4
-usr/lib/ocaml/#OcamlABI#/camlp4/
-OPT: usr/bin/camlp4o.opt
-OPT: usr/bin/camlp4r.opt
diff --git a/debian/camlp4.install.in b/debian/camlp4.install.in
new file mode 100644 (file)
index 0000000..8367456
--- /dev/null
@@ -0,0 +1,31 @@
+     usr/bin/camlp4
+     usr/bin/camlp4o
+OPT: usr/bin/camlp4o.opt
+     usr/bin/camlp4r
+OPT: usr/bin/camlp4r.opt
+     usr/bin/mkcamlp4
+     @OCamlStdlibDir@/camlp4/Camlp4Bin.cmi
+     @OCamlStdlibDir@/camlp4/Camlp4Bin.cmo
+OPT: @OCamlStdlibDir@/camlp4/Camlp4Bin.cmx
+OPT: @OCamlStdlibDir@/camlp4/Camlp4Bin.o
+     @OCamlStdlibDir@/camlp4/Camlp4.cmi
+     @OCamlStdlibDir@/camlp4/Camlp4_config.cmi
+     @OCamlStdlibDir@/camlp4/Camlp4Filters
+OPT: @OCamlStdlibDir@/camlp4/camlp4fulllib.a
+     @OCamlStdlibDir@/camlp4/camlp4fulllib.cma
+OPT: @OCamlStdlibDir@/camlp4/camlp4fulllib.cmxa
+     @OCamlStdlibDir@/camlp4/Camlp4_import.cmi
+OPT: @OCamlStdlibDir@/camlp4/camlp4lib.a
+     @OCamlStdlibDir@/camlp4/camlp4lib.cma
+OPT: @OCamlStdlibDir@/camlp4/camlp4lib.cmxa
+     @OCamlStdlibDir@/camlp4/camlp4o.cma
+     @OCamlStdlibDir@/camlp4/Camlp4Parsers
+     @OCamlStdlibDir@/camlp4/Camlp4Printers
+     @OCamlStdlibDir@/camlp4/camlp4prof.cmi
+     @OCamlStdlibDir@/camlp4/camlp4prof.cmo
+OPT: @OCamlStdlibDir@/camlp4/camlp4prof.cmx
+OPT: @OCamlStdlibDir@/camlp4/camlp4prof.o
+     @OCamlStdlibDir@/camlp4/camlp4r.cma
+     @OCamlStdlibDir@/camlp4/Camlp4Top
+     @OCamlStdlibDir@/camlp4/Camlp4Top.cmi
+     @OCamlStdlibDir@/camlp4/Camlp4Top.cmo
diff --git a/debian/camlp4.links b/debian/camlp4.links
deleted file mode 100644 (file)
index 76761b2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/mkcamlp4.1.gz
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/camlp4o.1.gz
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/camlp4r.1.gz
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/camlp4o.opt.1.gz
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/camlp4r.opt.1.gz
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/camlp4.1.gz
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/camlp4o.1.gz
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/camlp4r.1.gz
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/camlp4o.opt.1.gz
-usr/share/man/man1/camlp4.1.gz   usr/share/man/man1/camlp4r.opt.1.gz
diff --git a/debian/camlp4.links.in b/debian/camlp4.links.in
new file mode 100644 (file)
index 0000000..321891e
--- /dev/null
@@ -0,0 +1,9 @@
+     usr/share/man/man1/camlp4.1.gz usr/share/man/man1/mkcamlp4.1.gz
+     usr/share/man/man1/camlp4.1.gz usr/share/man/man1/camlp4o.1.gz
+OPT: usr/share/man/man1/camlp4.1.gz usr/share/man/man1/camlp4o.opt.1.gz
+     usr/share/man/man1/camlp4.1.gz usr/share/man/man1/camlp4r.1.gz
+OPT: usr/share/man/man1/camlp4.1.gz usr/share/man/man1/camlp4r.opt.1.gz
+     usr/share/man/man1/camlp4.1.gz usr/share/man/man1/camlp4o.1.gz
+OPT: usr/share/man/man1/camlp4.1.gz usr/share/man/man1/camlp4o.opt.1.gz
+     usr/share/man/man1/camlp4.1.gz usr/share/man/man1/camlp4r.1.gz
+OPT: usr/share/man/man1/camlp4.1.gz usr/share/man/man1/camlp4r.opt.1.gz
index d1a95ad0240a3860f3c2187f3ac08425c7d5c642..c1659bf545893b75735c3c3eb3c65423a207dda8 100644 (file)
@@ -1,9 +1,9 @@
 build/ocamlbuild_mixed_mode
+config/Makefile
 config/config.debian.install.sh
 config/config.sh
-config/Makefile
 config/m.h
 config/s.h
 myocamlbuild_config.ml
 tools/myocamlbuild_config.ml
-tools/ocamldumpapprox
+debian/examples_labltk.tar.bz2
index 4c290f84239f24dae3afcdb93ee986da01ac4588..c5bcc859448d88198c558d61698abf9f917c7dc6 100644 (file)
@@ -160,6 +160,7 @@ Description: Native code compilers of the OCaml suite (the .opt ones)
 
 Package: ocaml-source
 Architecture: all
+Depends: ${misc:Depends}
 Provides: ocaml-source-${F:OCamlABI}
 Description: Sources for Objective Caml
  Objective Caml (OCaml) is an implementation of the ML language, based on
index 480e4acfb1c3b50305a2adb374312cbe042efdf9..57c627d1e8fd3cd26075a901986441144dca5664 100644 (file)
@@ -143,7 +143,7 @@ Description: Runtime system for OCaml bytecode executables
  you do not require any graphical capabilities for your runtime.
 
 Package: ocaml-native-compilers
-Architecture: #OcamlNativeArchs#
+Architecture: @OCamlNativeArchs@
 Depends: ocaml-nox (= ${binary:Version}), gcc [!arm], gcc-4.2 [arm], binutils, ${shlibs:Depends}, ${misc:Depends}
 Provides: ocaml-best-compilers
 Replaces: ocaml-nox (<= 3.09.2-3)
index 554967abce5ca00360814e4c2d50b5b191f65716..69e2c3e2b26d97882b60fd65557d916154da014d 100644 (file)
@@ -1,2 +1,2 @@
-/usr/local/lib/ocaml/#OcamlABI#/stublibs
-/usr/lib/ocaml/#OcamlABI#/stublibs
+/usr/local/lib/ocaml/@OCamlABI@/stublibs
+@OCamlDllDir@
index d713ce3e1ef6081b416d3430849b394bcad01251..5493f540ea5e1d98212a7be7b356be74ff397800 100644 (file)
@@ -1,4 +1,4 @@
 usr/bin
 usr/share/man/man1
-usr/lib/ocaml/#OcamlABI#
-usr/lib/ocaml/#OcamlABI#/stublibs
+@OCamlStdlibDir@
+@OCamlDllDir@
diff --git a/debian/ocaml-base-nox.files.in b/debian/ocaml-base-nox.files.in
deleted file mode 100644 (file)
index 6c65c98..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-usr/bin/ocamlrun
-usr/share/man/man1/ocamlrun.1
-usr/lib/ocaml/#OcamlABI#/stublibs/dllunix.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dllstr.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dllbigarray.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dllthreads.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dllvmthreads.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dllmldbm.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dllnums.so
-usr/lib/ocaml/#OcamlABI#/ld.conf
-OPT: usr/lib/ocaml/#OcamlABI#/dbm.cmxs
-OPT: usr/lib/ocaml/#OcamlABI#/unix.cmxs
-OPT: usr/lib/ocaml/#OcamlABI#/str.cmxs
-OPT: usr/lib/ocaml/#OcamlABI#/bigarray.cmxs
-OPT: usr/lib/ocaml/#OcamlABI#/nums.cmxs
-usr/lib/ocaml/#OcamlABI#/dbm.cma
-usr/lib/ocaml/#OcamlABI#/unix.cma
-usr/lib/ocaml/#OcamlABI#/str.cma
-usr/lib/ocaml/#OcamlABI#/bigarray.cma
-usr/lib/ocaml/#OcamlABI#/nums.cma
index 9a9bab36e047c409b8b1c95a333d41ab01eec6cd..2470430f5e67cffd6a8c873340121d787620cc36 100644 (file)
@@ -1 +1,21 @@
-debian/ld.conf         /usr/lib/ocaml/#OcamlABI#/
+     usr/bin/ocamlrun
+     usr/share/man/man1/ocamlrun.1
+     @OCamlDllDir@/dllunix.so
+     @OCamlDllDir@/dllstr.so
+     @OCamlDllDir@/dllbigarray.so
+     @OCamlDllDir@/dllthreads.so
+     @OCamlDllDir@/dllvmthreads.so
+     @OCamlDllDir@/dllmldbm.so
+     @OCamlDllDir@/dllnums.so
+     @OCamlStdlibDir@/ld.conf
+     debian/ld.conf @OCamlStdlibDir@
+     @OCamlStdlibDir@/dbm.cma
+OPT: @OCamlStdlibDir@/dbm.cmxs
+     @OCamlStdlibDir@/unix.cma
+OPT: @OCamlStdlibDir@/unix.cmxs
+     @OCamlStdlibDir@/str.cma
+OPT: @OCamlStdlibDir@/str.cmxs
+     @OCamlStdlibDir@/bigarray.cma
+OPT: @OCamlStdlibDir@/bigarray.cmxs
+     @OCamlStdlibDir@/nums.cma
+OPT: @OCamlStdlibDir@/nums.cmxs
index 9adcbe137028ad93fb17197c68a1e8b360f07585..2913dbccbc4f9b16cb760307a88393e6cac36e59 100644 (file)
@@ -1,20 +1,20 @@
-#!/bin/sh
+#!/bin/sh -e
 if [ ! -e /usr/local/lib/ocaml ]; then
     if mkdir /usr/local/lib/ocaml 2>/dev/null; then
        chown root:staff /usr/local/lib/ocaml
        chmod 2775 /usr/local/lib/ocaml
     fi
 fi
-if [ ! -e /usr/local/lib/ocaml/#OcamlABI# ]; then
-    if mkdir /usr/local/lib/ocaml/#OcamlABI# 2>/dev/null; then
-       chown root:staff /usr/local/lib/ocaml/#OcamlABI#
-       chmod 2775 /usr/local/lib/ocaml/#OcamlABI#
+if [ ! -e /usr/local/lib/ocaml/@OCamlABI@ ]; then
+    if mkdir /usr/local/lib/ocaml/@OCamlABI@ 2>/dev/null; then
+       chown root:staff /usr/local/lib/ocaml/@OCamlABI@
+       chmod 2775 /usr/local/lib/ocaml/@OCamlABI@
     fi
 fi
-if [ ! -e /usr/local/lib/ocaml/#OcamlABI#/stublibs ]; then
-    if mkdir /usr/local/lib/ocaml/#OcamlABI#/stublibs 2>/dev/null; then
-       chown root:staff /usr/local/lib/ocaml/#OcamlABI#/stublibs
-       chmod 2775 /usr/local/lib/ocaml/#OcamlABI#/stublibs
+if [ ! -e /usr/local/lib/ocaml/@OCamlABI@/stublibs ]; then
+    if mkdir /usr/local/lib/ocaml/@OCamlABI@/stublibs 2>/dev/null; then
+       chown root:staff /usr/local/lib/ocaml/@OCamlABI@/stublibs
+       chmod 2775 /usr/local/lib/ocaml/@OCamlABI@/stublibs
     fi
 fi
 
index da4a861c7452df9053ad7b5ddb06ccf23bd1266d..d402b7dceb581498e615983e82da15edf897c57a 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-rmdir /usr/local/lib/ocaml/#OcamlABI#/stublibs 2>/dev/null || true
-rmdir /usr/local/lib/ocaml/#OcamlABI# 2>/dev/null || true
+rmdir /usr/local/lib/ocaml/@OCamlABI@/stublibs 2>/dev/null || true
+rmdir /usr/local/lib/ocaml/@OCamlABI@ 2>/dev/null || true
 rmdir /usr/local/lib/ocaml 2>/dev/null || true
 
 #DEBHELPER#
index ba87688d3e464aced73612760e1e1209842b3f63..042cb5d69d2a241139831d13e489c34b777502ae 100644 (file)
@@ -1,2 +1,3 @@
-usr/lib/ocaml/#OcamlABI#/stublibs
 usr/share/doc/ocaml-base
+@OCamlDllDir@
+@OCamlStdlibDir@
diff --git a/debian/ocaml-base.files.in b/debian/ocaml-base.files.in
deleted file mode 100644 (file)
index 30aebbc..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/ocaml/#OcamlABI#/stublibs/dllgraphics.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dlllabltk.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dlltkanim.so
-OPT: usr/lib/ocaml/#OcamlABI#/graphics.cmxs
-usr/lib/ocaml/#OcamlABI#/graphics.cma
diff --git a/debian/ocaml-base.install.in b/debian/ocaml-base.install.in
new file mode 100644 (file)
index 0000000..dc0191b
--- /dev/null
@@ -0,0 +1,5 @@
+     @OCamlDllDir@/dlllabltk.so
+     @OCamlDllDir@/dllgraphics.so
+     @OCamlDllDir@/dlltkanim.so
+     @OCamlStdlibDir@/graphics.cma
+OPT: @OCamlStdlibDir@/graphics.cmxs
index 635520fbfc518100681daa74ae5c7d2b670f6628..e6cdb76704b9c458d4d3c784c20e766f057177f2 100644 (file)
@@ -1,4 +1,3 @@
-usr/lib/ocaml/#OcamlABI#/compiler-libs/parsing
-usr/lib/ocaml/#OcamlABI#/compiler-libs/typing
-usr/lib/ocaml/#OcamlABI#/compiler-libs/utils
-usr/share/lintian/overrides
+@OCamlStdlibDir@/compiler-libs/parsing
+@OCamlStdlibDir@/compiler-libs/typing
+@OCamlStdlibDir@/compiler-libs/utils
index 84372c914e801d95c81215bcc85d650229f4ea03..132c9dee19028d9e99cbd4ceae1ad305c1c0e5b5 100644 (file)
@@ -1,3 +1,3 @@
-parsing/*                              /usr/lib/ocaml/#OcamlABI#/compiler-libs/parsing/
-typing/*                               /usr/lib/ocaml/#OcamlABI#/compiler-libs/typing/
-utils/*                                        /usr/lib/ocaml/#OcamlABI#/compiler-libs/utils/
+parsing/* @OCamlStdlibDir@/compiler-libs/parsing
+typing/* @OCamlStdlibDir@/compiler-libs/typing
+utils/* @OCamlStdlibDir@/compiler-libs/utils
index 31d82691c85b298527047e3fb01fb22c92a5bc8a..4469dc0e41898e211e5cb7d43a83c0ff3bc9758c 100644 (file)
@@ -1,4 +1,4 @@
 usr/bin
 usr/share/man/man1
-usr/lib/ocaml/#OcamlABI#
 usr/share/pixmaps
+@OCamlStdlibDir@
diff --git a/debian/ocaml-interp.files.in b/debian/ocaml-interp.files.in
deleted file mode 100644 (file)
index 2dc610c..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-usr/share/man/man1/ocaml.1
-usr/bin/ocaml
-usr/lib/ocaml/#OcamlABI#/stdlib.cma
-usr/lib/ocaml/#OcamlABI#/arg.cmi
-usr/lib/ocaml/#OcamlABI#/array.cmi
-usr/lib/ocaml/#OcamlABI#/arrayLabels.cmi
-usr/lib/ocaml/#OcamlABI#/buffer.cmi
-usr/lib/ocaml/#OcamlABI#/callback.cmi
-usr/lib/ocaml/#OcamlABI#/camlinternalOO.cmi
-usr/lib/ocaml/#OcamlABI#/char.cmi
-usr/lib/ocaml/#OcamlABI#/complex.cmi
-usr/lib/ocaml/#OcamlABI#/digest.cmi
-usr/lib/ocaml/#OcamlABI#/filename.cmi
-usr/lib/ocaml/#OcamlABI#/format.cmi
-usr/lib/ocaml/#OcamlABI#/gc.cmi
-usr/lib/ocaml/#OcamlABI#/genlex.cmi
-usr/lib/ocaml/#OcamlABI#/hashtbl.cmi
-usr/lib/ocaml/#OcamlABI#/int32.cmi
-usr/lib/ocaml/#OcamlABI#/int64.cmi
-usr/lib/ocaml/#OcamlABI#/lazy.cmi
-usr/lib/ocaml/#OcamlABI#/lexing.cmi
-usr/lib/ocaml/#OcamlABI#/list.cmi
-usr/lib/ocaml/#OcamlABI#/listLabels.cmi
-usr/lib/ocaml/#OcamlABI#/map.cmi
-usr/lib/ocaml/#OcamlABI#/marshal.cmi
-usr/lib/ocaml/#OcamlABI#/moreLabels.cmi
-usr/lib/ocaml/#OcamlABI#/nativeint.cmi
-usr/lib/ocaml/#OcamlABI#/obj.cmi
-usr/lib/ocaml/#OcamlABI#/oo.cmi
-usr/lib/ocaml/#OcamlABI#/parsing.cmi
-usr/lib/ocaml/#OcamlABI#/pervasives.cmi
-usr/lib/ocaml/#OcamlABI#/printexc.cmi
-usr/lib/ocaml/#OcamlABI#/printf.cmi
-usr/lib/ocaml/#OcamlABI#/queue.cmi
-usr/lib/ocaml/#OcamlABI#/random.cmi
-usr/lib/ocaml/#OcamlABI#/scanf.cmi
-usr/lib/ocaml/#OcamlABI#/set.cmi
-usr/lib/ocaml/#OcamlABI#/sort.cmi
-usr/lib/ocaml/#OcamlABI#/stack.cmi
-usr/lib/ocaml/#OcamlABI#/stdLabels.cmi
-usr/lib/ocaml/#OcamlABI#/std_exit.cmi
-usr/lib/ocaml/#OcamlABI#/stream.cmi
-usr/lib/ocaml/#OcamlABI#/string.cmi
-usr/lib/ocaml/#OcamlABI#/stringLabels.cmi
-usr/lib/ocaml/#OcamlABI#/sys.cmi
-usr/lib/ocaml/#OcamlABI#/weak.cmi
-usr/lib/ocaml/#OcamlABI#/toplevellib.cma
-usr/lib/ocaml/#OcamlABI#/toploop.cmi
-usr/lib/ocaml/#OcamlABI#/topdirs.cmi
-usr/lib/ocaml/#OcamlABI#/topmain.cmi
-usr/lib/ocaml/#OcamlABI#/unix.cmi
-usr/lib/ocaml/#OcamlABI#/unixLabels.cmi
-usr/lib/ocaml/#OcamlABI#/str.cmi
-usr/lib/ocaml/#OcamlABI#/dynlink.cmi
-usr/lib/ocaml/#OcamlABI#/dynlink.cma
-usr/lib/ocaml/#OcamlABI#/bigarray.cmi
-usr/lib/ocaml/#OcamlABI#/big_int.cmi
-usr/lib/ocaml/#OcamlABI#/nat.cmi
-usr/lib/ocaml/#OcamlABI#/num.cmi
-usr/lib/ocaml/#OcamlABI#/ratio.cmi
-usr/lib/ocaml/#OcamlABI#/arith_status.cmi
index 3b2f98c17f52babd5766dba7427df2723070ab9b..0b744ce6d78dd319113b2e0f01d418406410ad82 100644 (file)
@@ -1,2 +1,64 @@
-debian/ocaml.xpm       /usr/share/pixmaps
-toplevel/*.mli         /usr/lib/ocaml/#OcamlABI#/
+usr/bin/ocaml
+usr/share/man/man1/ocaml.1
+debian/ocaml.xpm /usr/share/pixmaps
+toplevel/*.mli @OCamlStdlibDir@
+
+@OCamlStdlibDir@/stdlib.cma
+@OCamlStdlibDir@/arg.cmi
+@OCamlStdlibDir@/array.cmi
+@OCamlStdlibDir@/arrayLabels.cmi
+@OCamlStdlibDir@/buffer.cmi
+@OCamlStdlibDir@/callback.cmi
+@OCamlStdlibDir@/camlinternalOO.cmi
+@OCamlStdlibDir@/char.cmi
+@OCamlStdlibDir@/complex.cmi
+@OCamlStdlibDir@/digest.cmi
+@OCamlStdlibDir@/filename.cmi
+@OCamlStdlibDir@/format.cmi
+@OCamlStdlibDir@/gc.cmi
+@OCamlStdlibDir@/genlex.cmi
+@OCamlStdlibDir@/hashtbl.cmi
+@OCamlStdlibDir@/int32.cmi
+@OCamlStdlibDir@/int64.cmi
+@OCamlStdlibDir@/lazy.cmi
+@OCamlStdlibDir@/lexing.cmi
+@OCamlStdlibDir@/list.cmi
+@OCamlStdlibDir@/listLabels.cmi
+@OCamlStdlibDir@/map.cmi
+@OCamlStdlibDir@/marshal.cmi
+@OCamlStdlibDir@/moreLabels.cmi
+@OCamlStdlibDir@/nativeint.cmi
+@OCamlStdlibDir@/obj.cmi
+@OCamlStdlibDir@/oo.cmi
+@OCamlStdlibDir@/parsing.cmi
+@OCamlStdlibDir@/pervasives.cmi
+@OCamlStdlibDir@/printexc.cmi
+@OCamlStdlibDir@/printf.cmi
+@OCamlStdlibDir@/queue.cmi
+@OCamlStdlibDir@/random.cmi
+@OCamlStdlibDir@/scanf.cmi
+@OCamlStdlibDir@/set.cmi
+@OCamlStdlibDir@/sort.cmi
+@OCamlStdlibDir@/stack.cmi
+@OCamlStdlibDir@/stdLabels.cmi
+@OCamlStdlibDir@/std_exit.cmi
+@OCamlStdlibDir@/stream.cmi
+@OCamlStdlibDir@/string.cmi
+@OCamlStdlibDir@/stringLabels.cmi
+@OCamlStdlibDir@/sys.cmi
+@OCamlStdlibDir@/weak.cmi
+@OCamlStdlibDir@/toplevellib.cma
+@OCamlStdlibDir@/toploop.cmi
+@OCamlStdlibDir@/topdirs.cmi
+@OCamlStdlibDir@/topmain.cmi
+@OCamlStdlibDir@/unix.cmi
+@OCamlStdlibDir@/unixLabels.cmi
+@OCamlStdlibDir@/str.cmi
+@OCamlStdlibDir@/dynlink.cmi
+@OCamlStdlibDir@/dynlink.cma
+@OCamlStdlibDir@/bigarray.cmi
+@OCamlStdlibDir@/big_int.cmi
+@OCamlStdlibDir@/nat.cmi
+@OCamlStdlibDir@/num.cmi
+@OCamlStdlibDir@/ratio.cmi
+@OCamlStdlibDir@/arith_status.cmi
index 2dfe0d09a4d0720e0e779902dfaa9c14c199e2e8..1efe9bfe51d9e8c4b9185bc9b72386e5e3a3a01b 100644 (file)
@@ -1 +1,6 @@
+usr/bin/ocamlc.opt
+usr/bin/ocamldep.opt
+usr/bin/ocamldoc.opt
+usr/bin/ocamllex.opt
+usr/bin/ocamlopt.opt
 debian/ocamlfind/ocaml-native-compilers.conf usr/share/ocaml-findlib/
index 5ca3df3de426b42fdc287268fad0d97eb15e1726..d95b06bae531016e9e6c0d519777f8458cf381c4 100644 (file)
@@ -1,9 +1,2 @@
 usr/bin
-usr/lib/ocaml/#OcamlABI#
-usr/lib/ocaml/#OcamlABI#/config
-usr/include
 usr/share/doc/ocaml-nox
-usr/share/man/man1
-usr/share/man/man3
-usr/share/texmf/tex/latex/misc
-usr/share/lintian/overrides
index 63488e11a7b764bda36012d7268c93b44f158410..222e5d1749793905df3f69df220731112aea5da8 100644 (file)
@@ -1,3 +1,369 @@
-config/Makefile                        /usr/lib/ocaml/#OcamlABI#/config/Makefile
-debian/native-archs            /usr/lib/ocaml/#OcamlABI#/
-OPT: tools/ocamldumpapprox           /usr/bin
+     usr/bin/ocamlbuild
+     usr/bin/ocamlbuild.byte
+     usr/bin/ocamlc
+     usr/bin/ocamlcp
+     usr/bin/ocamldebug
+     usr/bin/ocamldep
+     usr/bin/ocamldoc
+     usr/bin/ocamllex
+     usr/bin/ocamlmklib
+     usr/bin/ocamlmktop
+     usr/bin/ocamlprof
+     usr/bin/ocamlyacc
+     debian/native-archs @OCamlStdlibDir@
+OPT: usr/bin/ocamlbuild.native
+OPT: usr/bin/ocamlopt
+     @OCamlStdlibDir@/addlabels
+     @OCamlStdlibDir@/scrapelabels
+     @OCamlStdlibDir@/caml
+     @OCamlStdlibDir@/camlheader
+     @OCamlStdlibDir@/camlheader_ur
+     @OCamlStdlibDir@/Makefile.config
+     @OCamlStdlibDir@/expunge
+     @OCamlStdlibDir@/extract_crc
+     @OCamlStdlibDir@/ocamlbuild
+     @OCamlStdlibDir@/ocamldoc
+     @OCamlStdlibDir@/threads
+     @OCamlStdlibDir@/vmthreads
+     @OCamlStdlibDir@/libbigarray.a
+OPT: @OCamlStdlibDir@/libasmrun.a
+OPT: @OCamlStdlibDir@/libasmrunp.a
+     @OCamlStdlibDir@/libcamlrun.a
+     @OCamlStdlibDir@/libcamlrun_shared.so
+     @OCamlStdlibDir@/libmldbm.a
+     @OCamlStdlibDir@/libnums.a
+     @OCamlStdlibDir@/libstr.a
+     @OCamlStdlibDir@/libthreads.a
+     @OCamlStdlibDir@/libthreadsnat.a
+     @OCamlStdlibDir@/libunix.a
+     @OCamlStdlibDir@/arg.ml
+     @OCamlStdlibDir@/arg.mli
+OPT: @OCamlStdlibDir@/arg.cmx
+OPT: @OCamlStdlibDir@/arg.p.cmx
+OPT: @OCamlStdlibDir@/arith_flags.cmx
+OPT: @OCamlStdlibDir@/arith_status.cmx
+     @OCamlStdlibDir@/arith_status.mli
+     @OCamlStdlibDir@/arrayLabels.ml
+     @OCamlStdlibDir@/arrayLabels.mli
+OPT: @OCamlStdlibDir@/arrayLabels.cmx
+OPT: @OCamlStdlibDir@/arrayLabels.p.cmx
+     @OCamlStdlibDir@/array.ml
+     @OCamlStdlibDir@/array.mli
+OPT: @OCamlStdlibDir@/array.cmx
+OPT: @OCamlStdlibDir@/array.p.cmx
+OPT: @OCamlStdlibDir@/big_int.cmx
+     @OCamlStdlibDir@/big_int.mli
+OPT: @OCamlStdlibDir@/bigarray.a
+OPT: @OCamlStdlibDir@/bigarray.cmx
+OPT: @OCamlStdlibDir@/bigarray.cmxa
+     @OCamlStdlibDir@/bigarray.mli
+     @OCamlStdlibDir@/buffer.ml
+     @OCamlStdlibDir@/buffer.mli
+OPT: @OCamlStdlibDir@/buffer.cmx
+OPT: @OCamlStdlibDir@/buffer.p.cmx
+     @OCamlStdlibDir@/callback.ml
+     @OCamlStdlibDir@/callback.mli
+OPT: @OCamlStdlibDir@/callback.cmx
+OPT: @OCamlStdlibDir@/callback.p.cmx
+     @OCamlStdlibDir@/camlinternalLazy.cmi
+OPT: @OCamlStdlibDir@/camlinternalLazy.cmx
+     @OCamlStdlibDir@/camlinternalLazy.ml
+     @OCamlStdlibDir@/camlinternalLazy.mli
+OPT: @OCamlStdlibDir@/camlinternalLazy.p.cmx
+     @OCamlStdlibDir@/camlinternalMod.cmi
+OPT: @OCamlStdlibDir@/camlinternalMod.cmx
+     @OCamlStdlibDir@/camlinternalMod.ml
+     @OCamlStdlibDir@/camlinternalMod.mli
+OPT: @OCamlStdlibDir@/camlinternalMod.p.cmx
+     @OCamlStdlibDir@/camlinternalOO.ml
+     @OCamlStdlibDir@/camlinternalOO.mli
+OPT: @OCamlStdlibDir@/camlinternalOO.cmx
+OPT: @OCamlStdlibDir@/camlinternalOO.p.cmx
+     @OCamlStdlibDir@/char.ml
+     @OCamlStdlibDir@/char.mli
+OPT: @OCamlStdlibDir@/char.cmx
+OPT: @OCamlStdlibDir@/char.p.cmx
+     @OCamlStdlibDir@/complex.ml
+     @OCamlStdlibDir@/complex.mli
+OPT: @OCamlStdlibDir@/complex.cmx
+OPT: @OCamlStdlibDir@/complex.p.cmx
+     @OCamlStdlibDir@/condition.mli
+OPT: @OCamlStdlibDir@/dbm.a
+     @OCamlStdlibDir@/dbm.cmi
+OPT: @OCamlStdlibDir@/dbm.cmx
+OPT: @OCamlStdlibDir@/dbm.cmxa
+     @OCamlStdlibDir@/dbm.mli
+     @OCamlStdlibDir@/digest.ml
+     @OCamlStdlibDir@/digest.mli
+OPT: @OCamlStdlibDir@/digest.cmx
+OPT: @OCamlStdlibDir@/digest.p.cmx
+OPT: @OCamlStdlibDir@/dynlink.a
+OPT: @OCamlStdlibDir@/dynlink.cmx
+OPT: @OCamlStdlibDir@/dynlink.cmxa
+     @OCamlStdlibDir@/dynlink.mli
+     @OCamlStdlibDir@/event.mli
+     @OCamlStdlibDir@/filename.ml
+     @OCamlStdlibDir@/filename.mli
+OPT: @OCamlStdlibDir@/filename.cmx
+OPT: @OCamlStdlibDir@/filename.p.cmx
+     @OCamlStdlibDir@/format.ml
+     @OCamlStdlibDir@/format.mli
+OPT: @OCamlStdlibDir@/format.cmx
+OPT: @OCamlStdlibDir@/format.p.cmx
+     @OCamlStdlibDir@/gc.ml
+     @OCamlStdlibDir@/gc.mli
+OPT: @OCamlStdlibDir@/gc.cmx
+OPT: @OCamlStdlibDir@/gc.p.cmx
+     @OCamlStdlibDir@/genlex.ml
+     @OCamlStdlibDir@/genlex.mli
+OPT: @OCamlStdlibDir@/genlex.cmx
+OPT: @OCamlStdlibDir@/genlex.p.cmx
+     @OCamlStdlibDir@/hashtbl.ml
+     @OCamlStdlibDir@/hashtbl.mli
+OPT: @OCamlStdlibDir@/hashtbl.cmx
+OPT: @OCamlStdlibDir@/hashtbl.p.cmx
+     @OCamlStdlibDir@/int32.ml
+     @OCamlStdlibDir@/int32.mli
+OPT: @OCamlStdlibDir@/int32.cmx
+OPT: @OCamlStdlibDir@/int32.p.cmx
+     @OCamlStdlibDir@/int64.ml
+     @OCamlStdlibDir@/int64.mli
+OPT: @OCamlStdlibDir@/int64.cmx
+OPT: @OCamlStdlibDir@/int64.p.cmx
+OPT: @OCamlStdlibDir@/int_misc.cmx
+     @OCamlStdlibDir@/lazy.ml
+     @OCamlStdlibDir@/lazy.mli
+OPT: @OCamlStdlibDir@/lazy.cmx
+OPT: @OCamlStdlibDir@/lazy.p.cmx
+     @OCamlStdlibDir@/lexing.ml
+     @OCamlStdlibDir@/lexing.mli
+OPT: @OCamlStdlibDir@/lexing.cmx
+OPT: @OCamlStdlibDir@/lexing.p.cmx
+     @OCamlStdlibDir@/listLabels.ml
+     @OCamlStdlibDir@/listLabels.mli
+OPT: @OCamlStdlibDir@/listLabels.cmx
+OPT: @OCamlStdlibDir@/listLabels.p.cmx
+     @OCamlStdlibDir@/list.ml
+     @OCamlStdlibDir@/list.mli
+OPT: @OCamlStdlibDir@/list.cmx
+OPT: @OCamlStdlibDir@/list.p.cmx
+     @OCamlStdlibDir@/map.ml
+     @OCamlStdlibDir@/map.mli
+OPT: @OCamlStdlibDir@/map.cmx
+OPT: @OCamlStdlibDir@/map.p.cmx
+     @OCamlStdlibDir@/marshal.ml
+     @OCamlStdlibDir@/marshal.mli
+OPT: @OCamlStdlibDir@/marshal.cmx
+OPT: @OCamlStdlibDir@/marshal.p.cmx
+     @OCamlStdlibDir@/moreLabels.ml
+     @OCamlStdlibDir@/moreLabels.mli
+OPT: @OCamlStdlibDir@/moreLabels.cmx
+OPT: @OCamlStdlibDir@/moreLabels.p.cmx
+     @OCamlStdlibDir@/mutex.mli
+OPT: @OCamlStdlibDir@/nat.cmx
+     @OCamlStdlibDir@/nat.mli
+     @OCamlStdlibDir@/nativeint.ml
+     @OCamlStdlibDir@/nativeint.mli
+OPT: @OCamlStdlibDir@/nativeint.cmx
+OPT: @OCamlStdlibDir@/nativeint.p.cmx
+OPT: @OCamlStdlibDir@/num.cmx
+     @OCamlStdlibDir@/num.mli
+OPT: @OCamlStdlibDir@/nums.a
+OPT: @OCamlStdlibDir@/nums.cmxa
+     @OCamlStdlibDir@/obj.ml
+     @OCamlStdlibDir@/obj.mli
+OPT: @OCamlStdlibDir@/obj.cmx
+OPT: @OCamlStdlibDir@/obj.p.cmx
+     @OCamlStdlibDir@/oo.ml
+     @OCamlStdlibDir@/oo.mli
+OPT: @OCamlStdlibDir@/oo.cmx
+OPT: @OCamlStdlibDir@/oo.p.cmx
+     @OCamlStdlibDir@/outcometree.cmi
+     @OCamlStdlibDir@/outcometree.mli
+     @OCamlStdlibDir@/parsing.ml
+     @OCamlStdlibDir@/parsing.mli
+OPT: @OCamlStdlibDir@/parsing.cmx
+OPT: @OCamlStdlibDir@/parsing.p.cmx
+     @OCamlStdlibDir@/pervasives.ml
+     @OCamlStdlibDir@/pervasives.mli
+OPT: @OCamlStdlibDir@/pervasives.cmx
+OPT: @OCamlStdlibDir@/pervasives.p.cmx
+     @OCamlStdlibDir@/printexc.ml
+     @OCamlStdlibDir@/printexc.mli
+OPT: @OCamlStdlibDir@/printexc.cmx
+OPT: @OCamlStdlibDir@/printexc.p.cmx
+     @OCamlStdlibDir@/printf.ml
+     @OCamlStdlibDir@/printf.mli
+OPT: @OCamlStdlibDir@/printf.cmx
+OPT: @OCamlStdlibDir@/printf.p.cmx
+     @OCamlStdlibDir@/profiling.cmi
+     @OCamlStdlibDir@/profiling.cmo
+     @OCamlStdlibDir@/queue.ml
+     @OCamlStdlibDir@/queue.mli
+OPT: @OCamlStdlibDir@/queue.cmx
+OPT: @OCamlStdlibDir@/queue.p.cmx
+     @OCamlStdlibDir@/random.ml
+     @OCamlStdlibDir@/random.mli
+OPT: @OCamlStdlibDir@/random.cmx
+OPT: @OCamlStdlibDir@/random.p.cmx
+OPT: @OCamlStdlibDir@/ratio.cmx
+     @OCamlStdlibDir@/ratio.mli
+     @OCamlStdlibDir@/scanf.ml
+     @OCamlStdlibDir@/scanf.mli
+OPT: @OCamlStdlibDir@/scanf.cmx
+OPT: @OCamlStdlibDir@/scanf.p.cmx
+     @OCamlStdlibDir@/set.ml
+     @OCamlStdlibDir@/set.mli
+OPT: @OCamlStdlibDir@/set.cmx
+OPT: @OCamlStdlibDir@/set.p.cmx
+     @OCamlStdlibDir@/sort.ml
+     @OCamlStdlibDir@/sort.mli
+OPT: @OCamlStdlibDir@/sort.cmx
+OPT: @OCamlStdlibDir@/sort.p.cmx
+     @OCamlStdlibDir@/stack.ml
+     @OCamlStdlibDir@/stack.mli
+OPT: @OCamlStdlibDir@/stack.cmx
+OPT: @OCamlStdlibDir@/stack.p.cmx
+OPT: @OCamlStdlibDir@/stdlib.a
+OPT: @OCamlStdlibDir@/stdlib.cmxa
+OPT: @OCamlStdlibDir@/stdlib.p.a
+OPT: @OCamlStdlibDir@/stdlib.p.cmxa
+     @OCamlStdlibDir@/std_exit.cmo
+OPT: @OCamlStdlibDir@/std_exit.cmx
+     @OCamlStdlibDir@/std_exit.ml
+OPT: @OCamlStdlibDir@/std_exit.o
+OPT: @OCamlStdlibDir@/std_exit.p.cmx
+OPT: @OCamlStdlibDir@/std_exit.p.o
+OPT: @OCamlStdlibDir@/stdLabels.cmx
+     @OCamlStdlibDir@/stdLabels.ml
+     @OCamlStdlibDir@/stdLabels.mli
+OPT: @OCamlStdlibDir@/stdLabels.p.cmx
+OPT: @OCamlStdlibDir@/str.a
+OPT: @OCamlStdlibDir@/str.cmx
+OPT: @OCamlStdlibDir@/str.cmxa
+     @OCamlStdlibDir@/str.mli
+     @OCamlStdlibDir@/stream.ml
+     @OCamlStdlibDir@/stream.mli
+OPT: @OCamlStdlibDir@/stream.cmx
+OPT: @OCamlStdlibDir@/stream.p.cmx
+     @OCamlStdlibDir@/string.ml
+     @OCamlStdlibDir@/string.mli
+OPT: @OCamlStdlibDir@/string.cmx
+OPT: @OCamlStdlibDir@/string.p.cmx
+     @OCamlStdlibDir@/stringLabels.ml
+     @OCamlStdlibDir@/stringLabels.mli
+OPT: @OCamlStdlibDir@/stringLabels.cmx
+OPT: @OCamlStdlibDir@/stringLabels.p.cmx
+     @OCamlStdlibDir@/sys.ml
+     @OCamlStdlibDir@/sys.mli
+OPT: @OCamlStdlibDir@/sys.cmx
+OPT: @OCamlStdlibDir@/sys.p.cmx
+     @OCamlStdlibDir@/thread.mli
+     @OCamlStdlibDir@/threadUnix.mli
+     @OCamlStdlibDir@/topstart.cmo
+OPT: @OCamlStdlibDir@/unix.a
+OPT: @OCamlStdlibDir@/unix.cmx
+OPT: @OCamlStdlibDir@/unix.cmxa
+     @OCamlStdlibDir@/unix.mli
+OPT: @OCamlStdlibDir@/unixLabels.cmx
+     @OCamlStdlibDir@/unixLabels.mli
+     @OCamlStdlibDir@/weak.ml
+     @OCamlStdlibDir@/weak.mli
+OPT: @OCamlStdlibDir@/weak.cmx
+OPT: @OCamlStdlibDir@/weak.p.cmx
+     usr/share/man/man3/Arg.3o
+     usr/share/man/man3/Array.3o
+     usr/share/man/man3/ArrayLabels.3o
+     usr/share/man/man3/Bigarray.3o
+     usr/share/man/man3/Bigarray.Array1.3o
+     usr/share/man/man3/Bigarray.Array2.3o
+     usr/share/man/man3/Bigarray.Array3.3o
+     usr/share/man/man3/Bigarray.Genarray.3o
+     usr/share/man/man3/Buffer.3o
+     usr/share/man/man3/Callback.3o
+     usr/share/man/man3/CamlinternalLazy.3o
+     usr/share/man/man3/CamlinternalMod.3o
+     usr/share/man/man3/CamlinternalOO.3o
+     usr/share/man/man3/Char.3o
+     usr/share/man/man3/Complex.3o
+     usr/share/man/man3/Digest.3o
+     usr/share/man/man3/Filename.3o
+     usr/share/man/man3/Format.3o
+     usr/share/man/man3/Gc.3o
+     usr/share/man/man3/Genlex.3o
+     usr/share/man/man3/Hashtbl.3o
+     usr/share/man/man3/Hashtbl.HashedType.3o
+     usr/share/man/man3/Hashtbl.Make.3o
+     usr/share/man/man3/Hashtbl.S.3o
+     usr/share/man/man3/Int32.3o
+     usr/share/man/man3/Int64.3o
+     usr/share/man/man3/Lazy.3o
+     usr/share/man/man3/Lexing.3o
+     usr/share/man/man3/List.3o
+     usr/share/man/man3/ListLabels.3o
+     usr/share/man/man3/Map.3o
+     usr/share/man/man3/Map.Make.3o
+     usr/share/man/man3/Map.OrderedType.3o
+     usr/share/man/man3/Map.S.3o
+     usr/share/man/man3/Marshal.3o
+     usr/share/man/man3/MoreLabels.3o
+     usr/share/man/man3/MoreLabels.Hashtbl.3o
+     usr/share/man/man3/MoreLabels.Hashtbl.HashedType.3o
+     usr/share/man/man3/MoreLabels.Hashtbl.Make.3o
+     usr/share/man/man3/MoreLabels.Hashtbl.S.3o
+     usr/share/man/man3/MoreLabels.Map.3o
+     usr/share/man/man3/MoreLabels.Map.Make.3o
+     usr/share/man/man3/MoreLabels.Map.OrderedType.3o
+     usr/share/man/man3/MoreLabels.Map.S.3o
+     usr/share/man/man3/MoreLabels.Set.3o
+     usr/share/man/man3/MoreLabels.Set.Make.3o
+     usr/share/man/man3/MoreLabels.Set.OrderedType.3o
+     usr/share/man/man3/MoreLabels.Set.S.3o
+     usr/share/man/man3/Nativeint.3o
+     usr/share/man/man3/Num.3o
+     usr/share/man/man3/Obj.3o
+     usr/share/man/man3/Oo.3o
+     usr/share/man/man3/Parsing.3o
+     usr/share/man/man3/Pervasives.3o
+     usr/share/man/man3/Pervasives.LargeFile.3o
+     usr/share/man/man3/Printexc.3o
+     usr/share/man/man3/Printf.3o
+     usr/share/man/man3/Queue.3o
+     usr/share/man/man3/Random.3o
+     usr/share/man/man3/Random.State.3o
+     usr/share/man/man3/Scanf.3o
+     usr/share/man/man3/Scanf.Scanning.3o
+     usr/share/man/man3/Set.3o
+     usr/share/man/man3/Set.Make.3o
+     usr/share/man/man3/Set.OrderedType.3o
+     usr/share/man/man3/Set.S.3o
+     usr/share/man/man3/Sort.3o
+     usr/share/man/man3/Stack.3o
+     usr/share/man/man3/StdLabels.3o
+     usr/share/man/man3/StdLabels.Array.3o
+     usr/share/man/man3/StdLabels.List.3o
+     usr/share/man/man3/StdLabels.String.3o
+     usr/share/man/man3/Str.3o
+     usr/share/man/man3/Stream.3o
+     usr/share/man/man3/String.3o
+     usr/share/man/man3/StringLabels.3o
+     usr/share/man/man3/Sys.3o
+     usr/share/man/man3/Unix.3o
+     usr/share/man/man3/Unix.LargeFile.3o
+     usr/share/man/man3/Weak.3o
+     usr/share/man/man3/Weak.Make.3o
+     usr/share/man/man3/Weak.S.3o
+OPT: usr/share/man/man1/ocamlopt.1
+     usr/share/man/man1/ocamlprof.1
+     usr/share/man/man1/ocamlc.1
+     usr/share/man/man1/ocamldep.1
+     usr/share/man/man1/ocamlcp.1
+     usr/share/man/man1/ocamldumpobj.1
+     usr/share/man/man1/ocamlmklib.1
+     usr/share/man/man1/ocamlmktop.1
+     usr/share/man/man1/ocamldoc.1
+     usr/share/man/man1/ocamlyacc.1
+     usr/share/man/man1/ocamlbuild.1
+     usr/share/man/man1/ocamlobjinfo.1
+     usr/share/man/man1/ocamldebug.1
+     usr/share/man/man1/ocamllex.1
diff --git a/debian/ocaml-nox.links b/debian/ocaml-nox.links
deleted file mode 100644 (file)
index ba12315..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/man/man1/ocamlbuild.1.gz     usr/share/man/man1/ocamlbuild.byte.1.gz
-usr/share/man/man1/ocamlbuild.1.gz     usr/share/man/man1/ocamlbuild.native.1.gz
diff --git a/debian/ocaml-nox.links.in b/debian/ocaml-nox.links.in
new file mode 100644 (file)
index 0000000..7e79384
--- /dev/null
@@ -0,0 +1,2 @@
+     usr/share/man/man1/ocamlbuild.1.gz usr/share/man/man1/ocamlbuild.byte.1.gz
+OPT: usr/share/man/man1/ocamlbuild.1.gz usr/share/man/man1/ocamlbuild.native.1.gz
diff --git a/debian/ocaml-nox.lintian-overrides.in b/debian/ocaml-nox.lintian-overrides.in
new file mode 100644 (file)
index 0000000..e143178
--- /dev/null
@@ -0,0 +1 @@
+ocaml-nox: script-not-executable .@OCamlStdlibDir@/camlheader
diff --git a/debian/ocaml-nox.override.in b/debian/ocaml-nox.override.in
deleted file mode 100644 (file)
index 2c94fc6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-ocaml-nox: script-not-executable ./usr/lib/ocaml/#OcamlABI#/camlheader
index d291475faace46ef07c162e554bb3e3b21d32abd..e5d14cedcb41d0a7c6c8ec38040a967aa6d3b1b1 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 if [ "$1" = "configure" ]; then
-  ln -sf /usr/lib/ocaml/#OcamlABI#/caml /usr/include/
+  ln -sf @OCamlStdlibDir@/caml /usr/include/
 
   # TEMPORARILY DISABLED while moving ocaml-md5sums to dh-ocaml
   #ocaml-md5sums update
index 59039b90f041df4d18d9f6e6b6e1ae335e93a364..c561e6ef69259bb02d933ee7c99ab23eb1ad299e 100644 (file)
@@ -1 +1 @@
-debian/ocaml-source-#OcamlABI#.tar.bz2         /usr/src/
+debian/ocaml-source-@OCamlABI@.tar.bz2 /usr/src/
index b8299c711cbcdafcccea7a3b5c869017bb4535da..309932390b04c63a021dd168765480d194ca2435 100644 (file)
@@ -1,3 +1,3 @@
 usr/bin
-usr/lib/ocaml/#OcamlABI#
 usr/share/doc/ocaml
+@OCamlStdlibDir@
diff --git a/debian/ocaml.docs b/debian/ocaml.docs
deleted file mode 100644 (file)
index 78b99c6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-otherlibs/labltk/examples_labltk
diff --git a/debian/ocaml.examples b/debian/ocaml.examples
new file mode 100644 (file)
index 0000000..bdc4546
--- /dev/null
@@ -0,0 +1 @@
+debian/examples_labltk.tar.bz2
index b16eef4056243d3b73d0fbb17a9ac92c193aac0d..0b7836bb05af0fd21139ab5ce8cc7c7a5e01d1c5 100644 (file)
@@ -1 +1,12 @@
-otherlibs/labltk/README                /usr/share/doc/ocaml/README.labltk
+     usr/bin/labltk
+     usr/bin/ocamlbrowser
+     @OCamlStdlibDir@/labltk
+     @OCamlStdlibDir@/libgraphics.a
+OPT: @OCamlStdlibDir@/graphics.a
+     @OCamlStdlibDir@/graphics.cmi
+OPT: @OCamlStdlibDir@/graphics.cmx
+OPT: @OCamlStdlibDir@/graphics.cmxa
+     @OCamlStdlibDir@/graphics.mli
+     @OCamlStdlibDir@/graphicsX11.cmi
+OPT: @OCamlStdlibDir@/graphicsX11.cmx
+     @OCamlStdlibDir@/graphicsX11.mli
index 2cb9c2361ee5f809b664f2e9b2f5ba4197f14193..135357893e2c083189e0a98d4607a3f0b1901ae6 100755 (executable)
@@ -1,17 +1,24 @@
 #!/usr/bin/make -f
 include /usr/share/dpatch/dpatch.make
 
-PACKAGE = ocaml
-OCAMLMAJOR = 3.11
-OCAMLMINOR = 0
-OCAMLABI = $(OCAMLMAJOR).$(OCAMLMINOR)
-STDLIBDIR = /usr/lib/ocaml/$(OCAMLABI)
-MD5SUMSDIR = /var/lib/ocaml/md5sums
-INSTDIR = $(CURDIR)/debian/ocaml-nox/usr
+PACKAGE := ocaml
+ALL_PACKAGES := $(shell sed -ne 's/^Package: //p' debian/control)
+OCAMLMAJOR := 3.11
+OCAMLMINOR := 0
+
+# Build cache (for Debian debugging)
+BUILDCACHE := $(wildcard ../ocaml.cache)
 
-NATIVE_ARCHS = $(shell cat debian/native-archs)
-DISTDIR = $(PACKAGE)-$(OCAMLMAJOR).$(OCAMLMINOR)
-SRCTARBALL = $(PACKAGE)-source-$(OCAMLMAJOR).$(OCAMLMINOR).tar.bz2
+# These are also in CDBS
+OCAML_ABI := $(OCAMLMAJOR).$(OCAMLMINOR)
+OCAML_STDLIB_DIR := /usr/lib/ocaml/$(OCAML_ABI)
+OCAML_DLL_DIR = $(OCAML_STDLIB_DIR)/stublibs
+OCAML_NATIVE_ARCHS := $(shell cat debian/native-archs)
+
+MD5SUMSDIR = /var/lib/ocaml/md5sums
+INSTDIR = $(CURDIR)/debian/tmp/usr
+DISTDIR = $(PACKAGE)-$(OCAML_ABI)
+SRCTARBALL = $(PACKAGE)-source-$(OCAML_ABI).tar.bz2
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -24,7 +31,7 @@ export DH_OPTIONS
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-THIS_NATIVE_ARCH    ?= $(findstring $(DEB_BUILD_ARCH),$(NATIVE_ARCHS))
+OCAML_OPT_ARCH      ?= $(findstring $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS))
 
 CFLAGS = -Wall -g
 
@@ -36,34 +43,49 @@ endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
-ifeq (,$(THIS_NATIVE_ARCH))
-       SED_HANDLE_OPT := -e '/^OPT: /d'
+
+CONFIGURE_OPTS := \
+  --with-pthread -prefix /usr \
+  -libdir $(OCAML_STDLIB_DIR) \
+  -mandir /usr/share/man \
+  -tkdefs "-I/usr/include/tcl8.4" \
+  -tklibs "-L/usr/lib -ltk8.4 -ltcl8.4"
+
+CONFIGURE_SED := \
+  -e "s%MANDIR=.*$$%MANDIR=\$$(PREFIX)/share/man%g" \
+  -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAML_ABI)%g" \
+  -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAML_ABI)/stublibs%g"
+
+# These are also in CDBS
+OCAML_IN_FILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
+OCAMLINIT_SED := -e 's%^ \+%%' \
+  -e 's%@OCamlABI@%$(OCAML_ABI)%' \
+  -e 's%@OCamlStdlibDir@%$(OCAML_STDLIB_DIR)%' \
+  -e 's%@OCamlDllDir@%$(OCAML_DLL_DIR)%'
+ifeq (,$(OCAML_OPT_ARCH))
+  OCAMLINIT_SED += -e '/^OPT: /d'
 else
-       SED_HANDLE_OPT := -e 's/^OPT: //'
+  OCAMLINIT_SED += -e 's/^OPT: //'
 endif
 
 patch-stamp: debian/$(SRCTARBALL)
 
-abi-sed-stamp: debian/$(SRCTARBALL)
-       for t in `find debian/ -name \*.in | grep -v debian/control.in`; do \
-         sed -e 's%#OcamlABI#%$(OCAMLABI)%' -e 's%#OcamlMAJOR#%$(OCAMLMAJOR)%' \
-           $(SED_HANDLE_OPT) $$t >$${t%.in}; \
+ocamlinit-stamp: debian/$(SRCTARBALL)
+       for t in $(OCAML_IN_FILES); do \
+         sed $(OCAMLINIT_SED) $$t.in > $$t; \
        done
        touch $@
 
-abi-sed-clean:
-       for t in `find debian/ -name \*.in | grep -v debian/control.in`; do \
-         rm -f $${t%.in}; \
-       done
-
 # Generate ocaml-native-compilers' Architecture field.
 # Should never be called automatically.
 debian/control:
-       sed -e 's/#OcamlNativeArchs#/$(NATIVE_ARCHS)/g' debian/control.in > $@
+       sed -e 's/@OCamlNativeArchs@/$(NATIVE_ARCHS)/g' debian/control.in > $@
 
 pre-config-stamp: debian/$(SRCTARBALL)
+# Backup upstream config.{sub,guess}, and use most up-to-date ones
        for ext in sub guess; do \
-         if [ -f /usr/share/misc/config.$$ext ] && ! [ -f debian/config.orig.$$ext ] ; then \
+         if [ -f /usr/share/misc/config.$$ext ] && \
+           ! [ -f debian/config.orig.$$ext ]; then \
            mv config/gnu/config.$$ext debian/config.orig.$$ext; \
            cp -f /usr/share/misc/config.$$ext config/gnu/config.$$ext; \
          fi; \
@@ -73,71 +95,62 @@ pre-config-stamp: debian/$(SRCTARBALL)
 debian/$(SRCTARBALL):
        ln -fs . $(DISTDIR)     # beware of the symlink recursion!
        tar --anchored -chjf $@ \
-               --exclude=$(DISTDIR)/$(DISTDIR) \
-               --exclude-from=debian/ocaml-source.exclude \
-               $(DISTDIR)/
+         --exclude=$(DISTDIR)/$(DISTDIR)       \
+         --exclude-from=debian/ocaml-source.exclude \
+         $(DISTDIR)/
        rm -f $(DISTDIR)
 
-config-stamp: pre-config-stamp patch-stamp abi-sed-stamp
-       dh_testdir
-       ./configure --with-pthread -prefix /usr                         \
-               -libdir /usr/lib/ocaml/$(OCAMLABI)                      \
-               -mandir /usr/share/man                                  \
-               -tkdefs "-I/usr/include/tcl8.4"                         \
-               -tklibs "-L/usr/lib -ltk8.4 -ltcl8.4"
-       sed -e "s%MANDIR=.*$$%MANDIR=\$$(PREFIX)/share/man%g"                                   \
-           -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)%g"                       \
-           -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)/stublibs%g"      \
-               config/Makefile > config/Makefile.debian
-       mv config/Makefile.debian config/Makefile
-       if test -z "`grep "OTHERLIBRARIES.*labltk" config/Makefile`"; then\
-               echo "Error, labltk library was not built";             \
-               echo "Check your tcl/tk development packages";          \
-               echo "Aborting.";                                       \
-               exit 1;                                                 \
+config-stamp: pre-config-stamp patch-stamp ocamlinit-stamp
+       dh build --before dh_auto_configure
+       ./configure $(CONFIGURE_OPTS)
+       sed -i $(CONFIGURE_SED) config/Makefile
+       if test -z "`grep "OTHERLIBRARIES.*labltk" config/Makefile`"; then \
+         echo "Error, labltk library was not detected"; \
+         echo "Check your tcl/tk development packages"; \
+         echo "Aborting."; \
+         exit 1; \
        fi
        touch $@
 
+patch-stamp: ocamlinit-stamp
 
-patch-stamp: abi-sed-stamp
-# Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: config-stamp
-
-       # Add here commands to compile the arch part of the package.
-       if test ! -d boot.debian; then                                  \
-               cp -xa boot boot.debian;                                \
+build: build-stamp
+build-stamp: config-stamp
+       if test ! -d boot.debian; then \
+         cp -xa boot boot.debian; \
        fi
+       tar cjf debian/examples_labltk.tar.bz2 \
+         -C otherlibs/labltk --exclude=.cvsignore \
+         examples_labltk
+ifeq ($(BUILDCACHE),)
        $(MAKE) world
        $(MAKE) bootstrap
-ifneq ($(THIS_NATIVE_ARCH),)
+       $(MAKE) -C tools objinfo dumpobj
+ifneq (,$(OCAML_OPT_ARCH))
        @echo "Building native compilers"
        $(MAKE) opt opt.opt
        $(MAKE) -C tools dumpapprox
-       mv tools/dumpapprox tools/ocamldumpapprox
        touch opt-built-stamp
 endif
-       touch build-arch-stamp
-
-build-indep: build-indep-stamp config-stamp
-build-indep-stamp:
-       # create ocaml source tarball
+else
+       @echo "===> WARNING: $(BUILDCACHE) detected, compilation skipped! <==="
+       rsync -a --exclude=debian --exclude=.git $(BUILDCACHE)/ .
+       rm -f build-stamp install-stamp
+endif
+       dh build --after dh_auto_test
        touch $@
 
-clean: abi-sed-clean unpatch
-       dh_testdir
-       dh_testroot
-
-       # Add here commands to clean up after the build process.
-       [ ! -f "$(CURDIR)/config/Makefile" ] || $(MAKE) clean
-       if test -d boot.debian; then    \
-               $(RM) -r boot;          \
-               mv boot.debian boot;    \
+clean: unpatch
+       dh clean --before dh_auto_clean
+ifneq ($(wildcard $(CURDIR)/config/Makefile),)
+       $(MAKE) clean
+       $(MAKE) -C emacs clean
+endif
+# Restore files altered by the build process
+       if test -d boot.debian; then \
+         rm -Rf boot; \
+         mv boot.debian boot; \
        fi
-       [ ! -f "$(CURDIR)/config/Makefile" ] || $(MAKE) -C emacs clean
-       # Restore files altered by debian/rules
        for ext in sub guess; do \
          if [ -f debian/config.orig.$$ext ] ; then \
            mv -f debian/config.orig.$$ext config/gnu/config.$$ext; \
@@ -146,156 +159,67 @@ clean: abi-sed-clean unpatch
        if head -n 1 emacs/ocamltags.in | grep -q '^#!/bin/sh'; then \
                sed -i 1d emacs/ocamltags.in; \
        fi
-
-       dh_clean
-       -$(RM) debian/$(SRCTARBALL)
-
-install: install-indep install-arch
-install-indep: build-indep
-       dh_testdir
-       dh_testroot
-       dh_prep -i
-       dh_installdirs -i
-
-       # Install Emacs files
-       $(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml-mode/usr/share/emacs/site-lisp/ocaml-mode \
-               NOCOMPILE=true simple-install
+# Remaining stuff
+       -rm -Rf debian/$(SRCTARBALL) $(OCAML_IN_FILES)
+       dh clean --after dh_auto_clean
+
+install: install-stamp
+install-stamp:
+       dh install --before dh_auto_install
+# Install Emacs files
+       $(MAKE) -C emacs \
+         EMACSDIR=$(CURDIR)/debian/ocaml-mode/usr/share/emacs/site-lisp/ocaml-mode \
+         NOCOMPILE=true simple-install
        if ! head -n 1 emacs/ocamltags.in | grep -q '^#!/bin/sh'; then \
-               sed -i -e '1 i #!/bin/sh' emacs/ocamltags.in; \
+         sed -i -e '1 i #!/bin/sh' emacs/ocamltags.in; \
        fi
        $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags
-
-       dh_install --sourcedir=. -i
-
-install-arch: build-arch
-       dh_testdir
-       dh_testroot
-       dh_prep -a
-       dh_installdirs -a
-
-       # Let's install ocaml first.
+# Install OCaml
        sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(INSTDIR)"|' < config/config.sh > config/config.debian.install.sh
        $(MAKE) install PREFIX=$(INSTDIR)
-
-       # Now move the graphics files over
-       dh_movefiles --sourcedir=debian/ocaml-nox -pocaml
-
-       # Move away camlp4 stuff
-       dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4-extra
-       dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4
-
-       # Install camlp4 .mli files
-       # XXX assumption: no filename clashes
+# To avoid erroneous dh_install failure
+       rm -f $(INSTDIR)/share/man/man1/ocamlopt.opt.1 $(INSTDIR)/share/man/man1/ocamlc.opt.1
+# Dispatch files with dh_install (--fail-missing forces to handle everything...)
+       dh_install --fail-missing
+# Install additional files not handled by dh_install
+# Beware: dh_install does not handle renamings, please pay attention
+       cp otherlibs/labltk/README debian/ocaml/usr/share/doc/ocaml/README.labltk
+       for u in dumpobj objinfo dumpapprox; do \
+         if [ -f tools/$$u ]; then \
+           cp tools/$$u debian/ocaml-nox/usr/bin/ocaml$$u; \
+         fi \
+       done
        for mli in `find camlp4 -name '*.mli'` ; do \
-               install -m 644 $$mli debian/camlp4$(STDLIBDIR)/camlp4/ ; \
+         cp --parents $$mli debian/camlp4$(OCAML_STDLIB_DIR); \
        done
+       for pkg in ocaml ocaml-nox ocaml-base; do ( \
+         cd debian/$$pkg/usr/share/doc/$$pkg && \
+         ln -sf ../ocaml-base-nox/Changes.gz . && \
+         ln -sf ../ocaml-base-nox/README.gz . && \
+         ln -sf ../ocaml-base-nox/README.Debian .; \
+       ); done
+# Remove empty directory
+       rmdir $(CURDIR)/debian/ocaml-nox$(OCAML_STDLIB_DIR)/ocamldoc/custom
+# Remaining stuff
+       dh install --after dh_install
+       touch $@
 
-       # Then move the ocaml-base-nox package.
-       dh_movefiles --sourcedir=debian/ocaml-nox -pocaml-base-nox
-
-       # And base's corresponding graphics stuff.
-       dh_movefiles --sourcedir=debian/ocaml-nox -pocaml-base
-
-ifneq ($(THIS_NATIVE_ARCH),)
-       # The ocaml-native-compilers, if available.
-       dh_movefiles --sourcedir=debian/ocaml-nox -pocaml-native-compilers
-endif
-
-       # The interpreter files
-       dh_movefiles --sourcedir=debian/ocaml-nox -pocaml-interp
-
-       # TEMPORARILY DISABLED while moving ocaml-md5sums to dh-ocaml
-       ## Compute core entries of the ocaml md5sums registry and install them
-       #(cd debian/ocaml-md5sums &&                                                                    \
-       # chmod +x feeding.sh &&                                                                        \
-       # for pkg in ocaml-nox ocaml ocaml-compiler-libs; do                                    \
-       #       mkdir -p ../$$pkg$(MD5SUMSDIR);                                         \
-       #       ./feeding.sh $$pkg $(STDLIBDIR) $(OCAMLABI) ../$$pkg$(STDLIBDIR) >      \
-       #               ../$$pkg$(MD5SUMSDIR)/$$pkg.md5sums;                            \
-       # done)
-
-       # Remove .opt manpages from ocaml-nox
-       rm -f debian/ocaml-nox/usr/share/man/man1/*.opt.1
-
-       # Make some symbolic links
-       cd debian/ocaml/usr/share/doc/ocaml; \
-               ln -sf ../ocaml-base-nox/Changes.gz .; \
-               ln -sf ../ocaml-base-nox/README.gz .; \
-               ln -sf ../ocaml-base-nox/README.Debian .
-       cd debian/ocaml-nox/usr/share/doc/ocaml-nox; \
-               ln -sf ../ocaml-base-nox/Changes.gz .; \
-               ln -sf ../ocaml-base-nox/README.gz .; \
-               ln -sf ../ocaml-base-nox/README.Debian .
-       cd debian/ocaml-base/usr/share/doc/ocaml-base; \
-               ln -sf ../ocaml-base-nox/Changes.gz .; \
-               ln -sf ../ocaml-base-nox/README.gz .; \
-               ln -sf ../ocaml-base-nox/README.Debian .
-
-       # Remove empty directory
-       for i in `cat debian/ocaml-nox.empty-dirs`; do \
-                       if test -d "debian/ocaml-nox/$$i" && test -z `ls -1 "debian/ocaml-nox/$$i"`; then \
-                       $(RM) -r "debian/ocaml-nox/$$i"; \
-               fi; \
+binary-stamp: install-stamp
+       dh binary --before dh_gencontrol
+       for u in $(ALL_PACKAGES); do \
+         echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \
        done
-       
-
-       # Install override files
-       cp debian/ocaml-compiler-libs.override debian/ocaml-compiler-libs/usr/share/lintian/overrides/ocaml-compiler-libs
-       cp debian/ocaml-nox.override debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox
-
-       dh_install --sourcedir=. -a
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-multi in another 'make' thread.
-binary-common:
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs Changes
-       dh_installdocs
-       -find debian/ocaml -type d -name CVS -exec rm -rf {} \;
-       -find debian/ocaml -type f -name .cvsignore -exec rm -rf {} \;
-       dh_installexamples
-       dh_installmenu
-       dh_installemacsen
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms -Xocamldoc-api-ref-config
-       dh_makeshlibs
-       dh_installdeb
-
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
-       $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-       dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
-       dh_md5sums -i
-       dh_builddeb -i
-
-# Build architecture dependant packages using the common target.
-binary-arch: install-arch
-       $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-       dh_shlibdeps -s
-ifeq ($(THIS_NATIVE_ARCH),)
-       dh_gencontrol -pocaml-nox -- \
-               -VF:BestProvides=",ocaml-best-compilers" \
-               -VF:OCamlABI="$(OCAMLABI)"
+ifeq (,$(OCAML_OPT_ARCH))
+       echo 'F:BestProvides=ocaml-best-compilers' >> debian/ocaml-nox.substvars
 else
-       dh_gencontrol -pocaml-nox -- \
-               -VF:BestProvides="" \
-               -VF:OCamlABI="$(OCAMLABI)"
-       dh_gencontrol -pocaml-native-compilers -- \
-               -VF:OCamlABI="$(OCAMLABI)"
+       echo 'F:BestProvides=' >> debian/ocaml-nox.substvars
 endif
-       dh_gencontrol -pocaml -- -VF:OCamlABI="$(OCAMLABI)"
-       dh_gencontrol -pocaml-base-nox -- -VF:OCamlABI="$(OCAMLABI)"
-       dh_gencontrol -pocaml-base -- -VF:OCamlABI="$(OCAMLABI)"
-       dh_gencontrol -pocaml-interp -- -VF:OCamlABI="$(OCAMLABI)"
-       dh_gencontrol -pocaml-compiler-libs -- -VF:OCamlABI="$(OCAMLABI)"
-       dh_gencontrol -pcamlp4 -- -VF:OCamlABI="$(OCAMLABI)"
-       dh_gencontrol -pcamlp4-extra -- -VF:OCamlABI="$(OCAMLABI)"
-       dh_md5sums -s
-       dh_builddeb -s
+       dh_gencontrol
+       dh binary --after dh_gencontrol
+       touch $@
+
+binary: binary-arch binary-indep
+binary-arch: binary-stamp
+binary-indep: binary-stamp
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch build-arch abi-sed-clean
+.PHONY: build clean binary-indep binary-arch binary install build ocamlinit