[Pkg-ocaml-maint-commits] [ocaml-estring] 03/06: Fix FTBFS on bytecode architectures

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository ocaml-estring.

commit 43a3140a7a8478587e15ae0176a1155f33d3a981
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Nov 25 22:51:14 2013 +0100

    Fix FTBFS on bytecode architectures
    
    The patch is composed of two fixes:
    1) a patch that adds #require "ocamlbuild" in setup.ml
    2) and a bit that ignores failure when cleaning the sources.
       It is necessary because patches are not applied when cleaning.
---
 debian/changelog                                   |  3 +++
 .../0001-Require-ocamlbuild-in-setup.ml.patch      | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  2 +-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cdd740d..d080b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ ocaml-estring (20130822-2) UNRELEASED; urgency=low
   * Team upload.
   * libestring-ocaml-dev now Conflicts/Replaces libbatteries-ocaml-dev (< 2.0)
     (Closes: #722559).
+  * Fix FTBFS on bytecode architectures:
+    + Add 0001-Require-ocamlbuild-in-setup.ml.patch, require "ocamlbuild" in
+      setup.ml.
 
  -- Mehdi Dogguy <mehdi at debian.org>  Mon, 25 Nov 2013 22:44:57 +0100
 
diff --git a/debian/patches/0001-Require-ocamlbuild-in-setup.ml.patch b/debian/patches/0001-Require-ocamlbuild-in-setup.ml.patch
new file mode 100644
index 0000000..ba06cc3
--- /dev/null
+++ b/debian/patches/0001-Require-ocamlbuild-in-setup.ml.patch
@@ -0,0 +1,23 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Mon, 25 Nov 2013 22:48:08 +0100
+Subject: Require ocamlbuild in setup.ml
+
+Eventually, this should be fixed in oasis and more specifically in
+oasis.dynrun's META file to require ocamlbuild.
+---
+ setup.ml |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.ml b/setup.ml
+index 9356f63..7653658 100644
+--- a/setup.ml
++++ b/setup.ml
+@@ -7,6 +7,7 @@
+ 
+ (* OASIS_START *)
+ #use "topfind";;
++#require "ocamlbuild";;
+ #require "oasis.dynrun";;
+ open OASISDynRun;;
+ (* OASIS_STOP *)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..532d8f8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Require-ocamlbuild-in-setup.ml.patch
diff --git a/debian/rules b/debian/rules
index d449cd8..400d0b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,4 +37,4 @@ override_dh_install:
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
-	ocaml setup.ml -distclean
+	-ocaml setup.ml -distclean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-estring.git