[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.14-1-1-g529267f

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 529267ffe152425373be67fa47eeccbff4da3b24
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat Mar 17 19:25:15 2012 +0100

    install must not try to strip bytecode
    
    patch upstream Makefile to use different flags for (UNIX-) install,
    depending on whether we are on native or bytecode architecture.

diff --git a/debian/changelog b/debian/changelog
index 20afe8d..74ac3be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dose3 (2.9.14-2) unstable; urgency=low
+
+  * patch dont-strip-bytecode: install must not try to strip executables
+    when compilation to bytecode. Fixes an FTBFS on architectures with
+    compilation to bytecode.
+
+ -- Ralf Treinen <treinen at debian.org>  Sat, 17 Mar 2012 19:24:48 +0100
+
 dose3 (2.9.14-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/dont-strip-bytecode b/debian/patches/dont-strip-bytecode
new file mode 100644
index 0000000..72e98bb
--- /dev/null
+++ b/debian/patches/dont-strip-bytecode
@@ -0,0 +1,32 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: install must not try to strip bytecode executables
+
+Index: dose3/Makefile
+===================================================================
+--- dose3.orig/Makefile	2012-03-17 19:11:32.000000000 +0100
++++ dose3/Makefile	2012-03-17 19:22:17.000000000 +0100
+@@ -153,7 +153,7 @@
+ 	cd _build/applications ; \
+ 	install -d $(BINDIR) ; \
+ 	for f in $$(ls *.$(OCAMLBEST)) ; do \
+-	  install -s $$f $(BINDIR)/$${f%.$(OCAMLBEST)} ; \
++	  install $(INSTALLOPTS) $$f $(BINDIR)/$${f%.$(OCAMLBEST)} ; \
+ 	done
+ 	ln -s $(BINDIR)/distcheck $(BINDIR)/debcheck
+ 	ln -s $(BINDIR)/distcheck $(BINDIR)/rpmcheck
+Index: dose3/Makefile.config.in
+===================================================================
+--- dose3.orig/Makefile.config.in	2012-03-17 19:20:11.000000000 +0100
++++ dose3/Makefile.config.in	2012-03-17 19:21:50.000000000 +0100
+@@ -30,9 +30,11 @@
+ ifeq ("@OCAMLBEST@","opt")
+   OCAMLBEST=native
+   OCAMLBUILD=@OCAMLBUILD@
++  INSTALLOPTS=-s
+ else
+   OCAMLBEST=byte
+   OCAMLBUILD=@OCAMLBUILD@ -byte-plugin
++  INSTALLOPTS=
+ endif
+ 
+ TARGETS= \
diff --git a/debian/patches/series b/debian/patches/series
index 9dceec7..e740134 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 binaries-prefix-edos
+dont-strip-bytecode

-- 
dose3 packaging