[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, debian/libdir, updated. upstream/0.20090401-93-g9100c29

[Stefano Zacchiroli]

The following commit has been merged in the debian/libdir branch:
commit 9100c29bcada5f24a272393b53caedabfc5a58a1
Merge: 7dd6951cecf5a635197b01fac42650d448153304 4ec468c345d626866a1090ad7b517d66cf7a30f3
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Fri Apr 3 11:39:29 2009 +0200

    Merge commit 'refs/top-bases/debian/libdir' into debian/libdir
    
    Conflicts:
    	src/batteries_toolchain/ocaml.in

diff --combined src/batteries_toolchain/ocaml.in
index 8c2746f,002fd04..2d8e9f0
--- a/src/batteries_toolchain/ocaml.in
+++ b/src/batteries_toolchain/ocaml.in
@@@ -1,1 -1,2 +1,2 @@@
+ #!/bin/sh
 -"@DESTDIR@/batteries/toplevel.top" "@DESTDIR@/batteries/top.ml" $@
 +"@OCAMLLIBDIR@/batteries/toplevel.top" "@OCAMLLIBDIR@/batteries/top.ml" $@

-- 
ocaml-batteries packaging