[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/1%4.0.1-1-1-gd76fb99

[Stephane Glondu]

The following commit has been merged in the master branch:
commit d76fb99f337422cb1baf9509abbcae8afaa66cbc
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 3 15:57:33 2011 +0200

    Fix compilation on bytecode architectures

diff --git a/debian/changelog b/debian/changelog
index c9912ad..f3a9a7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+camlimages (1:4.0.1-2) unstable; urgency=low
+
+  * Team upload
+  * Fix compilation on bytecode architectures
+
+ -- Stéphane Glondu <glondu at debian.org>  Sun, 03 Jul 2011 15:57:28 +0200
+
 camlimages (1:4.0.1-1) unstable; urgency=low
 
   * Team upload
diff --git a/debian/rules b/debian/rules
index 2085c54..9cae0e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,9 @@ export OCAMLFIND_DESTDIR
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
+ifeq ($(OCAML_HAVE_OCAMLOPT),no)
+	sed -i 's/NATIVE_ENABLED=./NATIVE_ENABLED=0/' OMakefile
+endif
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
@@ -27,6 +30,7 @@ override_dh_auto_install:
 override_dh_auto_clean:
 	$(OMAKE) clean
 	find -name '*.omc' -delete
+	sed -i 's/NATIVE_ENABLED=./NATIVE_ENABLED=1/' OMakefile
 
 .PHONY: override_dh_install
 override_dh_install:

-- 
camlimages packaging