[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, build, updated. debian/0.20081112+gitBB342A7-1-574-g74105d0

[Stefano Zacchiroli]

The following commit has been merged in the build branch:
commit 85d47ed62b31ac5b487c4b67b90a4328d757a075
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Apr 1 16:05:54 2009 +0200

    regenerated patches

diff --git a/debian/patches/debian/missing-doc.diff b/debian/patches/debian/missing-doc.diff
index 60d2275..0401794 100644
--- a/debian/patches/debian/missing-doc.diff
+++ b/debian/patches/debian/missing-doc.diff
@@ -7,45 +7,51 @@ Provides Debian-specific info on how to install the documentation
 Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
 
 ---
- src/batteries_toolchain/batteries_help.ml |   20 ++++++++++++++++++--
- 1 files changed, 18 insertions(+), 2 deletions(-)
+ src/batteries_toolchain/batteries_help.ml |   26 ++++++++++++++++++++++++--
+ 1 files changed, 24 insertions(+), 2 deletions(-)
 
 diff --git a/src/batteries_toolchain/batteries_help.ml b/src/batteries_toolchain/batteries_help.ml
-index ca0d5af..12a917a 100644
+index be9696f..4e2daf4 100644
 --- a/src/batteries_toolchain/batteries_help.ml
 +++ b/src/batteries_toolchain/batteries_help.ml
-@@ -165,6 +165,16 @@ let man item =
- 	      and sep   = Printf.sprintf "\nItem %S also exists as " item in
- 		Printf.printf "%a\n%!" (List.print ~first ~sep ~last:"\n" String.print) lines;;
+@@ -110,6 +110,22 @@ let append_to_table table k v =
  
+ 
+ (**
++   {6 Help messages}
++*)
++
 +let debian_doc_hint_warn =
 +  "Warning: help will not be available, because Batteries documentation\n"
 +  ^ "is not installed.\n"
++
 +let debian_doc_hint_req =
 +  "You have requested Batteries-specific help, but Batteries documentation\n"
 +  ^ "is not installed.\n"
++
 +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 Add directives}*)
++(**
+    {6 Browsing}
+ *)
  
- module Extend =
-@@ -273,7 +283,10 @@ struct
- 	   )
-       )
-       (File.lines_of root_file)
--      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 root doc file %S\n%s%!" root_file
- 	  (Printexc.to_string e)
-@@ -301,9 +314,12 @@ struct
- end;;
+@@ -203,7 +219,10 @@ let get_table =
+ 	      Hashtbl.add tables kind result;
+ 	      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 =
  
+ (**Launch the introductory help text.*)
  let help () =
 +  try
    File.with_file_in (Batteries_config.documentation_root ^ "/toplevel.help")
@@ -55,7 +61,7 @@ index ca0d5af..12a917a 100644
 +  with Sys_error msg when String.ends_with msg "No such file or directory" ->
 +    Printf.eprintf "%s%s%!" debian_doc_hint_req debian_doc_hint_inst
  
- let init () =
-   Extend.auto_register ();
+ (**Print the signature of a module.*)
+ let print_module name = 
 -- 
-tg: (1c48dbf..) debian/missing-doc (depends on: fixes/consistent-docroot)
+tg: (f6b1a23..) debian/missing-doc (depends on: fixes/consistent-docroot)
diff --git a/debian/patches/fixes/consistent-docroot.diff b/debian/patches/fixes/consistent-docroot.diff
deleted file mode 100644
index 57354e4..0000000
--- a/debian/patches/fixes/consistent-docroot.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Subject: [PATCH] fixes/consistent-docroot
-
-use consistently Batteries_config.documentation_root
-
-before this patch, the value was used for looking for
-docroot/html/.. and also for docroot/doc/batteries/*.idex, with
-"doc/batteries" being redundant
-
-
-Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
-
----
- src/batteries_toolchain/batteries_help.ml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/batteries_toolchain/batteries_help.ml b/src/batteries_toolchain/batteries_help.ml
-index 28041f3..ca0d5af 100644
---- a/src/batteries_toolchain/batteries_help.ml
-+++ b/src/batteries_toolchain/batteries_help.ml
-@@ -235,7 +235,7 @@ struct
- 	  index (Printexc.to_string e)
- 
-   let auto_register () =
--    let root_dir   = Filename.concat (Batteries_config.documentation_root) "doc/batteries"  in
-+    let root_dir   = Batteries_config.documentation_root in
-     let root_file  = Filename.concat root_dir "documentation.idex" in
-       begin
-       try
--- 
-tg: (eee8208..) fixes/consistent-docroot (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index 1ee1e8e..15fc284 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fixes/consistent-docroot.diff -p1
 debian/missing-doc.diff -p1

-- 
ocaml-batteries packaging