[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.4-5-g736b186

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 736b186833d68e3315a4c7b35c32b92104f703a1
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun Feb 22 18:57:22 2009 +0100

    ocamlinit.mk: avoid stripping leading white spaces while filling .in files
    
    Rationale: that could break files for which spaces are relevant
    (e.g. debian/patches/*.in)

diff --git a/debian/changelog b/debian/changelog
index 703bc3e..611a56b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ dh-ocaml (0.4.1) UNRELEASED; urgency=low
     only for significant changes, and micro for bugfixes (as usual)
   * package description: clarify that debian/rules helpers are both for
     CDBS and for generic debian/rules
+  * ocamlinit.mk: avoid stripping leading white spaces while filling .in
+    files. Rationale: that could break files for which spaces are relevant
+    (e.g. debian/patches/*.in)
 
  -- Samuel Mimram <smimram at debian.org>  Sat, 21 Feb 2009 18:15:00 +0100
 
diff --git a/share/ocamlinit.mk b/share/ocamlinit.mk
index 57bb46c..9233fc6 100644
--- a/share/ocamlinit.mk
+++ b/share/ocamlinit.mk
@@ -36,7 +36,7 @@ OCAML_IN_FILES ?= $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debia
 # ocaml.mk, but hopefully they will be removed at some point in the
 # future
 
-OCAMLINIT_SED := -e 's%^ \+%%' \
+OCAMLINIT_SED := \
   -e 's%@OCamlABI@%$(OCAML_ABI)%g' \
   -e 's%@OCamlStdlibDir@%$(OCAML_STDLIB_DIR)%g' \
   -e 's%@OCamlDllDir@%$(OCAML_DLL_DIR)%g'

-- 
dh-ocaml packaging