[Pkg-ocaml-maint-commits] [SCM] ocaml-mad packaging branch, master, updated. debian/0.3.5-1-4-g384f826

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 7746deaab60252eb2ebd0125e59eaf5f7ff1552a
Author: Samuel Mimram <smimram at smimou.is-a-geek.org>
Date:   Sun Feb 22 23:48:02 2009 +0100

    Use dh-ocaml's predefined variables.

diff --git a/debian/changelog b/debian/changelog
index e0c9832..61e6e61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 ocaml-mad (0.3.5-2) UNRELEASED; urgency=low
 
   * Switch packaging to git.
+  * Use dh-ocaml's predefined variables.
   * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 23:41:05 +0100
+ -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 23:46:43 +0100
 
 ocaml-mad (0.3.5-1) experimental; urgency=low
 
diff --git a/debian/libmad-ocaml-dev.install.in b/debian/libmad-ocaml-dev.install.in
index c549e57..860a4b9 100644
--- a/debian/libmad-ocaml-dev.install.in
+++ b/debian/libmad-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/META
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/*.a
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/*.cm*
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/*.ml*
+ at OCamlStdlibDir@/mad/META
+ at OCamlStdlibDir@/mad/*.a
+ at OCamlStdlibDir@/mad/*.cm*
+ at OCamlStdlibDir@/mad/*.ml*
diff --git a/debian/libmad-ocaml.install.in b/debian/libmad-ocaml.install.in
index d7ff1bf..6fdbf6f 100644
--- a/debian/libmad-ocaml.install.in
+++ b/debian/libmad-ocaml.install.in
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/dllmad_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/mad/dllmad_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 6add2ad..e7db857 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/class/ocaml.mk
 #   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
 # Then check manually if everything's ok
 
-DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
 build/libmad-ocaml-dev::

-- 
ocaml-mad packaging