[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, build, updated. debian/0.20081112+gitBB342A7-1-581-g628f230

[Stefano Zacchiroli]

The following commit has been merged in the build branch:
commit 628f230d0cc4f5897084530e2051d8a9673de6bb
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Apr 1 17:39:34 2009 +0200

    refresh patches (pre-beta1 release)

diff --git a/debian/patches/debian/libdir.diff b/debian/patches/debian/libdir.diff
new file mode 100644
index 0000000..ffc1534
--- /dev/null
+++ b/debian/patches/debian/libdir.diff
@@ -0,0 +1,24 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Subject: [PATCH] debian/libdir
+
+Set Debian-specific installation paths.
+
+Patch batteries toolchain command wrappers to rely on
+`ocamlc -where`/batteries/ as the installation place where the
+wrappers will be available upon installation.
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+
+---
+ src/batteries_toolchain/ocaml.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/batteries_toolchain/ocaml.in b/src/batteries_toolchain/ocaml.in
+index a7ac5b7..8c2746f 100755
+--- a/src/batteries_toolchain/ocaml.in
++++ b/src/batteries_toolchain/ocaml.in
+@@ -1 +1 @@
+-"@DESTDIR@/batteries/toplevel.top" "@DESTDIR@/batteries/top.ml" $@
++"@OCAMLLIBDIR@/batteries/toplevel.top" "@OCAMLLIBDIR@/batteries/top.ml" $@
+-- 
+tg: (ba74a47..) debian/libdir (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index 15fc284..a4b5fa2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+debian/libdir.diff -p1
 debian/missing-doc.diff -p1

-- 
ocaml-batteries packaging