The following commit has been merged in the master branch:
commit f584d92d3b7fb1477a8a436553b1e92f6c646767
Author: Stephane Glondu <st...@glondu.net>
Date:   Fri Apr 22 23:06:31 2011 +0200

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 82d7c26..3babc94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+obrowser (1.1.1+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- St├ęphane Glondu <glo...@debian.org>  Fri, 22 Apr 2011 00:37:45 +0200
+
 obrowser (1.1+dfsg-4) unstable; urgency=low
 
   * Fix FTBFS with bash due to buggy patch:
diff --git a/debian/patches/0001-Fix-installation-of-dummy-stub-lib.patch 
b/debian/patches/0001-Fix-installation-of-dummy-stub-lib.patch
deleted file mode 100644
index f092ee5..0000000
--- a/debian/patches/0001-Fix-installation-of-dummy-stub-lib.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Fri, 5 Feb 2010 13:46:37 +0100
-Subject: [PATCH] Fix installation of dummy stub lib
-
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bf4ab5d..ba0e22e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -69,7 +69,7 @@ dist: clean
- 
- install:
-       $(OCAMLFIND) install obrowser META vm.js rt/caml/stdlib.cma 
rt/caml/*.cmi rt/caml/std_exit.cmo axo/AXO.cma axo/AXO*.cmi
--      install -m 644 rt/caml/dllstdlib.so `$(OCAMLFIND) -query obrowser`
-+      install -m 644 rt/caml/dllstdlib.so `$(OCAMLFIND) -printconf 
destdir`/obrowser
- 
- uninstall:
-       $(OCAMLFIND) remove obrowser
--- 
diff --git a/debian/patches/0001-Install-interfaces-in-text-format.patch 
b/debian/patches/0001-Install-interfaces-in-text-format.patch
new file mode 100644
index 0000000..e6e4370
--- /dev/null
+++ b/debian/patches/0001-Install-interfaces-in-text-format.patch
@@ -0,0 +1,27 @@
+From: Stephane Glondu <st...@glondu.net>
+Date: Fri, 5 Feb 2010 14:27:27 +0100
+Subject: Install interfaces in text format
+
+Signed-off-by: Stephane Glondu <st...@glondu.net>
+---
+ Makefile |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a92ad73..deaffad 100644
+--- a/Makefile
++++ b/Makefile
+@@ -81,7 +81,11 @@ dist: clean
+       darcs dist -d obrowser-$(VERSION)
+ 
+ install:
+-      $(OCAMLFIND) install -patch-version ${VERSION} obrowser META vm.js 
rt/js/ffi.js rt/caml/stdlib.cma rt/caml/*.cmi rt/caml/std_exit.cmo axo/AXO.cma 
axo/AXO*.cmi lwt/lwt_obrowser.cma lwt/lwt_*.cmi
++      $(OCAMLFIND) install -patch-version ${VERSION} obrowser META vm.js \
++        rt/js/ffi.js rt/caml/stdlib.cma rt/caml/*.cmi rt/caml/std_exit.cmo \
++        axo/AXO.cma axo/AXO*.cmi lwt/lwt_obrowser.cma lwt/lwt_*.cmi \
++        rt/caml/*.mli rt/caml/std_exit.ml rt/caml/j*.ml rt/caml/regexp.ml \
++        axo/AXO*.ml lwt/lwt_*.mli
+       install -m 644 rt/caml/dllstdlib.so `$(OCAMLFIND) -printconf 
destdir`/obrowser
+ 
+ uninstall:
+-- 
diff --git a/debian/patches/0002-Adapt-to-OCaml-3.11.2.patch 
b/debian/patches/0002-Adapt-to-OCaml-3.11.2.patch
deleted file mode 100644
index 88eb3d2..0000000
--- a/debian/patches/0002-Adapt-to-OCaml-3.11.2.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Fri, 5 Feb 2010 14:11:31 +0100
-Subject: [PATCH] Adapt to OCaml 3.11.2
-
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- rt/caml/.depend    |    4 ++--
- rt/caml/buffer.ml  |    8 ++++++++
- rt/caml/buffer.mli |    9 +++++++++
- rt/caml/obj.ml     |    3 +++
- rt/caml/obj.mli    |    5 ++++-
- 5 files changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/rt/caml/.depend b/rt/caml/.depend
-index 5585776..299437e 100644
---- a/rt/caml/.depend
-+++ b/rt/caml/.depend
-@@ -68,8 +68,8 @@ mutex.cmo: mutex.cmi
- mutex.cmx: mutex.cmi 
- nativeint.cmo: sys.cmi pervasives.cmi nativeint.cmi 
- nativeint.cmx: sys.cmx pervasives.cmx nativeint.cmi 
--obj.cmo: obj.cmi 
--obj.cmx: obj.cmi 
-+obj.cmo: array.cmi obj.cmi
-+obj.cmx: array.cmi obj.cmi
- oo.cmo: camlinternalOO.cmi oo.cmi 
- oo.cmx: camlinternalOO.cmx oo.cmi 
- parsing.cmo: obj.cmi lexing.cmi array.cmi parsing.cmi 
-diff --git a/rt/caml/buffer.ml b/rt/caml/buffer.ml
-index 666f563..b4b22eb 100644
---- a/rt/caml/buffer.ml
-+++ b/rt/caml/buffer.ml
-@@ -39,6 +39,14 @@ let sub b ofs len =
-   end
- ;;
- 
-+let blit src srcoff dst dstoff len =
-+  if len < 0 || srcoff < 0 || srcoff > src.position - len
-+             || dstoff < 0 || dstoff > (String.length dst) - len
-+  then invalid_arg "Buffer.blit"
-+  else
-+    String.blit src.buffer srcoff dst dstoff len
-+;;
-+
- let nth b ofs =
-   if ofs < 0 || ofs >= b.position then
-    invalid_arg "Buffer.nth"
-diff --git a/rt/caml/buffer.mli b/rt/caml/buffer.mli
-index d8d74f9..9db72c7 100644
---- a/rt/caml/buffer.mli
-+++ b/rt/caml/buffer.mli
-@@ -48,6 +48,15 @@ current contents of the buffer [b] starting at offset [off] 
of length
- [len] bytes. May raise [Invalid_argument] if out of bounds request. The
- buffer itself is unaffected. *)
- 
-+val blit : t -> int -> string -> int -> int -> unit
-+(** [Buffer.blit src srcoff dst dstoff len] copies [len] characters from
-+   the current contents of the buffer [src], starting at offset [srcoff]
-+   to string [dst], starting at character [dstoff].
-+
-+   Raise [Invalid_argument] if [srcoff] and [len] do not designate a valid
-+   substring of [src], or if [dstoff] and [len] do not designate a valid
-+   substring of [dst]. *)
-+
- val nth : t -> int -> char
- (** get the n-th character of the buffer. Raise [Invalid_argument] if
- index out of bounds *)
-diff --git a/rt/caml/obj.ml b/rt/caml/obj.ml
-index 1530960..d9cde42 100644
---- a/rt/caml/obj.ml
-+++ b/rt/caml/obj.ml
-@@ -29,9 +29,12 @@ external set_tag : t -> int -> unit = "caml_obj_set_tag"
- external size : t -> int = "%obj_size"
- external field : t -> int -> t = "%obj_field"
- external set_field : t -> int -> t -> unit = "%obj_set_field"
-+let double_field x i = Array.get (obj x : float array) i
-+let set_double_field x i v = Array.set (obj x : float array) i v
- external new_block : int -> int -> t = "caml_obj_block"
- external dup : t -> t = "caml_obj_dup"
- external truncate : t -> int -> unit = "caml_obj_truncate"
-+external add_offset : t -> int -> t = "caml_obj_add_offset"
- 
- let marshal (obj : t) =
-   Marshal.to_string obj []
-diff --git a/rt/caml/obj.mli b/rt/caml/obj.mli
-index c1bd500..e6fb481 100644
---- a/rt/caml/obj.mli
-+++ b/rt/caml/obj.mli
-@@ -30,11 +30,14 @@ external is_int : t -> bool = "%obj_is_int"
- external tag : t -> int = "caml_obj_tag"
- external set_tag : t -> int -> unit = "caml_obj_set_tag"
- external size : t -> int = "%obj_size"
--external truncate : t -> int -> unit = "caml_obj_truncate"
- external field : t -> int -> t = "%obj_field"
- external set_field : t -> int -> t -> unit = "%obj_set_field"
-+val double_field : t -> int -> float
-+val set_double_field : t -> int -> float -> unit
- external new_block : int -> int -> t = "caml_obj_block"
- external dup : t -> t = "caml_obj_dup"
-+external truncate : t -> int -> unit = "caml_obj_truncate"
-+external add_offset : t -> int -> t = "caml_obj_add_offset"
- 
- val lazy_tag : int
- val closure_tag : int
--- 
diff --git a/debian/patches/0004-More-cleaning.patch 
b/debian/patches/0002-More-cleaning.patch
similarity index 88%
rename from debian/patches/0004-More-cleaning.patch
rename to debian/patches/0002-More-cleaning.patch
index 04b84b1..5ceb1bf 100644
--- a/debian/patches/0004-More-cleaning.patch
+++ b/debian/patches/0002-More-cleaning.patch
@@ -1,6 +1,6 @@
 From: Stephane Glondu <st...@glondu.net>
 Date: Fri, 5 Feb 2010 15:18:29 +0100
-Subject: [PATCH] More cleaning
+Subject: More cleaning
 
 Signed-off-by: Stephane Glondu <st...@glondu.net>
 ---
@@ -8,7 +8,7 @@ Signed-off-by: Stephane Glondu <st...@glondu.net>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/examples/wiki/Makefile b/examples/wiki/Makefile
-index 6ad8d02..b3110ea 100644
+index e83c60f..10234e9 100644
 --- a/examples/wiki/Makefile
 +++ b/examples/wiki/Makefile
 @@ -13,4 +13,4 @@ vm.js: ../../vm.js
diff --git a/debian/patches/0005-Do-not-compile-the-scribble-server.patch 
b/debian/patches/0003-Do-not-compile-the-scribble-server.patch
similarity index 93%
rename from debian/patches/0005-Do-not-compile-the-scribble-server.patch
rename to debian/patches/0003-Do-not-compile-the-scribble-server.patch
index e641f55..8e338a7 100644
--- a/debian/patches/0005-Do-not-compile-the-scribble-server.patch
+++ b/debian/patches/0003-Do-not-compile-the-scribble-server.patch
@@ -1,6 +1,6 @@
 From: Stephane Glondu <st...@glondu.net>
 Date: Sat, 6 Feb 2010 14:44:22 +0100
-Subject: [PATCH] Do not compile the scribble server
+Subject: Do not compile the scribble server
 
 The scribble server is installed as an example, so we avoid to compile
 potentially architecture-specific files (and avoid issues with
diff --git a/debian/patches/0003-Install-interfaces-in-text-format.patch 
b/debian/patches/0003-Install-interfaces-in-text-format.patch
deleted file mode 100644
index 291f427..0000000
--- a/debian/patches/0003-Install-interfaces-in-text-format.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Fri, 5 Feb 2010 14:27:27 +0100
-Subject: [PATCH] Install interfaces in text format
-
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- Makefile |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ba0e22e..2366539 100644
---- a/Makefile
-+++ b/Makefile
-@@ -68,7 +68,9 @@ dist: clean
-        echo "[DIST] dist/$$B.$$D.tbz2"
- 
- install:
--      $(OCAMLFIND) install obrowser META vm.js rt/caml/stdlib.cma 
rt/caml/*.cmi rt/caml/std_exit.cmo axo/AXO.cma axo/AXO*.cmi
-+      $(OCAMLFIND) install obrowser META vm.js \
-+        rt/caml/stdlib.cma rt/caml/*.cmi rt/caml/std_exit.cmo axo/AXO.cma 
axo/AXO*.cmi \
-+        rt/caml/*.mli rt/caml/std_exit.ml rt/caml/j*.ml rt/caml/regexp.ml 
axo/AXO*.ml
-       install -m 644 rt/caml/dllstdlib.so `$(OCAMLFIND) -printconf 
destdir`/obrowser
- 
- uninstall:
--- 
diff --git 
a/debian/patches/0006-Set-OCAMLLIB-at-the-right-time-in-wiki-example.patch 
b/debian/patches/0006-Set-OCAMLLIB-at-the-right-time-in-wiki-example.patch
deleted file mode 100644
index 5c71b8e..0000000
--- a/debian/patches/0006-Set-OCAMLLIB-at-the-right-time-in-wiki-example.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Tue, 16 Feb 2010 13:26:55 +0100
-Subject: [PATCH] Set OCAMLLIB at the right time in wiki example
-
-OCAMLLIB must not affect ocamlbuild itself. This patch fixes FTBFS on
-bytecode architectures.
----
- examples/wiki/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/examples/wiki/Makefile b/examples/wiki/Makefile
-index b3110ea..10234e9 100644
---- a/examples/wiki/Makefile
-+++ b/examples/wiki/Makefile
-@@ -1,7 +1,7 @@
- .PHONY=all clean
- 
- all: vm.js
--      @OCAMLLIB=`pwd`/../../rt/caml ocamlbuild main.byte
-+      @ocamlbuild -ocamlc 'OCAMLLIB=$(PWD)/../../rt/caml ocamlc' main.byte
-       @uuencode main.byte stdout > main.uue
- 
- vm.js: ../../vm.js
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 3fb7f4c..0ff231c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-0001-Fix-installation-of-dummy-stub-lib.patch
-0002-Adapt-to-OCaml-3.11.2.patch
-0003-Install-interfaces-in-text-format.patch
-0004-More-cleaning.patch
-0005-Do-not-compile-the-scribble-server.patch
-0006-Set-OCAMLLIB-at-the-right-time-in-wiki-example.patch
+0001-Install-interfaces-in-text-format.patch
+0002-More-cleaning.patch
+0003-Do-not-compile-the-scribble-server.patch

-- 
obrowser packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to