[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, experimental/master, updated. debian/1.2.0-3+lwt.1-7-g46038d4
Stephane Glondu
steph at glondu.net
Sat Sep 26 12:13:23 UTC 2009
The following commit has been merged in the experimental/master branch:
commit 315e020b6781dd122b9e60ddf6b7ace51e9a62ef
Author: Stephane Glondu <steph at glondu.net>
Date: Sat Sep 26 00:04:38 2009 +0200
Remove patches
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 247cb88..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,16 +0,0 @@
-Ocsigen Debian source package
-=============================
-
-Patching upstream sources
--------------------------
-
-This source package uses quilt to apply and remove its patches. Please
-refer to `/usr/share/doc/quilt/README.source' for information about
-how to use quilt for source packages.
-
-The quilt series is generated from the Git repository, using
-dom-{apply,save}-patches, from the dh-ocaml (>= 0.4.2) package. Please
-refer to the appendix about Git in the Debian OCaml Packaging Policy
-(from the same package).
-
- -- Stephane Glondu <steph at glondu.net>, Sat, 20 Jun 2009 16:16:23 +0200
diff --git a/debian/control b/debian/control
index 9627844..9c39958 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders:
Stefano Zacchiroli <zack at debian.org>
Build-Depends:
debhelper (>= 7.0.52),
- quilt (>= 0.46-7),
ocaml-nox (>= 3.11),
camlp4,
camlp4-extra,
diff --git a/debian/patches/0001-Fix-typo-regarding-stubdir-in-configure-script.patch b/debian/patches/0001-Fix-typo-regarding-stubdir-in-configure-script.patch
deleted file mode 100644
index 2f50c71..0000000
--- a/debian/patches/0001-Fix-typo-regarding-stubdir-in-configure-script.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Fri, 8 May 2009 01:53:22 +0200
-Subject: [PATCH] Fix typo regarding --stubdir in configure script
-
-Applied upstream.
----
- configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 03937d5..0819b30 100755
---- a/configure
-+++ b/configure
-@@ -375,7 +375,7 @@ while [ "$#" -gt 0 ]; do
- shift
- ;;
- --stubdir)
-- libdir="$2"
-+ stubdir="$2"
- shift
- shift
- ;;
---
diff --git a/debian/patches/0002-Fix-for-pcre-ocaml-6.0.0.patch b/debian/patches/0002-Fix-for-pcre-ocaml-6.0.0.patch
deleted file mode 100644
index 16535ad..0000000
--- a/debian/patches/0002-Fix-for-pcre-ocaml-6.0.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sat, 13 Jun 2009 02:21:56 +0200
-Subject: [PATCH] Fix for pcre-ocaml 6.0.0
-
-Upstream notified.
----
- extensions/staticmod.ml | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/extensions/staticmod.ml b/extensions/staticmod.ml
-index d2250ae..aac17d5 100644
---- a/extensions/staticmod.ml
-+++ b/extensions/staticmod.ml
-@@ -188,14 +188,14 @@ let parse_config userconf : parse_config_aux = fun _ _ _ ->
-
- | ("regexp", s)::l when opt.opt_regexp = None ->
- let s = try Netstring_pcre.regexp ("^"^s^"$")
-- with Pcre.BadPattern _ ->
-+ with Pcre.Error (Pcre.BadPattern _) ->
- bad_config ("Bad regexp \""^s^"\" in <static regexp=\"...\" />")
- in
- parse_attrs l { opt with opt_regexp = Some s }
-
- | ("code", c)::l when opt.opt_code = None ->
- let c = try Netstring_pcre.regexp ("^"^c^"$")
-- with Pcre.BadPattern _ ->
-+ with Pcre.Error (Pcre.BadPattern _) ->
- bad_config ("Bad regexp \""^c^"\" in <static code=\"...\" />")
- in
- parse_attrs l { opt with opt_code = Some c }
---
diff --git a/debian/patches/0003-Fix-ocsipersist-dbm-Makefile.patch b/debian/patches/0003-Fix-ocsipersist-dbm-Makefile.patch
deleted file mode 100644
index c8c7827..0000000
--- a/debian/patches/0003-Fix-ocsipersist-dbm-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Fri, 21 Aug 2009 09:54:43 +0200
-Subject: [PATCH] Fix ocsipersist-dbm Makefile
-
-Already fixed (differently) in upstream VCS.
----
- extensions/ocsipersist-dbm/Makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/extensions/ocsipersist-dbm/Makefile b/extensions/ocsipersist-dbm/Makefile
-index 1b2b5e3..ca790a5 100644
---- a/extensions/ocsipersist-dbm/Makefile
-+++ b/extensions/ocsipersist-dbm/Makefile
-@@ -53,10 +53,10 @@ ocsipersist-dbm.cmxs: ocsipersist.cmx
- cp -f ocsipersist-dbm.cmxs ..
-
- ocsidbm: ocsidbm.cmo
-- $(CAMLC) -package lwt -o $@ unix.cma dbm.cma lwt.cma $<
-+ $(CAMLC) -package lwt,dbm -o $@ -linkpkg $<
-
- ocsidbm.opt: ocsidbm.cmx
-- $(CAMLOPT) -package lwt -o $@ unix.cmxa dbm.cmxa lwt.cmxa $<
-+ $(CAMLOPT) -package lwt,dbm -o $@ -linkpkg $<
-
- ocsipersist.mli:
- cp -f ../ocsipersist.mli .
---
diff --git a/debian/patches/0004-Adapt-for-lwt-2.patch b/debian/patches/0004-Adapt-for-lwt-2.patch
deleted file mode 100644
index 33012a8..0000000
--- a/debian/patches/0004-Adapt-for-lwt-2.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Fri, 21 Aug 2009 09:55:11 +0200
-Subject: [PATCH] Adapt for lwt 2
-
-Changes taken from upstream VCS.
----
- http/ocsigen_http_com.ml | 22 ++++++++++++++++------
- server/ocsigen_http_client.ml | 14 +++++++-------
- server/ocsigen_server.ml | 6 +++---
- 3 files changed, 26 insertions(+), 16 deletions(-)
-
-diff --git a/http/ocsigen_http_com.ml b/http/ocsigen_http_com.ml
-index feaf83d..9917541 100644
---- a/http/ocsigen_http_com.ml
-+++ b/http/ocsigen_http_com.ml
-@@ -67,11 +67,15 @@ type mode = Answer | Query | Nofirstline
-
- type waiter =
- { w_wait : unit Lwt.t;
-+ w_waker : unit Lwt.u option;
- mutable w_did_wait : bool }
-
- let create_waiter block =
-- let wait = if block then Lwt.wait () else Lwt.return () in
-- { w_wait = wait; w_did_wait = false }
-+ if block then
-+ let (t, u) = Lwt.wait () in
-+ { w_wait = t; w_waker = Some u; w_did_wait = false }
-+ else
-+ { w_wait = Lwt.return (); w_waker = None; w_did_wait = false }
-
- (** buffer de comunication permettant la reception et la recupération
- des messages *)
-@@ -522,11 +526,17 @@ let start_processing conn f =
- if conn.sender_count = 0 then Lwt_timeout.start conn.timeout;
- Lwt.return ()))
- (fun () ->
-- Lwt.wakeup next_waiter.w_wait ();
-- Lwt.return ())
-+ (match next_waiter.w_waker with
-+ | None -> ()
-+ | Some wk -> Lwt.wakeup wk ())
-+ ; Lwt.return ()
-+ )
- (fun e ->
-- Lwt.wakeup_exn next_waiter.w_wait e;
-- Lwt.return ()))
-+ (match next_waiter.w_waker with
-+ | None -> ()
-+ | Some wk -> Lwt.wakeup_exn wk e)
-+ ; Lwt.return ()
-+ ))
-
- let wait_previous_senders slot =
- slot.sl_waiter.w_did_wait <- true;
-diff --git a/server/ocsigen_http_client.ml b/server/ocsigen_http_client.ml
-index 4e03c46..9d6a510 100644
---- a/server/ocsigen_http_client.ml
-+++ b/server/ocsigen_http_client.ml
-@@ -411,7 +411,7 @@ let raw_request
- Ocsigen_messages.debug (fun () ->
- string_of_int
- (Ocsigen_extensions.client_id client));
-- let new_waiter = Lwt.wait () in
-+ let new_waiter, new_waiter_awakener = Lwt.wait () in
- let key = (Ocsigen_extensions.client_id client, (inet_addr, port, head)) in
- (* Is there already a connection for the same client? *)
- let (ref_thr_conn, get_frame, nb_users) =
-@@ -438,7 +438,7 @@ let raw_request
- T.replace connection_table key
- (ref_thr_conn, new_get_frame, nb_users + 1);
- (* remove_on_error key get_frame; *)
-- (Some (key, new_waiter), ref_thr_conn, get_frame)
-+ (Some (key, new_waiter_awakener), ref_thr_conn, get_frame)
- | _ ->
- (* No pipeline *)
- let (ref_thr_conn, gf) = find_conn () in
-@@ -452,7 +452,7 @@ let raw_request
- fun () ->
-
- let get_frame_ref = ref get_frame in
-- let request_sent = Lwt.wait () in (* awoken when request sent *)
-+ let request_sent, request_sent_awakener = Lwt.wait () in (* awoken when request sent *)
-
- let query = Ocsigen_http_frame.Http_header.Query (http_method, uri) in
-
-@@ -504,9 +504,9 @@ let raw_request
- }) >>= fun () ->
-
- Ocsigen_messages.debug2 "--Ocsigen_http_client: request sent";
-- Lwt.wakeup request_sent ();
-+ Lwt.wakeup request_sent_awakener ();
- Lwt.return ())
-- (fun e -> Lwt.wakeup_exn request_sent e; Lwt.fail e)
-+ (fun e -> Lwt.wakeup_exn request_sent_awakener e; Lwt.fail e)
-
- in
-
-@@ -615,8 +615,8 @@ let raw_request
- (* We advice subsequent get_frame that the pipeline failed: *)
- (match key_new_waiter with
- | None -> ()
-- | Some (_, new_waiter) ->
-- Lwt.wakeup_exn new_waiter Pipeline_failed);
-+ | Some (_, new_waiter_awakener) ->
-+ Lwt.wakeup_exn new_waiter_awakener Pipeline_failed);
-
- finalize false >>= fun () ->
- Lwt.fail e)
-diff --git a/server/ocsigen_server.ml b/server/ocsigen_server.ml
-index 515da14..2d5a8c0 100644
---- a/server/ocsigen_server.ml
-+++ b/server/ocsigen_server.ml
-@@ -994,7 +994,7 @@ let start_server () = try
- Ocsigen_messages.open_files ();
-
- Lwt_unix.run
-- (let wait_end_init = wait () in
-+ (let wait_end_init, wait_end_init_awakener = wait () in
- (* Listening on all ports: *)
- List.iter
- (fun i ->
-@@ -1125,11 +1125,11 @@ let start_server () = try
- end; f ())
- in ignore (f ());
-
-- wakeup wait_end_init ();
-+ wakeup wait_end_init_awakener ();
-
- warning "Ocsigen has been launched (initialisations ok)";
-
-- wait ()
-+ fst (wait ())
- )
- in
-
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2a7ac0d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-Fix-typo-regarding-stubdir-in-configure-script.patch
-0002-Fix-for-pcre-ocaml-6.0.0.patch
-0003-Fix-ocsipersist-dbm-Makefile.patch
-0004-Adapt-for-lwt-2.patch
diff --git a/debian/rules b/debian/rules
index 2186be7..47fefa4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/ocaml/ocamlinit.mk
DESTDIR := $(CURDIR)/debian/tmp
PACKAGES := $(shell sed -nr 's/^Package: (.*)$$/\1/p' debian/control)
-DH := dh --with quilt
+DH := dh
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
OPT_CONFFLAGS := --enable-nativecode
--
ocsigen packaging
More information about the Pkg-ocaml-maint-commits
mailing list