[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-8-1-g5d3da1e

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 5d3da1e79b112e909d103210c53046ba1fb616f7
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 11 23:09:46 2011 +0200

    Fix build with camomile 0.8.3 (Closes: #636025)

diff --git a/debian/patches/0007-Fix-build-with-camomile-0.8.3.patch b/debian/patches/0007-Fix-build-with-camomile-0.8.3.patch
new file mode 100644
index 0000000..82a67e6
--- /dev/null
+++ b/debian/patches/0007-Fix-build-with-camomile-0.8.3.patch
@@ -0,0 +1,109 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 11 Aug 2011 23:08:04 +0200
+Subject: Fix build with camomile 0.8.3
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636025
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ base/galax_camomile_0.8.ml |   73 ++++++++++++++++++++++++++++++++++++++++++++
+ configure                  |    6 +++-
+ 2 files changed, 78 insertions(+), 1 deletions(-)
+ create mode 100644 base/galax_camomile_0.8.ml
+
+diff --git a/base/galax_camomile_0.8.ml b/base/galax_camomile_0.8.ml
+new file mode 100644
+index 0000000..d457b98
+--- /dev/null
++++ b/base/galax_camomile_0.8.ml
+@@ -0,0 +1,73 @@
++(***********************************************************************)
++(*                                                                     *)
++(*                                 GALAX                               *)
++(*                             XQuery Engine                           *)
++(*                                                                     *)
++(*  Copyright 2001-2007.                                               *)
++(*  Distributed only by permission.                                    *)
++(*                                                                     *)
++(***********************************************************************)
++
++(* $Id: galax_camomile_0.7.ml,v 1.2 2007/10/24 15:15:17 simeon Exp $ *)
++
++(* Module: Glx_camomile
++   Description:
++     This module is a wrapper over Camomile operations.
++*)
++
++open Error
++
++let makedatadir d = Filename.concat d "database"
++let makelocaledir d = Filename.concat d "locales"
++let makecharmapdir d = Filename.concat d "charmaps"
++let makeunimapdir d = Filename.concat d "mappings"
++
++module Camomileconfig =
++struct
++(* configuration for tools *)
++  let datadir = 
++    try makedatadir (Sys.getenv "UNICODE_MAPS") with Not_found -> 
++      CamomileLibraryDefault.Config.datadir
++  let localedir = 
++    try makelocaledir (Sys.getenv "UNICODE_MAPS") with Not_found -> 
++      CamomileLibraryDefault.Config.localedir
++  let charmapdir = 
++    try makecharmapdir (Sys.getenv "UNICODE_MAPS") with Not_found -> 
++      CamomileLibraryDefault.Config.charmapdir
++  let unimapdir =
++    try makeunimapdir (Sys.getenv "UNICODE_MAPS") with Not_found -> 
++      CamomileLibraryDefault.Config.unimapdir
++end
++
++module TextUTF8 = CamomileLibrary.UNF.Make(Camomileconfig)(CamomileLibrary.UTF8)
++
++let nfc x = TextUTF8.nfc x
++let nfd x = TextUTF8.nfd x
++let nfkc x = TextUTF8.nfkc x
++let nfkd x = TextUTF8.nfkd x
++
++let utf8_string_of_code_point i =
++  Encoding.character (Encoding.get_internal_encoding ()) i
++
++let utf8_add_point_to_buffer b i =
++  let c = Encoding.character (Encoding.get_internal_encoding ()) i in
++  Buffer.add_string b c
++
++let utf8_string_of_code_points c =
++  let b = Buffer.create 10 in
++  List.iter (utf8_add_point_to_buffer b) c;
++  Buffer.contents b
++
++let utf8_codepoint_compare s1 s2 =
++  CamomileLibrary.UTF8.compare s1 s2
++
++let utf8_code_points_of_string s =
++  try
++    let codept_list = ref [] in
++    CamomileLibrary.UTF8.iter
++      (fun uc -> let ic = CamomileLibrary.UChar.code uc in codept_list := (!codept_list) @ [ic]) s;
++    !codept_list
++  with 
++  | CamomileLibrary.UChar.Out_of_range ->
++      raise(Query(Unicode_Error("Unicode character cannot be represented by positive integer.")))
++
+diff --git a/configure b/configure
+index fcd9393..9e46c10 100755
+--- a/configure
++++ b/configure
+@@ -816,7 +816,11 @@ then
+ 		ocaml_camomile=`$tool_ocamlfind query camomile 2>/dev/null`
+ 	fi
+ fi
+-if [ -n "$ocaml_camomile" -a -f "$ocaml_camomile/camomileLibrary.cmi" ]
++if [ -n "$ocaml_camomile" -a -f "$ocaml_camomile/camomileLibraryDefault.cmi" ]
++then
++	ocaml_camomile_version="0.8"
++	echo "found version 0.8"
++elif [ -n "$ocaml_camomile" -a -f "$ocaml_camomile/camomileLibrary.cmi" ]
+ then
+ 	ocaml_camomile_version="0.7"
+ 	echo "found version 0.7"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 41987cf..9ec862a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-fix-syntax-errors-in-ocamldoc-tags.patch
 0005-Fix-some-typos.patch
 0006-Compile-with-ocamlnet-3.3.5.patch
+0007-Fix-build-with-camomile-0.8.3.patch

-- 
galax packaging