[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.2.2-2-8-gc520b27

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit da624dff69c0ca8609e2b5e7019da93294b50ea0
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Nov 4 09:29:15 2011 +0100

    Remove 0004-Fix-build-with-camomile-0.8.3.patch, fixed upstream

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
deleted file mode 100644
index dcf0014..0000000
--- a/debian/patches/0004-Fix-build-with-camomile-0.8.3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 cd3636d..36d2e61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0003-Do-not-enforce-sanity-check-rules.patch
-0004-Fix-build-with-camomile-0.8.3.patch

-- 
ocaml-batteries packaging