[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/1%4.0.1-3-1-gcec45a3

[Romain Beauxis]

The following commit has been merged in the master branch:
commit cec45a3d669f6d144ed87f2f4e6a7665b809df1a
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Oct 17 00:16:03 2011 +0200

    Patched source to replace Sort.list (deprecated) by List.sort.

diff --git a/debian/changelog b/debian/changelog
index 4dd1de8..519a5bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+camlimages (1:4.0.1-4) unstable; urgency=low
+
+  * Team upload.
+  * Patched sources to replace Sort.list (deprecated)
+    by List.sort. Sort.list was causing troubles when
+    dynamically loading camlimages.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 17 Oct 2011 00:04:16 +0200
+
 camlimages (1:4.0.1-3) unstable; urgency=low
 
   * Team upload
diff --git a/debian/patches/0002-remove-use-of-sort.patch b/debian/patches/0002-remove-use-of-sort.patch
new file mode 100644
index 0000000..dcc7dc2
--- /dev/null
+++ b/debian/patches/0002-remove-use-of-sort.patch
@@ -0,0 +1,13 @@
+Index: camlimages/src/bitmap.ml
+===================================================================
+--- camlimages.orig/src/bitmap.ml	2011-10-17 00:02:17.941672767 +0200
++++ camlimages/src/bitmap.ml	2011-10-17 00:04:03.732755736 +0200
+@@ -186,7 +186,7 @@
+ 
+   let swap_out_eldest words =
+     let sorted =
+-      Sort.list (fun b1 b2 -> b1.last_used < b2.last_used) !swappable_blocks in
++      List.sort (fun b1 b2 -> compare b1.last_used b2.last_used) !swappable_blocks in
+     let rec swapper sorted i =
+      match sorted with
+       | [] -> ()
diff --git a/debian/patches/series b/debian/patches/series
index f5e0dd5..c862d85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-missing-cclib-in-ocamlc-a.patch
+0002-remove-use-of-sort.patch

-- 
camlimages packaging