[Pkg-ocaml-maint-commits] [SCM] ocaml-ogg packaging branch, master, updated. debian/0.2.0-2-10-gbf778ae

[Samuel Mimram]

The following commit has been merged in the master branch:
commit cec3ce1792cc4f1fbe264cfabc56ba2b48fa2898
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Sun Feb 22 13:54:32 2009 +0100

    Use dh-ocaml's variables for paths.

diff --git a/debian/changelog b/debian/changelog
index a0c56b4..5fe235f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 ocaml-ogg (0.3.0-1) UNRELEASED; urgency=low
 
-  * New Upstream Version
-  * Switch packaging to git
+  * New Upstream Version.
+  * Switch packaging to git.
+  * Use dh-ocaml's variables for paths.
   * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 13:49:41 +0100
+ -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 13:53:45 +0100
 
 ocaml-ogg (0.2.0-2) experimental; urgency=low
 
diff --git a/debian/libogg-ocaml-dev.install.in b/debian/libogg-ocaml-dev.install.in
index b65b1a0..e778d18 100644
--- a/debian/libogg-ocaml-dev.install.in
+++ b/debian/libogg-ocaml-dev.install.in
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/META
-debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/*.a
-debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/*.cm*
-debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/*.ml*
-debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/*.h
+ at OCamlStdlibDir@/ogg/META
+ at OCamlStdlibDir@/ogg/*.a
+ at OCamlStdlibDir@/ogg/*.cm*
+ at OCamlStdlibDir@/ogg/*.ml*
+ at OCamlStdlibDir@/ogg/*.h
diff --git a/debian/libogg-ocaml.install.in b/debian/libogg-ocaml.install.in
index 0c80c4e..ef52646 100644
--- a/debian/libogg-ocaml.install.in
+++ b/debian/libogg-ocaml.install.in
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/dllogg_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/ogg/dllogg_stubs.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 4bc726c..966be6b 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/libogg-ocaml-dev::

-- 
ocaml-ogg packaging