[Pkg-ocaml-maint-commits] [lwt] 04/12: Refresh patches
Stéphane Glondu
glondu at moszumanska.debian.org
Thu Jul 28 08:51:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository lwt.
commit b315d87f031d7c25921171c29f8c0ac63497429c
Author: Stephane Glondu <steph at glondu.net>
Date: Thu Jul 28 09:59:10 2016 +0200
Refresh patches
---
.../0001-Do-not-build-manual-manual.pdf.patch | 3 +--
debian/patches/0002-Fix-FTBFS.patch | 29 ----------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 32 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 7d354b2..89688c9 100644
--- a/debian/patches/0001-Do-not-build-manual-manual.pdf.patch
+++ b/debian/patches/0001-Do-not-build-manual-manual.pdf.patch
@@ -7,7 +7,7 @@ Subject: Do not build manual/manual.pdf
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/setup.ml b/setup.ml
-index ffdcfdc..fca7ae1 100644
+index b9fec8a..9eaa8b2 100644
--- a/setup.ml
+++ b/setup.ml
@@ -6861,7 +6861,7 @@ let setup_t =
@@ -46,4 +46,3 @@ index ffdcfdc..fca7ae1 100644
doc_build_tools = [ExternalTool "ocamlbuild"]
});
Doc
---
diff --git a/debian/patches/0002-Fix-FTBFS.patch b/debian/patches/0002-Fix-FTBFS.patch
deleted file mode 100644
index 876ddf1..0000000
--- a/debian/patches/0002-Fix-FTBFS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 16 Jun 2015 14:10:31 +0200
-Subject: Fix FTBFS
-
----
- src/react/lwt_react.mli | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/react/lwt_react.mli b/src/react/lwt_react.mli
-index b02b383..f3c1613 100644
---- a/src/react/lwt_react.mli
-+++ b/src/react/lwt_react.mli
-@@ -102,6 +102,7 @@ module S : sig
- val return : 'a -> 'a signal
- (** Same as [const]. *)
-
-+(*
- val bind : ?eq : ('b -> 'b -> bool) -> 'a signal -> ('a -> 'b signal) -> 'b signal
- (** [bind ?eq s f] is initially [f x] where [x] is the current
- value of [s]. Each time [s] changes to a new value [y], [bind
-@@ -111,6 +112,7 @@ module S : sig
- val bind_s : ?eq : ('b -> 'b -> bool) -> 'a signal -> ('a -> 'b signal Lwt.t) -> 'b signal Lwt.t
- (** Same as {!bind} except that [f] returns a thread. Calls to [f]
- are serialized. *)
-+*)
-
- (** {2 Lwt-specific utilities} *)
-
---
diff --git a/debian/patches/series b/debian/patches/series
index 6e9b1fb..97db22b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-Do-not-build-manual-manual.pdf.patch
-0002-Fix-FTBFS.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lwt.git
More information about the Pkg-ocaml-maint-commits
mailing list