[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.2-3-g9177001

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 9177001b4f4006d29ca0641a143e129d4f730faa
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Thu Feb 19 17:56:35 2009 +0100

    Substitute everywhere in ocamlinit.

diff --git a/debian/changelog b/debian/changelog
index 38852c9..f356bfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 dh-ocaml (0.3) UNRELEASED; urgency=low
 
+  [ Stephane Glondu ]
   * CDBS / Makefile snippets:
     - ocaml.mk: use ocamlinit.mk
     - ocamlvars.mk: remove OCAML_IN_FILES, defined in ocamlinit.mk
 
- -- Stephane Glondu <steph at glondu.net>  Thu, 19 Feb 2009 14:03:01 +0100
+  [ Samuel Mimram ]
+  * Substitute everywhere in ocamlinit.
+  * Add myself to uploaders.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 17:55:54 +0100
 
 dh-ocaml (0.2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 579debf..e3385ca 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: extra
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Stefano Zacchiroli <zack at debian.org>,
- Stephane Glondu <steph at glondu.net>
+ Stephane Glondu <steph at glondu.net>,
+ Samuel Mimram <smimram at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends-Indep:
  debhelper (>= 7),
diff --git a/share/ocamlinit.mk b/share/ocamlinit.mk
index d2e682e..2c884ac 100644
--- a/share/ocamlinit.mk
+++ b/share/ocamlinit.mk
@@ -37,9 +37,9 @@ OCAML_IN_FILES ?= $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debia
 # future
 
 OCAMLINIT_SED := -e 's%^ \+%%' \
-  -e 's%@OCamlABI@%$(OCAML_ABI)%' \
-  -e 's%@OCamlStdlibDir@%$(OCAML_STDLIB_DIR)%' \
-  -e 's%@OCamlDllDir@%$(OCAML_DLL_DIR)%'
+  -e 's%@OCamlABI@%$(OCAML_ABI)%g' \
+  -e 's%@OCamlStdlibDir@%$(OCAML_STDLIB_DIR)%g' \
+  -e 's%@OCamlDllDir@%$(OCAML_DLL_DIR)%g'
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
   OCAMLINIT_SED += -e 's/^OPT: //'
 else

-- 
dh-ocaml packaging