The following commit has been merged in the master branch:
commit 839cc552e7f6d5833b61eaeab29c2ea86e1ba2a4
Author: Mehdi Dogguy <me...@debian.org>
Date: Tue Jun 5 17:27:06 2012 +0200
Rebase patches
diff --git a/debian/changelog b/debian/changelog
index eee9af8..3d225e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ocaml-extunix (0.0.4-1) UNRELEASED; urgency=low
* New upstream release (Closes: #675505)
+ - Rebase patches
-- Mehdi Dogguy <me...@debian.org> Tue, 05 Jun 2012 17:14:54 +0200
diff --git
a/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
b/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
index cbd85c9..a0b32ea 100644
---
a/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
+++
b/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
@@ -11,13 +11,13 @@ Forwarded: not-needed
Signed-off-by: Stephane Glondu <st...@glondu.net>
---
test/test.ml | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
+ 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/test/test.ml b/test/test.ml
-index 2501bab..840d4b5 100644
+index 4bc468e..0d7ea8c 100644
--- a/test/test.ml
+++ b/test/test.ml
-@@ -228,7 +228,7 @@ let () =
+@@ -495,7 +495,7 @@ let () =
let wrap test =
with_unix_error (fun () -> test (); Gc.compact ())
in
@@ -26,7 +26,7 @@ index 2501bab..840d4b5 100644
"eventfd" >:: test_eventfd;
"uname" >:: test_uname;
"fadvise" >:: test_fadvise;
-@@ -239,10 +239,13 @@ let () =
+@@ -506,7 +506,10 @@ let () =
"resource" >::: test_resource;
"strtime" >:: test_strtime;
"pts" >:: test_pts;
@@ -38,8 +38,12 @@ index 2501bab..840d4b5 100644
"statvfs" >:: test_statvfs;
"setenv" >:: test_setenv;
"mkdtemp" >:: test_mkdtemp;
-- ]) in
-+ ])) in
+@@ -522,6 +525,6 @@ let () =
+ "mkstemp" >:: test_mkstemp;
+ "mkostemp" >:: test_mkostemp;
+ "memalign" >:: test_memalign;
+-]) in
++])) in
ignore (run_test_tt_main (test_decorate wrap tests))
--
--
ocaml-extunix packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
