[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/0.20090405+beta1-5-6-g77fdfc2

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit d5f9b4a3284c1afc30cb1aefb05d6debf5d5a1e4
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Fri Mar 5 19:59:28 2010 +0100

    remove obsolete debian/patches/
    
    in particular:
    - 0001-debian-specific-installation-paths
    - 0002-debian-specific-info-on-doc-availability

diff --git a/debian/changelog b/debian/changelog
index c51ac17..a1b742f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ocaml-batteries (1.1.0-1) UNRELEASED; urgency=low
     - adapt to new stuff shipped by upstream
     - switch from CDBS to dh
     - adapt dependencies (generally: reduce them)
+  * remove old debian/patches/{debian-specific-installation-paths,
+    debian-specific-info-on-doc-availability} as obsolete
 
  -- Stefano Zacchiroli <zack at debian.org>  Mon, 01 Mar 2010 18:20:54 +0100
 
diff --git a/debian/patches/0001-debian-specific-installation-paths.patch b/debian/patches/0001-debian-specific-installation-paths.patch
deleted file mode 100644
index 8977d24..0000000
--- a/debian/patches/0001-debian-specific-installation-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Sat, 14 Nov 2009 12:49:57 +0100
-Subject: [PATCH] debian-specific installation paths
-
-Patch batteries toolchain command wrappers to rely on
-`ocamlc -where`/batteries/ as the installation place where the
-wrappers will be available upon installation.
-
-Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
----
- src/batteries_toolchain/ocaml.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/batteries_toolchain/ocaml.in b/src/batteries_toolchain/ocaml.in
-index 002fd04..2d8e9f0 100755
---- a/src/batteries_toolchain/ocaml.in
-+++ b/src/batteries_toolchain/ocaml.in
-@@ -1,2 +1,2 @@
- #!/bin/sh
--"@DESTDIR@/batteries/toplevel.top" "@DESTDIR@/batteries/top.ml" $@
-+"@OCAMLLIBDIR@/batteries/toplevel.top" "@OCAMLLIBDIR@/batteries/top.ml" $@
--- 
diff --git a/debian/patches/0002-debian-specific-info-on-doc-availability.patch b/debian/patches/0002-debian-specific-info-on-doc-availability.patch
deleted file mode 100644
index 554499a..0000000
--- a/debian/patches/0002-debian-specific-info-on-doc-availability.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Sat, 14 Nov 2009 12:50:41 +0100
-Subject: [PATCH] debian-specific info on doc availability
-
-Provides Debian-specific info on how to install the documentation (needed for
-
-Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
----
- 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..08aa133 100644
---- a/src/batteries_toolchain/batteries_help.ml
-+++ b/src/batteries_toolchain/batteries_help.ml
-@@ -108,6 +108,17 @@ let append_to_table table k v =
-     in
-       RefList.push found v
- 
-+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 Browsing}
-@@ -204,12 +215,16 @@ let get_table =
- 	      result
- 	      
- 	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 () =
-+  try
-   File.with_file_in (Batteries_config.documentation_root ^ "/toplevel.help")
-     (fun file -> copy file stdout);
--  flush stdout;;
-+  flush stdout
-+  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
- 
- (**Print the signature of a module.*)
- let print_module name = 
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 221018b..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-# 0001-debian-specific-installation-paths.patch
-# 0002-debian-specific-info-on-doc-availability.patch

-- 
ocaml-batteries packaging