[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, upstream, updated. upstream/1.6.1-7-g9aaa4ba

[Stephane Glondu]

The following commit has been merged in the upstream branch:
commit ed7b544ef4c5591b5d81c263c51503e11c04ce1a
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed May 8 15:08:32 2013 +0200

    Imported Upstream version 2.0.1

diff --git a/.hg_archival.txt b/.hg_archival.txt
index d1dc3ca..ba09f6d 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,5 +1,5 @@
 repo: 42b5d31bc33edcbe8bd08bd924e56244cd453699
-node: 234a17316d508301f547fa3fe189613fdcc13cd1
+node: 267334fc740d0339c36461302e2e59ee63a424bd
 branch: default
-latesttag: release-2.0.0
+latesttag: release-2.0.1
 latesttagdistance: 1
diff --git a/.hgtags b/.hgtags
index aac5cef..658d1ae 100644
--- a/.hgtags
+++ b/.hgtags
@@ -23,3 +23,4 @@ bdb8a82c1481682a9d736a5c04108480bcfbf155 release-1.6.0
 e77dfff5ac640b141e29464a1ecaac8215e5c334 release-1.6.2
 c24545d1a514fa32484b769a655f9779ed9e7c88 release-1.6.3
 bd4bac35acf6ab5515d7a3ef8bacb038e417ae56 release-2.0.0
+a0f0a04508c6b8c42688fd6aa4557a03f420eae5 release-2.0.1
diff --git a/CHANGES.txt b/CHANGES.txt
index c15f9ec..537660b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+2012-07-16:  Replaced String.trim function in myocamlbuild.ml to allow
+             compiling with OCaml 3.12.1.
+
 2012-07-15:  New major release version 2.0.0:
 
                * Upgraded to OCaml 4.00
diff --git a/_oasis b/_oasis
index ddec1f8..3108efd 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat:      0.3
 Name:             sqlite3-ocaml
-Version:          2.0.0
+Version:          2.0.1
 Synopsis:         sqlite3-ocaml - bindings to the SQLite3 library
 Description:      sqlite3-ocaml offers library functions for accessing SQLite3 database
 Authors:          Markus Mottl <markus.mottl at gmail.com>,
diff --git a/lib/META b/lib/META
index eaf084e..b1f46d5 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 768ffc47dbd6ef43be07a7e558592c70)
-version = "2.0.0"
+# DO NOT EDIT (digest: 351f3ace294279ab0bc82513b0aa4dc8)
+version = "2.0.1"
 description = "sqlite3-ocaml - bindings to the SQLite3 library"
 archive(byte) = "sqlite3.cma"
 archive(byte, plugin) = "sqlite3.cma"
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index e8d8f33..c2f1d68 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -558,6 +558,21 @@ let rec split_string s =
   | Some pos -> String.before s pos :: split_string (String.after s (pos + 1))
   | None -> [s]
 
+(* string_trim taken from OCaml 4.00 standard library (String.trim) *)
+let is_space = function
+  | ' ' | '\012' | '\n' | '\r' | '\t' -> true
+  | _ -> false
+
+let string_trim s =
+  let len = String.length s in
+  let i = ref 0 in
+  while !i < len && is_space s.[!i] do incr i done;
+  let j = ref (len - 1) in
+  while !j >= !i && is_space s.[!j] do decr j done;
+  if !i = 0 && !j = len - 1 then s
+  else if !j >= !i then String.sub s !i (!j - !i + 1)
+  else ""
+
 let () =
   let additional_rules = function
     | After_rules ->
@@ -567,7 +582,7 @@ let () =
         let rec split_string s =
           match try Some (String.index s ' ') with Not_found -> None with
           | Some pos ->
-              let before = String.trim (String.before s pos) in
+              let before = string_trim (String.before s pos) in
               let after = String.after s (pos + 1) in
               if before = "" then split_string after
               else before :: split_string after
diff --git a/setup.ml b/setup.ml
index 788594b..0de5594 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 7a42b31ae5df4578d21e08f1b8d2b9a6) *)
+(* DO NOT EDIT (digest: 9b6d7bd3aef3e48cf56e2b3538263a82) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5840,7 +5840,7 @@ let setup_t =
           ocaml_version = Some (OASISVersion.VGreaterEqual "3.12");
           findlib_version = Some (OASISVersion.VGreaterEqual "1.3.2");
           name = "sqlite3-ocaml";
-          version = "2.0.0";
+          version = "2.0.1";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -6309,7 +6309,7 @@ let setup_t =
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest = Some "\149¿\026Ý°\132\154§åÒSG\000\007\"\138";
+     oasis_digest = Some "Úû×\157\005¨Í\bEÕáéC/\153p";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;

-- 
ocaml-sqlite3 packaging