The following commit has been merged in the master branch:
commit 6a0342767b84a5fe0e7d48cf1f3b25f6de16bd72
Author: Stephane Glondu <st...@glondu.net>
Date: Sun Jan 15 15:38:01 2012 +0100
Remove obsolete patches
diff --git a/debian/patches/0001-Disable-install-of-lwt_obrowser.patch
b/debian/patches/0001-Disable-install-of-lwt_obrowser.patch
deleted file mode 100644
index 79938e4..0000000
--- a/debian/patches/0001-Disable-install-of-lwt_obrowser.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Nicolas Dandrimont <nicolas.dandrim...@crans.org>
-Date: Wed, 18 May 2011 14:40:27 +0200
-Subject: Disable install of lwt_obrowser
-
----
- Makefile | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3d7772a..6e3f321 100644
---- a/Makefile
-+++ b/Makefile
-@@ -191,7 +191,7 @@ endif
- STATICSTUBS = server/lib$(OCSIGENNAME).a
-
- PLUGINSTOINSTALL=$(PLUGINSTOINSTALLBYTE) $(PLUGINSTOINSTALLX)
--TOINSTALL=$(TOINSTALLBYTE) $(TOINSTALLX) $(CMITOINSTALL)
$(PLUGINSCMITOINSTALL) $(PLUGINSTOINSTALL) $(STATICSTUBS)
eliom/pa_eliom_obrowser.cmo eliom/obrowser/_build/eliom_obrowser_client.cma
eliom/obrowser/_build/eliom_obrowser_client.cmi
eliom/obrowser/_build/lwt_obrowser.cmi eliom/obrowser/eliom_obrowser.js
-+TOINSTALL=$(TOINSTALLBYTE) $(TOINSTALLX) $(CMITOINSTALL)
$(PLUGINSCMITOINSTALL) $(PLUGINSTOINSTALL) $(STATICSTUBS)
eliom/pa_eliom_obrowser.cmo eliom/obrowser/_build/eliom_obrowser_client.cma
eliom/obrowser/_build/eliom_obrowser_client.cmi eliom/obrowser/eliom_obrowser.js
- EXAMPLES=$(EXAMPLESBYTE) $(EXAMPLESOPT) $(EXAMPLESCMI)
-
- REPS=$(TARGETSBYTE:.byte=)
-@@ -288,7 +288,6 @@ files/META.ocsigen: files/META.in VERSION
- -ln -sf ../eliom/eliom.cma extensions
- -ln -sf ../eliom/eliom_duce.cma extensions
- -ln -sf ../eliom/obrowser/_builde/eliom_obrowser_client.cma extensions
-- -ln -sf ../eliom/obrowser/_build/lwt_obrowser.cmo extensions
- -ln -sf ../xmlp4/ohl-xhtml/xhtml.cma extensions
- -ln -sf ../xmlp4/xhtmlpretty.cma extensions
- -ln -sf ../xmlp4/xhtmlsyntax.cma extensions
---
diff --git a/debian/patches/0002-Fix-wrong-decoding-of-in-URL-paths.patch
b/debian/patches/0002-Fix-wrong-decoding-of-in-URL-paths.patch
deleted file mode 100644
index 77198fc..0000000
--- a/debian/patches/0002-Fix-wrong-decoding-of-in-URL-paths.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Thu, 7 Jul 2011 16:47:00 +0200
-Subject: Fix wrong decoding of + in URL paths
-
-Cherry-picked from upstream.
----
- baselib/ocsigen_lib.ml | 11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/baselib/ocsigen_lib.ml b/baselib/ocsigen_lib.ml
-index 376fe3a..15af400 100644
---- a/baselib/ocsigen_lib.ml
-+++ b/baselib/ocsigen_lib.ml
-@@ -509,7 +509,8 @@ let string_of_url_path ~encode l =
- then
- fixup_url_string (String.concat "/"
- (List.map (*Netencoding.Url.encode*)
-- MyUrl.encode l))
-+ (MyUrl.encode ~plus:false) l))
-+ (* ' ' are not encoded to '+' in paths *)
- else String.concat "/" l (* BYXXX : check illicit characters *)
-
- let parse_url =
-@@ -561,6 +562,12 @@ let parse_url =
-
- (* Note that the fragment (string after #) is not sent by browsers *)
-
-+(*20110707 ' ' is encoded to '+' in queries, but not in paths.
-+ Warning: if we write the URL manually, we must encode ' ' to '+' manually
-+ (not done by the browser).
-+ --Vincent
-+*)
-+
- let get_params =
- lazy begin
- let params_string = match query with None -> "" | Some s -> s in
-@@ -570,7 +577,7 @@ let parse_url =
- end
- in
-
-- let path = List.map Netencoding.Url.decode (Neturl.split_path pathstring)
in
-+ let path = List.map (Netencoding.Url.decode ~plus:false)
(Neturl.split_path pathstring) in
-
- let path = remove_dotdot path (* and remove "//" *)
- (* here we remove .. from paths, as it is dangerous.
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bc43ddc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Disable-install-of-lwt_obrowser.patch
-0002-Fix-wrong-decoding-of-in-URL-paths.patch
--
ocsigenserver 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
