[Pkg-ocaml-maint-commits] [SCM] gmetadom packaging branch, master, updated. debian/0.2.6-2-11-gd5f7e95

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 6799f3637ab659fb8f8480e437d4e75a18aa9f41
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sat Feb 28 22:33:31 2009 +0100

    use specific variables instead of relying on stdlib dir placement

diff --git a/debian/changelog b/debian/changelog
index e43ebb2..459f3d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ gmetadom (0.2.6-3) UNRELEASED; urgency=low
     - drop obsolete strict dependencies
     - set maintainer to d-o-m, myself as an uploader
   * debian/rules: use ocaml.mk as a CDBS "rules" snippet
+  * debian/*.in: use specific substitution variables instead of relying on
+    a specific stdlib dir placement
 
   [ Stephane Glondu ]
   * Switching packaging to git
diff --git a/debian/libgdome2-ocaml-dev.dirs.in b/debian/libgdome2-ocaml-dev.dirs.in
index 78ec387..68d3d45 100644
--- a/debian/libgdome2-ocaml-dev.dirs.in
+++ b/debian/libgdome2-ocaml-dev.dirs.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/gdome2
+ at OCamlStdlibDir@/gdome2
diff --git a/debian/libgdome2-ocaml-dev.install.in b/debian/libgdome2-ocaml-dev.install.in
index 253c8ea..fbcfd62 100644
--- a/debian/libgdome2-ocaml-dev.install.in
+++ b/debian/libgdome2-ocaml-dev.install.in
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/gdome2/             usr/lib/ocaml/@OCamlABI@/
-debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/*.owner    usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlStdlibDir@/gdome2/             @OCamlStdlibDir@
+ at OCamlDllDir@/*.owner		     @OCamlDllDir@
diff --git a/debian/libgdome2-ocaml.dirs.in b/debian/libgdome2-ocaml.dirs.in
index b9e0896..a8131b4 100644
--- a/debian/libgdome2-ocaml.dirs.in
+++ b/debian/libgdome2-ocaml.dirs.in
@@ -1 +1 @@
-usr/lib/ocaml/@OCamlABI@/stublibs
+ at OCamlDllDir@
diff --git a/debian/libgdome2-ocaml.install.in b/debian/libgdome2-ocaml.install.in
index 5673e89..ca388d7 100644
--- a/debian/libgdome2-ocaml.install.in
+++ b/debian/libgdome2-ocaml.install.in
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/*.so       usr/lib/ocaml/@OCamlABI@/stublibs/
+ at OCamlDllDir@/*.so	@OCamlDllDir@

-- 
gmetadom packaging