[Pkg-ocaml-maint-commits] [SCM] oasis packaging branch, master, updated. debian/0.2.0-5-1-g89e0c0b

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 89e0c0b0f36d15a267588249f29f4dac549ab514
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue May 15 13:55:32 2012 +0200

    Fix FTBFS with oUnit 1.1.1
    
    - add cope_with_ounit1.1.1_changes.patch

diff --git a/debian/changelog b/debian/changelog
index 4f31301..6a454e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+oasis (0.2.0-6) unstable; urgency=low
+
+  * Fix FTBFS with oUnit 1.1.1
+    - add cope_with_ounit1.1.1_changes.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 15 May 2012 13:54:46 +0200
+
 oasis (0.2.0-5) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/cope_with_ounit1.1.1_changes.patch b/debian/patches/cope_with_ounit1.1.1_changes.patch
new file mode 100644
index 0000000..51c9381
--- /dev/null
+++ b/debian/patches/cope_with_ounit1.1.1_changes.patch
@@ -0,0 +1,25 @@
+Description: Cope with oUnit 1.1.1 changes
+ oUnit 1.1.1 bracket's function now forces a "unit" return type.
+Author: Mehdi Dogguy <mehdi at debian.org>
+Last-Update: 2012-05-15
+
+--- a/test/TestMETA.ml
++++ b/test/TestMETA.ml
+@@ -109,7 +109,7 @@
+               | [] -> 
+                   pkg_expr.pkg_defs 
+           in
+-            List.fold_left
++            ignore (List.fold_left
+               (fun former_meta (pkg_name, var, preds, res) ->
+                  let pkg_root, pkg_paths =
+                    match ExtString.String.nsplit pkg_name "." with
+@@ -160,7 +160,7 @@
+                    end;
+                    Some (pkg_root, pkg_expr))
+               None
+-              pkg_tests)
++              pkg_tests))
+        (fun fn ->
+           Sys.remove fn))
+   in
diff --git a/debian/patches/series b/debian/patches/series
index e4f8508..e43c34b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debian-changes-0.2.0-1
 debian-changes-0.2.0-4
+cope_with_ounit1.1.1_changes.patch

-- 
oasis packaging