The following commit has been merged in the master branch:
commit 252b4fab09f2af57e44fc2c9594af5a96e2101c9
Author: Mehdi Dogguy <me...@debian.org>
Date:   Wed Jun 27 12:31:11 2012 +0200

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 4764bed..83ec5e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ocaml-extunix (0.0.5-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - remove 0002-Define-O_CLOEXEC-when-missing.patch, integrated upstream.
+    - remove 0001-Add-possibility-to-disable-execinfo-test-through-env.patch.
+      Upstream now provides a way to disable some tests.
+
+ -- Mehdi Dogguy <me...@debian.org>  Wed, 27 Jun 2012 12:31:01 +0200
+
 ocaml-extunix (0.0.4-2) unstable; urgency=low
 
   * Team upload.
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
deleted file mode 100644
index a0b32ea..0000000
--- 
a/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Thu, 25 Aug 2011 09:14:40 +0200
-Subject: Add possibility to disable execinfo test through environment
-
-It fails on armel because of [1] and on powerpc because of [2].
-
-[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637360
-[2] http://caml.inria.fr/mantis/view.php?id=5334
-
-Forwarded: not-needed
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- test/test.ml |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/test/test.ml b/test/test.ml
-index 4bc468e..0d7ea8c 100644
---- a/test/test.ml
-+++ b/test/test.ml
-@@ -495,7 +495,7 @@ let () =
-   let wrap test =
-     with_unix_error (fun () -> test (); Gc.compact ())
-   in
--  let tests = ("tests" >::: [
-+  let tests = ("tests" >::: ([
-     "eventfd" >:: test_eventfd;
-     "uname" >:: test_uname;
-     "fadvise" >:: test_fadvise;
-@@ -506,7 +506,10 @@ let () =
-     "resource" >::: test_resource;
-     "strtime" >:: test_strtime;
-     "pts" >:: test_pts;
--    "execinfo" >:: test_execinfo;
-+  ] @ (
-+    try let _ = Sys.getenv "DISABLE_EXECINFO" in []
-+    with Not_found -> ["execinfo" >:: test_execinfo]
-+  ) @ [
-     "statvfs" >:: test_statvfs;
-     "setenv" >:: test_setenv;
-     "mkdtemp" >:: test_mkdtemp;
-@@ -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))
- 
--- 
diff --git a/debian/patches/0002-Define-O_CLOEXEC-when-missing.patch 
b/debian/patches/0002-Define-O_CLOEXEC-when-missing.patch
deleted file mode 100644
index 3561dc8..0000000
--- a/debian/patches/0002-Define-O_CLOEXEC-when-missing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Mehdi Dogguy <me...@debian.org>
-Date: Wed, 6 Jun 2012 11:15:32 +0200
-Subject: Define O_CLOEXEC when missing
-
-O_CLOEXEC is not defined on kfreebsd (yet).
-
-See http://bugs.debian.org/635192
----
- src/stdlib.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/stdlib.c b/src/stdlib.c
-index f79566f..b498ce4 100644
---- a/src/stdlib.c
-+++ b/src/stdlib.c
-@@ -142,6 +142,10 @@ CAMLprim value caml_extunix_internal_mkstemps(value 
v_template, value v_suffixle
- /* FIXME: also in atfile.c, move to common file */
- #include <fcntl.h>
- 
-+#ifndef O_CLOEXEC
-+# define O_CLOEXEC 0
-+#endif
-+
- static int open_flag_table[] = {
-   O_RDONLY, O_WRONLY, O_RDWR, O_NONBLOCK, O_APPEND, O_CREAT, O_TRUNC, O_EXCL,
-   O_NOCTTY, O_DSYNC, O_SYNC, O_RSYNC
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 9399e9d..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-0001-Add-possibility-to-disable-execinfo-test-through-env.patch
-0002-Define-O_CLOEXEC-when-missing.patch

-- 
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

Reply via email to