[Pkg-ocaml-maint-commits] r5313 - in /trunk/packages/ocaml-magic/trunk/debian: changelog control patches/ patches/fix_bytecode_build.patch patches/series rules

[toots at users.alioth.debian.org]

Author: toots
Date: Fri Mar  7 14:35:26 2008
New Revision: 5313

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5313
Log:
Forgot to commit latest release..

Added:
    trunk/packages/ocaml-magic/trunk/debian/patches/
    trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch
    trunk/packages/ocaml-magic/trunk/debian/patches/series
Modified:
    trunk/packages/ocaml-magic/trunk/debian/changelog
    trunk/packages/ocaml-magic/trunk/debian/control
    trunk/packages/ocaml-magic/trunk/debian/rules

Modified: trunk/packages/ocaml-magic/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/changelog?rev=5313&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-magic/trunk/debian/changelog Fri Mar  7 14:35:26 2008
@@ -1,3 +1,9 @@
+ocaml-magic (0.6-2) unstable; urgency=low
+
+  * Fixed compilation on archs with no native compiler. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Thu, 28 Feb 2008 15:35:27 +0100
+
 ocaml-magic (0.6-1) unstable; urgency=low
 
   * Initial release. (Closes: #463500)

Modified: trunk/packages/ocaml-magic/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/control?rev=5313&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/control (original)
+++ trunk/packages/ocaml-magic/trunk/debian/control Fri Mar  7 14:35:26 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Liquidsoap Debian Packaging <savonet-debian at lists.sourceforge.net>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
-Build-Depends: debhelper (>= 5.0.0), libmagic-dev, ocaml-nox (>= 3.10)
+Build-Depends: debhelper (>= 5.0.0), libmagic-dev, ocaml-nox (>= 3.10), quilt
 Standards-Version: 3.7.3
 Homepage: http://sourceforge.net/projects/ocaml-magic/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk

Added: trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch?rev=5313&op=file
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch (added)
+++ trunk/packages/ocaml-magic/trunk/debian/patches/fix_bytecode_build.patch Fri Mar  7 14:35:26 2008
@@ -1,0 +1,32 @@
+--- ocaml-magic-0.6.orig/Makefile	2008-02-28 15:28:13.000000000 +0100
++++ ocaml-magic-0.6/Makefile	2008-02-28 15:28:24.000000000 +0100
+@@ -37,9 +37,10 @@
+ doc: html
+ ex: $(DEMOS:.ml=.exe) $(DEMOS:.ml=.com)
+ 
+-$(ARCHIVE): magic_stub.o magic.ml magic.cmi
+-	$(OCAMLMKLIB) -o $(basename $@) -oc $(basename $@)_stub -failsafe \
+-	  -lmagic -L$(MAGIC_A) $(filter %.o, $^) $(filter %.ml, $^)
++$(ARCHIVE): magic_stub.o magic.ml magic.cmi magic.cmo
++	$(OCAMLMKLIB) -o $(basename $@)_stub -lmagic -L$(MAGIC_A) $(filter %.o, $^)
++	$(OCAMLC) -a -dllib dllmagic_stub.so -custom -cclib -lmagic_stub \
++	  -cclib -lmagic -o magic.cma magic.cmo
+ 
+ $(XARCHIVE): $(ARCHIVE)
+ 
+@@ -105,7 +106,7 @@
+ # Caml general dependencies
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx
+ %.o: %.c
+-	$(OCAMLC) -c -I $(OCAML_H) $<
++	$(OCAMLC) -c -I $(OCAML_H) -I $(MAGIC_H) $<
+ %.cmi: %.mli
+ 	$(OCAMLC) $(OCAMLFLAGS) -c $<
+ %.cmo: %.ml
+@@ -134,4 +135,4 @@
+ 	find . -not -name *.sh -type f -perm -u=x -exec rm -f {} \;
+ 
+ dist-clean: clean
+-	rm .depend
+\ Pas de fin de ligne à la fin du fichier.
++	rm .depend

Added: trunk/packages/ocaml-magic/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/patches/series?rev=5313&op=file
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/patches/series (added)
+++ trunk/packages/ocaml-magic/trunk/debian/patches/series Fri Mar  7 14:35:26 2008
@@ -1,0 +1,1 @@
+fix_bytecode_build.patch

Modified: trunk/packages/ocaml-magic/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/rules?rev=5313&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/rules (original)
+++ trunk/packages/ocaml-magic/trunk/debian/rules Fri Mar  7 14:35:26 2008
@@ -4,6 +4,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
 
 OCAMLABI := $(shell ocamlc -version)
 OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
@@ -15,15 +16,20 @@
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 
-build: ocamlinit build-stamp
+build: patch ocamlinit build-stamp
 build-stamp: 
 	dh_testdir
-
-	$(MAKE) CFLAGS=$(CFLAGS)
+	if [ -x /usr/bin/ocamlopt ]; then\
+	  $(MAKE) CFLAGS=$(CFLAGS);\
+	else\
+	  $(MAKE) CFLAGS=$(CFLAGS) byte;\
+	fi
 
 	touch build-stamp
 
-clean:
+clean: clean-local unpatch
+
+clean-local:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp