This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository lwt.
commit 81f27dcea346d2e19f6994ed9f63d42b453c3186 Author: Stephane Glondu <st...@glondu.net> Date: Thu Feb 26 14:51:17 2015 +0100 Refresh patches --- .../0001-Do-not-build-manual-manual.pdf.patch | 27 ++++++++++----- .../0002-Add-Unix.O_CLOEXEC-flag-to-Lwt_unix.patch | 40 ---------------------- debian/patches/series | 1 - 3 files changed, 18 insertions(+), 50 deletions(-) diff --git a/debian/patches/0001-Do-not-build-manual-manual.pdf.patch b/debian/patches/0001-Do-not-build-manual-manual.pdf.patch index 452796a..eac947e 100644 --- a/debian/patches/0001-Do-not-build-manual-manual.pdf.patch +++ b/debian/patches/0001-Do-not-build-manual-manual.pdf.patch @@ -3,14 +3,14 @@ Date: Tue, 19 Apr 2011 09:32:12 +0200 Subject: Do not build manual/manual.pdf --- - setup.ml | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + setup.ml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.ml b/setup.ml -index e39d5ab..12fea33 100644 +index 9254952..005a383 100644 --- a/setup.ml +++ b/setup.ml -@@ -5748,7 +5748,7 @@ let setup_t = +@@ -6861,7 +6861,7 @@ let setup_t = CustomPlugin.cmd_main = [ (OASISExpr.EBool true, @@ -18,8 +18,8 @@ index e39d5ab..12fea33 100644 + ("true", [])) ]; cmd_clean = [(OASISExpr.EBool true, None)]; - cmd_distclean = [(OASISExpr.EBool true, None)]; -@@ -5801,7 +5801,7 @@ let setup_t = + cmd_distclean = [(OASISExpr.EBool true, None)] +@@ -6927,7 +6927,7 @@ let setup_t = CustomPlugin.cmd_main = [ (OASISExpr.EBool true, @@ -27,8 +27,8 @@ index e39d5ab..12fea33 100644 + ("true", [])) ]; cmd_clean = [(OASISExpr.EBool true, None)]; - cmd_distclean = [(OASISExpr.EBool true, None)]; -@@ -5852,7 +5852,7 @@ let setup_t = + cmd_distclean = [(OASISExpr.EBool true, None)] +@@ -6991,7 +6991,7 @@ let setup_t = CustomPlugin.cmd_main = [ (OASISExpr.EBool true, @@ -36,5 +36,14 @@ index e39d5ab..12fea33 100644 + ("true", [])) ]; cmd_clean = [(OASISExpr.EBool true, None)]; - cmd_distclean = [(OASISExpr.EBool true, None)]; + cmd_distclean = [(OASISExpr.EBool true, None)] +@@ -7970,7 +7970,7 @@ let setup_t = + doc_authors = []; + doc_abstract = None; + doc_format = OtherDoc; +- doc_data_files = [("manual/manual.pdf", None)]; ++ doc_data_files = []; + doc_build_tools = [ExternalTool "ocamlbuild"] + }); + Doc -- diff --git a/debian/patches/0002-Add-Unix.O_CLOEXEC-flag-to-Lwt_unix.patch b/debian/patches/0002-Add-Unix.O_CLOEXEC-flag-to-Lwt_unix.patch deleted file mode 100644 index 935653a..0000000 --- a/debian/patches/0002-Add-Unix.O_CLOEXEC-flag-to-Lwt_unix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Anil Madhavapeddy <a...@recoil.org> -Date: Sat, 3 Aug 2013 20:20:55 +0100 -Subject: Add Unix.O_CLOEXEC flag to Lwt_unix - -Origin: https://github.com/ocsigen/lwt/pull/2.patch -Signed-off-by: Stephane Glondu <st...@glondu.net> ---- - src/unix/lwt_unix.ml | 3 +++ - src/unix/lwt_unix.mli | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/src/unix/lwt_unix.ml b/src/unix/lwt_unix.ml -index 58c2c25..cc3cdba 100644 ---- a/src/unix/lwt_unix.ml -+++ b/src/unix/lwt_unix.ml -@@ -596,6 +596,9 @@ type open_flag = - #if ocaml_version >= (3, 13) - | O_SHARE_DELETE - #endif -+#if ocaml_version >= (4, 01) -+ | O_CLOEXEC -+#endif - - #if windows - -diff --git a/src/unix/lwt_unix.mli b/src/unix/lwt_unix.mli -index c59e8c5..3874fc2 100644 ---- a/src/unix/lwt_unix.mli -+++ b/src/unix/lwt_unix.mli -@@ -315,6 +315,9 @@ type open_flag = - #if ocaml_version >= (3, 13) - | O_SHARE_DELETE - #endif -+#if ocaml_version >= (4, 01) -+ | O_CLOEXEC -+#endif - - val openfile : string -> open_flag list -> file_perm -> file_descr Lwt.t - (** Wrapper for [Unix.openfile]. *) --- diff --git a/debian/patches/series b/debian/patches/series index 810a203..97db22b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-Do-not-build-manual-manual.pdf.patch -0002-Add-Unix.O_CLOEXEC-flag-to-Lwt_unix.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lwt.git _______________________________________________ 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