[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.2.2-1-4-gff6c03d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit ff6c03d030335f2909ed38eda5225438a91f8df7
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 11 22:37:11 2011 +0200

    Fix build with camomile 0.8.3 (Closes: #636024)

diff --git a/debian/control b/debian/control
index f6f421c..470bb3f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  ocaml-nox (>= 3.11.1-3~),
  camlp4, camlp4-extra,
  ocaml-findlib (>= 1.2.5),
- libcamomile-ocaml-dev (>= 0.7),
+ libcamomile-ocaml-dev (>= 0.8),
  libounit-ocaml-dev,
  dh-ocaml (>= 0.9.5~)
 Standards-Version: 3.9.0
diff --git a/debian/patches/0004-Fix-build-with-camomile-0.8.3.patch b/debian/patches/0004-Fix-build-with-camomile-0.8.3.patch
new file mode 100644
index 0000000..dcf0014
--- /dev/null
+++ b/debian/patches/0004-Fix-build-with-camomile-0.8.3.patch
@@ -0,0 +1,30 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 11 Aug 2011 22:35:06 +0200
+Subject: Fix build with camomile 0.8.3
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636024
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/batCamomile.ml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/batCamomile.ml b/src/batCamomile.ml
+index 8b70e65..06c55ce 100644
+--- a/src/batCamomile.ml
++++ b/src/batCamomile.ml
+@@ -8,7 +8,7 @@ let try_env suff default =
+   try Filename.concat (Sys.getenv camomile_base) suff
+   with Not_found -> default
+ 
+-module CDC = CamomileLibrary.CamomileDefaultConfig
++module CDC = CamomileLibraryDefault.Config
+ 
+ module CamConfig = struct
+   let datadir = try_env "database" CDC.datadir
+@@ -17,4 +17,4 @@ module CamConfig = struct
+   let unimapdir = try_env "mappings" CDC.unimapdir
+ end
+ 
+-include CamomileLibrary.Main.Make(CamConfig)
++include CamomileLibrary.Make(CamConfig)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 6fda81b..64ea983 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Add-Set-an-installation-prefix-path.patch
 0002-Fix-build-with-OCaml-3.12.0.patch
 0003-Do-not-enforce-sanity-check-rules.patch
+0004-Fix-build-with-camomile-0.8.3.patch

-- 
ocaml-batteries packaging