The following commit has been merged in the build branch:
commit 74105d03da70104691f89075beb65631b4fea99e
Author: Stefano Zacchiroli <[email protected]>
Date: Wed Apr 1 16:41:37 2009 +0200
refresh patches
diff --git a/debian/patches/debian/missing-doc.diff
b/debian/patches/debian/missing-doc.diff
index 0401794..439991c 100644
--- a/debian/patches/debian/missing-doc.diff
+++ b/debian/patches/debian/missing-doc.diff
@@ -7,20 +7,17 @@ Provides Debian-specific info on how to install the
documentation
Signed-off-by: Stefano Zacchiroli <[email protected]>
---
- src/batteries_toolchain/batteries_help.ml | 26 ++++++++++++++++++++++++--
- 1 files changed, 24 insertions(+), 2 deletions(-)
+ src/batteries_toolchain/batteries_help.ml | 32 ++++++++++++++++++++++------
+ 1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/batteries_toolchain/batteries_help.ml
b/src/batteries_toolchain/batteries_help.ml
-index be9696f..4e2daf4 100644
+index be9696f..08aa133 100644
--- a/src/batteries_toolchain/batteries_help.ml
+++ b/src/batteries_toolchain/batteries_help.ml
-@@ -110,6 +110,22 @@ let append_to_table table k v =
+@@ -108,6 +108,17 @@ let append_to_table table k v =
+ in
+ RefList.push found v
-
- (**
-+ {6 Help messages}
-+*)
-+
+let debian_doc_hint_warn =
+ "Warning: help will not be available, because Batteries documentation\n"
+ ^ "is not installed.\n"
@@ -32,24 +29,33 @@ index be9696f..4e2daf4 100644
+let debian_doc_hint_inst =
+ "To fix this: please install the `libbatteries-ocaml-doc' Debian package\n"
+ ^ "(which ships Batteries documentation and its indexes) and try again.\n"
-+
-+(**
- {6 Browsing}
- *)
-@@ -203,7 +219,10 @@ let get_table =
- Hashtbl.add tables kind result;
+ (**
+ {6 Browsing}
+@@ -204,12 +215,16 @@ let get_table =
result
-- with e ->
-+ with
-+ | Sys_error msg when String.ends_with msg "No such file or directory"
->
-+ Printf.eprintf "%s%s%!" debian_doc_hint_warn debian_doc_hint_inst
-+ | e ->
- Printf.eprintf
- "While initializing the on-line help, error in root doc file
%S\n%s\n%!" root_file
- (Printexc.to_string e);
-@@ -365,9 +384,12 @@ let helpers =
+ with e ->
+- Printf.eprintf
+- "While initializing the on-line help, error in root doc file
%S\n%s\n%!" root_file
+- (Printexc.to_string e);
+- let result = {suggestions = Hashtbl.create 0; completions =
Hashtbl.create 0} in
+- Hashtbl.add tables kind result;
+- result
++ let result = {suggestions = Hashtbl.create 0; completions =
Hashtbl.create 0} in
++ Hashtbl.add tables kind result;
++ (match e with
++ | Sys_error msg when String.ends_with msg "No such file or
directory" ->
++ Printf.eprintf "%s%s%!" debian_doc_hint_warn
debian_doc_hint_inst
++ | e ->
++ Printf.eprintf
++ "While initializing the on-line help, error in root doc file
%S\n%s\n%!" root_file
++ (Printexc.to_string e));
++ result
+
+
+
+@@ -365,9 +380,12 @@ let helpers =
(**Launch the introductory help text.*)
let help () =
--
ocaml-batteries packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
