[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, 2.27.57/master, updated. debian/2.27.57-4-8-gd5b2d3c

[Stephane Glondu]

The following commit has been merged in the 2.27.57/master branch:
commit d5b2d3c89aaa33ac51dd7e901aca681005c8b82f
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 15 13:59:51 2010 -0700

    Add debbug585454_mymap.dpatch (Closes: #585454)

diff --git a/debian/changelog b/debian/changelog
index 36fb0fe..1374aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+unison2.27.57 (2.27.57-3) UNRELEASED; urgency=low
+
+  * Add debbug585454_mymap.dpatch (Closes: #585454)
+
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 15 Jun 2010 23:12:41 +0200
+
 unison2.27.57 (2.27.57-2) unstable; urgency=low
 
   * Synchronize with unison package
diff --git a/debian/patches/00list b/debian/patches/00list
index 34128ed..e2bab26 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,3 +2,4 @@ debbug129478_strings_typo_ignore_regexp
 debbug137960_strings_obsolete_ssh_info
 debbug466173_strings_typo_follw
 debbug497729_silent
+debbug585454_mymap
diff --git a/debian/patches/debbug585454_mymap.dpatch b/debian/patches/debbug585454_mymap.dpatch
new file mode 100755
index 0000000..8cc7222
--- /dev/null
+++ b/debian/patches/debbug585454_mymap.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debbug585454_mymap.dpatch by Stéphane Glondu <glondu at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix build with OCaml 3.12, where Map has been extended
+## DP: (Closes: #585454)
+
+ at DPATCH@
+diff --git a/update.mli b/update.mli
+index dc1e018..c99c704 100644
+--- a/update.mli
++++ b/update.mli
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
+ 
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+ 
+ type archive =
+     ArchiveDir of Props.t * archive NameMap.t

-- 
unison packaging