[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. debian/3.11.1-2-4-g89c2312

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 89c23128bda608080da2d3660ad53b0926a962a7
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Oct 31 16:56:00 2009 +0100

    Use OCAMLINIT_SED to set additional replacements to be performed by dh_ocamlinit (Closes: #549779).

diff --git a/debian/changelog b/debian/changelog
index d3391b2..95ab025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ jocaml (3.11.1-3) unstable; urgency=low
 
   * Copy config.{sub,guess} to ./config/gnu/, fixes FTBFS on avr32
     (Closes: #548117, #538049).
+  * Use dh_ocamlinit to handle *.in files (Closes: #549779).
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 24 Sep 2009 00:35:58 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 31 Oct 2009 16:55:02 +0100
 
 jocaml (3.11.1-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 07b6b30..501b563 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,12 @@ export DH_OPTIONS
 JOCAML_ABI         := $(shell head -1 VERSION)
 JOCAML_OPT_ARCH    := $(OCAML_OPT_ARCH)
 JOCAML_STDLIB_DIR  := /usr/lib/jocaml/
-
-OCAMLINIT_SED += -e 's/@JOCamlABI@/$(JOCAML_ABI)/g'
-OCAMLINIT_SED += -e 's%@JOCamlStdlibDir@%$(JOCAML_STDLIB_DIR)%g'
+OCAMLINIT_OPTS     := "-e 's/@JOCamlABI@/$(JOCAML_ABI)/g' -e 's%@JOCamlStdlibDir@%$(JOCAML_STDLIB_DIR)%g'"
 
 OCAMLC := $(if $(wildcard /usr/bin/ocamlc.opt),/usr/bin/ocamlc.opt,/usr/bin/ocamlc)
 
-override_dh_auto_configure: ocamlinit
+override_dh_auto_configure:
+	OCAMLINIT_SED=$(OCAMLINIT_OPTS) dh_ocamlinit
 	for ext in sub guess; do \
 		if [ -f /usr/share/misc/config.$$ext ]; then \
 			cp -f /usr/share/misc/config.$$ext $(CURDIR)/config/gnu/config.$$ext; \
@@ -38,7 +37,8 @@ ifdef JOCAML_OPT_ARCH
 	$(MAKE) opt opt.opt
 endif
 
-override_dh_auto_clean: ocamlinit-clean
+override_dh_auto_clean:
+	dh_ocamlinit -d
 	$(RM) -f $(OFILES)
 	if [ -f Makefile -a -f config/Makefile ]; then \
 		$(MAKE) clean;   \

-- 
jocaml packaging