[Pkg-ocaml-maint-commits] [ocaml-extunix] 05/06: Refresh patches
Mehdi Dogguy
mehdi at moszumanska.debian.org
Thu May 8 18:40:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository ocaml-extunix.
commit c9fb245575991e284340ff09efbcf6a68d41a29e
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Thu May 8 20:34:09 2014 +0200
Refresh patches
---
debian/changelog | 2 +
...lity-to-disable-execinfo-test-through-env.patch | 10 ++--
debian/patches/fix-text-32-bit.patch | 65 ----------------------
debian/patches/series | 1 -
4 files changed, 7 insertions(+), 71 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 57839c7..2284815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
ocaml-extunix (0.1.0-1) UNRELEASED; urgency=low
* New upstream release.
+ - Update 0001-Add-possibility-to-disable-execinfo-test-through-env.patch
+ - Remove fix-text-32-bit.patch (fixed upstream).
* Add myself to Uploaders.
-- Mehdi Dogguy <mehdi at debian.org> Thu, 08 May 2014 20:22:11 +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 7350c17..07221bc 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
@@ -18,10 +18,10 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/test/test.ml b/test/test.ml
-index 4bc468e..0d7ea8c 100644
+index 80919f4..82be51b 100644
--- a/test/test.ml
+++ b/test/test.ml
-@@ -495,7 +495,7 @@ let () =
+@@ -526,7 +526,7 @@ let () =
let wrap test =
with_unix_error (fun () -> test (); Gc.compact ())
in
@@ -30,7 +30,7 @@ index 4bc468e..0d7ea8c 100644
"eventfd" >:: test_eventfd;
"uname" >:: test_uname;
"fadvise" >:: test_fadvise;
-@@ -506,7 +506,10 @@ let () =
+@@ -537,7 +537,10 @@ let () =
"resource" >::: test_resource;
"strtime" >:: test_strtime;
"pts" >:: test_pts;
@@ -42,10 +42,10 @@ index 4bc468e..0d7ea8c 100644
"statvfs" >:: test_statvfs;
"setenv" >:: test_setenv;
"mkdtemp" >:: test_mkdtemp;
-@@ -522,6 +525,6 @@ let () =
- "mkstemp" >:: test_mkstemp;
+@@ -554,6 +557,6 @@ let () =
"mkostemp" >:: test_mkostemp;
"memalign" >:: test_memalign;
+ "sockopt" >:: test_sockopt;
-]) in
+])) in
ignore (run_test_tt_main (test_decorate wrap tests))
diff --git a/debian/patches/fix-text-32-bit.patch b/debian/patches/fix-text-32-bit.patch
deleted file mode 100644
index 05cbb27..0000000
--- a/debian/patches/fix-text-32-bit.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: fix test compilation on 32 bit OCaml
-Author: Hendrik Tews <hendrik at askra.de>
-Applied-Upstream: 0.0.7
---- a/test/test.ml
-+++ b/test/test.ml
-@@ -303,18 +303,18 @@
- assert_equal (L.get_int64 src 10) (0x1032547698BADCFEL);
- if Sys.word_size = 64 then
- begin
-- assert_equal (B.get_uint31 src 6) 0xFEDCBA98;
-- assert_equal (B.get_int31 src 6) 0x7FFFFFFFFEDCBA98;
-+ assert_equal (B.get_uint31 src 6) (Int64.to_int 0xFEDCBA98L);
-+ assert_equal (B.get_int31 src 6) (Int64.to_int 0x7FFFFFFFFEDCBA98L);
- assert_equal (B.get_int31 src 6) (-0x1234568);
-- assert_equal (B.get_uint63 src 10) 0x7EDCBA9876543210;
-- assert_equal (B.get_int63 src 10) 0x7EDCBA9876543210;
-- assert_equal (B.get_int63 src 10) (-0x123456789ABCDF0);
-- assert_equal (L.get_uint31 src 6) 0x98BADCFE;
-- assert_equal (L.get_int31 src 6) 0x7FFFFFFF98BADCFE;
-+ assert_equal (B.get_uint63 src 10) (Int64.to_int 0x7EDCBA9876543210L);
-+ assert_equal (B.get_int63 src 10) (Int64.to_int 0x7EDCBA9876543210L);
-+ assert_equal (B.get_int63 src 10) (Int64.to_int (-0x123456789ABCDF0L));
-+ assert_equal (L.get_uint31 src 6) (Int64.to_int 0x98BADCFEL);
-+ assert_equal (L.get_int31 src 6) (Int64.to_int 0x7FFFFFFF98BADCFEL);
- assert_equal (L.get_int31 src 6) (-0x67452302);
-- assert_equal (L.get_uint63 src 10) 0x1032547698BADCFE;
-- assert_equal (L.get_int63 src 10) 0x1032547698BADCFE;
-- assert_equal (L.get_int63 src 10) (-0x6FCDAB8967452302);
-+ assert_equal (L.get_uint63 src 10) (Int64.to_int 0x1032547698BADCFEL);
-+ assert_equal (L.get_int63 src 10) (Int64.to_int 0x1032547698BADCFEL);
-+ assert_equal (L.get_int63 src 10) (Int64.to_int (-0x6FCDAB8967452302L));
- end;
- let b = " " in
- B.set_uint8 b 0 0xFF;
---- a/test/testba.ml
-+++ b/test/testba.ml
-@@ -60,18 +60,18 @@
- assert_equal (L.get_int64 src 10) (0x1032547698BADCFEL);
- if Sys.word_size = 64 then
- begin
-- assert_equal (B.get_uint31 src 6) 0xFEDCBA98;
-- assert_equal (B.get_int31 src 6) 0x7FFFFFFFFEDCBA98;
-+ assert_equal (B.get_uint31 src 6) (Int64.to_int 0xFEDCBA98L);
-+ assert_equal (B.get_int31 src 6) (Int64.to_int 0x7FFFFFFFFEDCBA98L);
- assert_equal (B.get_int31 src 6) (-0x1234568);
-- assert_equal (B.get_uint63 src 10) 0x7EDCBA9876543210;
-- assert_equal (B.get_int63 src 10) 0x7EDCBA9876543210;
-- assert_equal (B.get_int63 src 10) (-0x123456789ABCDF0);
-- assert_equal (L.get_uint31 src 6) 0x98BADCFE;
-- assert_equal (L.get_int31 src 6) 0x7FFFFFFF98BADCFE;
-+ assert_equal (B.get_uint63 src 10) (Int64.to_int 0x7EDCBA9876543210L);
-+ assert_equal (B.get_int63 src 10) (Int64.to_int 0x7EDCBA9876543210L);
-+ assert_equal (B.get_int63 src 10) (Int64.to_int (-0x123456789ABCDF0L));
-+ assert_equal (L.get_uint31 src 6) (Int64.to_int 0x98BADCFEL);
-+ assert_equal (L.get_int31 src 6) (Int64.to_int 0x7FFFFFFF98BADCFEL);
- assert_equal (L.get_int31 src 6) (-0x67452302);
-- assert_equal (L.get_uint63 src 10) 0x1032547698BADCFE;
-- assert_equal (L.get_int63 src 10) 0x1032547698BADCFE;
-- assert_equal (L.get_int63 src 10) (-0x6FCDAB8967452302);
-+ assert_equal (L.get_uint63 src 10) (Int64.to_int 0x1032547698BADCFEL);
-+ assert_equal (L.get_int63 src 10) (Int64.to_int 0x1032547698BADCFEL);
-+ assert_equal (L.get_int63 src 10) (Int64.to_int (-0x6FCDAB8967452302L));
- end;
- let b = Bigarray.Array1.create Bigarray.int8_unsigned Bigarray.c_layout 18 in
- B.set_uint8 b 0 0xFF;
diff --git a/debian/patches/series b/debian/patches/series
index c690f49..9d3591a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-Add-possibility-to-disable-execinfo-test-through-env.patch
-fix-text-32-bit.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-extunix.git
More information about the Pkg-ocaml-maint-commits
mailing list