The following commit has been merged in the master branch:
commit 37da775b29cb535b628416b933fe86d67d7dc218
Author: Stephane Glondu <st...@glondu.net>
Date:   Wed Jul 24 21:52:29 2013 +0200

    Refresh patches

diff --git a/debian/patches/0002-Fix-typo-in-sdlevent_stub.patch 
b/debian/patches/0002-Fix-typo-in-sdlevent_stub.patch
deleted file mode 100644
index f19c158..0000000
--- a/debian/patches/0002-Fix-typo-in-sdlevent_stub.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Florent Monnier <monnier.flor...@gmail.com>
-Date: Thu, 7 Jun 2012 23:06:56 +0200
-Subject: Fix typo in sdlevent_stub
-
-Forwarded: 
http://ocamlsdl.cvs.sourceforge.net/viewvc/ocamlsdl/OCamlSDL/src/sdlevent_stub.c?r1=1.24&r2=1.25
-
----
- src/sdlevent_stub.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sdlevent_stub.c b/src/sdlevent_stub.c
-index 2079ddc..71f98cc 100644
---- a/src/sdlevent_stub.c
-+++ b/src/sdlevent_stub.c
-@@ -177,7 +177,7 @@ static value value_of_SDLEvent(SDL_Event evt)
-     r = alloc_small(4, 0);
-     Field(r, 0) = Val_int(evt.jball.which);
-     Field(r, 1) = Val_int(evt.jball.ball);
--    Field(r, 3) = Val_int(evt.jball.xrel);
-+    Field(r, 2) = Val_int(evt.jball.xrel);
-     Field(r, 3) = Val_int(evt.jball.yrel);
-     v = alloc_small(1, 7);
-     Field(v, 0) = r;
--- 
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
deleted file mode 100644
index a7c76cf..0000000
--- a/debian/patches/0003-Fix-a-couple-typos-small-bugs-in-Sdlmixer.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Florent Monnier <monnier.flor...@gmail.com>
-Date: Thu, 14 Jun 2012 16:34:54 +0000
-Subject: Fix a couple typos/small bugs in Sdlmixer
-
-Forwarded: 
http://ocamlsdl.cvs.sourceforge.net/viewvc/ocamlsdl/OCamlSDL/src/sdlmixer.ml?r1=1.13&r2=1.14
-Forwarded: 
http://ocamlsdl.cvs.sourceforge.net/viewvc/ocamlsdl/OCamlSDL/src/sdlmixer.mli?r1=1.15&r2=1.16
-
----
- 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 08dc807..c6c94b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to