[Pkg-ocaml-maint-commits] [SCM] ocamlsdl packaging branch, master, updated. debian/0.8.0-4-16-g6d323a6

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 6a3ea66d637083a2e058a00efbd9cec535526a12
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jun 18 11:55:18 2012 +0200

    Fix a couple typos/small bugs in Sdlmixer

diff --git a/debian/patches/0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch b/debian/patches/0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch
new file mode 100644
index 0000000..5d141d3
--- /dev/null
+++ b/debian/patches/0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch
@@ -0,0 +1,62 @@
+From: Florent Monnier <monnier.florent at gmail.com>
+Date: Thu, 14 Jun 2012 16:34:54 +0000
+Subject: Fix a couple typos/small bugs in Sdlmixer
+
+---
+ src/sdlmixer.ml  |    6 +++---
+ src/sdlmixer.mli |    7 ++++---
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/sdlmixer.ml b/src/sdlmixer.ml
+index 2427444..b573c9c 100644
+--- a/src/sdlmixer.ml
++++ b/src/sdlmixer.ml
+@@ -94,7 +94,7 @@ external allocate_channels : int -> int = "sdlmixer_allocate_channels"
+ let num_channels () = allocate_channels ~-1
+ external reserve_channels : int -> int = "sdlmixer_reserve_channels"
+ external group_channel : channel -> group -> unit = "sdlmixer_group_channel"
+-external group_channels : from_c:channel -> to_c:channel -> group -> unit = "sdlmixer_group_channel"
++external group_channels : from_c:channel -> to_c:channel -> group -> unit = "sdlmixer_group_channels"
+ external group_available : group -> channel = "sdlmixer_group_available"
+ external group_count : group -> int = "sdlmixer_group_count"
+ external group_oldest : group -> channel = "sdlmixer_group_oldest"
+@@ -113,11 +113,11 @@ let play_sound chunk = ignore (play_channel chunk)
+ 
+ external volume_channel : channel -> float = "sdlmixer_volume_channel"
+ external volume_chunk   : chunk -> float = "sdlmixer_volume_chunk"
+-external volume_music   : music -> float = "sdlmixer_volume_music"
++external volume_music   : unit -> float = "sdlmixer_volume_music"
+ 
+ external setvolume_channel : channel -> float -> unit = "sdlmixer_setvolume_channel"
+ external setvolume_chunk : chunk -> float -> unit = "sdlmixer_setvolume_chunk"
+-external setvolume_music : music -> float -> unit = "sdlmixer_setvolume_music"
++external setvolume_music : float -> unit = "sdlmixer_setvolume_music"
+ 
+ (* Stopping playing *)
+ 
+diff --git a/src/sdlmixer.mli b/src/sdlmixer.mli
+index e235971..4a20d8e 100644
+--- a/src/sdlmixer.mli
++++ b/src/sdlmixer.mli
+@@ -191,7 +191,7 @@ external group_channel : channel -> group -> unit = "sdlmixer_group_channel"
+    If group is [default_group], the tag is removed.
+ *)
+ 
+-external group_channels : from_c:channel -> to_c:channel -> group -> unit = "sdlmixer_group_channel"
++external group_channels : from_c:channel -> to_c:channel -> group -> unit = "sdlmixer_group_channels"
+ (** Same as above but for a range of channels. *)
+ 
+ external group_count : group -> int = "sdlmixer_group_count"
+@@ -252,8 +252,9 @@ external fadein_music : ?loops:int -> music -> float -> unit
+    fade in music over [ms] seconds, same semantics as the [play_music]
+    function *)
+ 
+-external volume_music   : music -> float = "sdlmixer_volume_music"
+-external setvolume_music : music -> float -> unit = "sdlmixer_setvolume_music"
++external volume_music   : unit -> float = "sdlmixer_volume_music"
++
++external setvolume_music : float -> unit = "sdlmixer_setvolume_music"
+ 
+ external pause_music   : unit -> unit = "sdlmixer_pause_music"
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index c1267ee..08dc807 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fix-build-on-bytecode-architectures.patch
 0002-Fix-typo-in-sdlevent_stub.patch
+0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch

-- 
ocamlsdl packaging