[Pkg-ocaml-maint-commits] [SCM] ocamlsdl packaging branch, master, updated. debian/0.8.0-1-1-g57993bf

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 57993bff3e9e61f8d2bb43fffe47591f6f972c28
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jun 21 14:00:41 2010 -0700

    Add 0001-Fix-build-on-bytecode-architectures.patch (Closes: #586619)

diff --git a/debian/changelog b/debian/changelog
index 1e8a0a0..f6c0be6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocamlsdl (0.8.0-2) unstable; urgency=low
+
+  * Add 0001-Fix-build-on-bytecode-architectures.patch (Closes: #586619)
+
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 21 Jun 2010 14:00:38 -0700
+
 ocamlsdl (0.8.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..6c7ed3b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,3 @@
 [DEFAULT]
 pristine-tar = True
+cleaner = debuild clean && dh_quilt_unpatch && dh_clean
diff --git a/debian/patches/0001-Fix-build-on-bytecode-architectures.patch b/debian/patches/0001-Fix-build-on-bytecode-architectures.patch
new file mode 100644
index 0000000..0438891
--- /dev/null
+++ b/debian/patches/0001-Fix-build-on-bytecode-architectures.patch
@@ -0,0 +1,33 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Mon, 21 Jun 2010 13:54:48 -0700
+Subject: [PATCH] Fix build on bytecode architectures
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586619
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 3f53e3d..e1f77e1 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -17,7 +17,7 @@ gfx_MODULES    = sdlgfx
+ 
+ TARGETS  = sdl.cma $(patsubst %,sdl%.cma,$(PARTS))
+ TARGETS += libsdlstub.$(A) $(patsubst %,libsdl%stub.$(A),$(PARTS))
+-ifdef OCAMLOPT
++ifneq ($(OCAMLOPT),no)
+ TARGETS += sdl.cmxa $(patsubst %,sdl%.cmxa,$(PARTS))
+ endif
+ 
+@@ -87,7 +87,7 @@ ifdef OCAMLFIND
+ install-findlib :
+ 	$(OCAMLFIND) install sdl ../META \
+           *.cma lib*.$(A) *.cmi *.mli \
+-          $(if $(OCAMLOPT),*.cmxa sdl*.$(A) *.cmx) \
++          $(if $(filter-out no,$(OCAMLOPT)),*.cmxa sdl*.$(A) *.cmx) \
+           $(if $(OCAMLMKLIB),dll*.so)
+ ifeq ($(PLATFORM),Apple)
+ 	$(RANLIB) $$($(OCAMLFIND) printconf destdir)/sdl/*.$(A)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c6c94b1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-build-on-bytecode-architectures.patch

-- 
ocamlsdl packaging