[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 188445e92b4b3fc46112b6c775dfe20b019eec97
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jun 18 11:51:34 2012 +0200

    Remove sdlvideo patch
    
    Following http://lists.debian.org/debian-ocaml-maint/2012/06/msg00152.html

diff --git a/debian/patches/0002-Fix-runtime-error-due-to-missing-sdlvideo.patch b/debian/patches/0002-Fix-runtime-error-due-to-missing-sdlvideo.patch
deleted file mode 100644
index 14581fd..0000000
--- a/debian/patches/0002-Fix-runtime-error-due-to-missing-sdlvideo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 5 Jun 2012 11:54:47 +0200
-Subject: Fix runtime error due to missing sdlvideo
-
-Bug-Mageia: https://bugs.mageia.org/show_bug.cgi?id=4460
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667447
----
- src/Makefile |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index e1f77e1..a60d7f4 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -14,6 +14,8 @@ loader_MODULES = sdlloader
- mixer_MODULES  = sdlmixer
- ttf_MODULES    = sdlttf
- gfx_MODULES    = sdlgfx
-+video_MODULES  = sdlvideo
-+gfx_C_SRC      = common.c
- 
- TARGETS  = sdl.cma $(patsubst %,sdl%.cma,$(PARTS))
- TARGETS += libsdlstub.$(A) $(patsubst %,libsdl%stub.$(A),$(PARTS))
-@@ -55,7 +57,7 @@ sdlgfx.cma : $(call ML_OBJS,gfx)
- 	$(call MKCMA,sdlgfx,sdlgfxstub,$^,$(call SYSLIB,SDL_gfx))
- sdlgfx.cmxa : $(call ML_OPT_OBJS,gfx)
- 	$(call MKCMXA,sdlgfx,sdlgfxstub,$^,$(call SYSLIB,SDL_gfx))
--libsdlgfxstub.$(A) dllsdlgfxstub.so : $(call STUB_OBJS,gfx)
-+libsdlgfxstub.$(A) dllsdlgfxstub.so : $(call STUB_OBJS,gfx) $(call STUB_OBJS,video)
- 	$(call MKCLIB,sdlgfx,sdlgfxstub,$^,$(call SYSLIB,SDL_gfx))
- 
- 
--- 
diff --git a/debian/patches/0003-Fix-typo-in-sdlevent_stub.patch b/debian/patches/0002-Fix-typo-in-sdlevent_stub.patch
similarity index 100%
rename from debian/patches/0003-Fix-typo-in-sdlevent_stub.patch
rename to debian/patches/0002-Fix-typo-in-sdlevent_stub.patch
diff --git a/debian/patches/series b/debian/patches/series
index ba512eb..c1267ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Fix-build-on-bytecode-architectures.patch
-0002-Fix-runtime-error-due-to-missing-sdlvideo.patch
-0003-Fix-typo-in-sdlevent_stub.patch
+0002-Fix-typo-in-sdlevent_stub.patch

-- 
ocamlsdl packaging