[Pkg-ocaml-maint-commits] [SCM] react packaging branch, master, updated. debian/0.9.2-1-5-gfa2c9bf

[Stephane Glondu]

The following commit has been merged in the master branch:
commit fa2c9bf6c0a35ea075f1ce551f67f3ee9304920d
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Apr 6 08:56:16 2012 +0200

    Adapt to new upstream build system

diff --git a/debian/libreact-ocaml-dev.install.in b/debian/libreact-ocaml-dev.install.in
index 3c3a363..83beda1 100644
--- a/debian/libreact-ocaml-dev.install.in
+++ b/debian/libreact-ocaml-dev.install.in
@@ -1,6 +1,7 @@
-_build/src/react.mli        @OCamlStdlibDir@/react
-_build/src/react.cmi        @OCamlStdlibDir@/react
-OPT: _build/src/react.cmx   @OCamlStdlibDir@/react
-OPT: _build/src/react.o     @OCamlStdlibDir@/react
-doc/*.html                  /usr/share/doc/libreact-ocaml-dev/html
-doc/*.css                   /usr/share/doc/libreact-ocaml-dev/html
+     @OCamlStdlibDir@/react/react.mli
+     @OCamlStdlibDir@/react/react.cmi
+OPT: @OCamlStdlibDir@/react/react.cmx
+OPT: @OCamlStdlibDir@/react/react.cmxa
+OPT: @OCamlStdlibDir@/react/react.a
+     doc/*.html      /usr/share/doc/libreact-ocaml-dev/html
+     doc/*.css       /usr/share/doc/libreact-ocaml-dev/html
diff --git a/debian/libreact-ocaml.install.in b/debian/libreact-ocaml.install.in
index 6746652..6fdeba2 100644
--- a/debian/libreact-ocaml.install.in
+++ b/debian/libreact-ocaml.install.in
@@ -1,3 +1,3 @@
-_build/src/react.cmo        @OCamlStdlibDir@/react
-OPT: _build/src/react.cmxs  @OCamlStdlibDir@/react
-src/META                    @OCamlStdlibDir@/react
+     @OCamlStdlibDir@/react/META
+     @OCamlStdlibDir@/react/react.cma
+DYN: _build/src/react.cmxs @OCamlStdlibDir@/react
diff --git a/debian/rules b/debian/rules
index 5d55f37..73282a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,43 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-include /usr/share/ocaml/ocamlvars.mk
 
-OCAMLBUILD := ocamlbuild -classic-display $(if $(OCAML_OPT_ARCH),,-byte-plugin)
+DESTDIR=$(CURDIR)/debian/tmp
+
+include /usr/share/ocaml/ocamlvars.mk
 
-TARGETS := react.cmo $(if $(OCAML_OPT_ARCH),react.cmx test.native,test.byte)
+OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
 
 %:
 	dh --with ocaml $@
 
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ocaml setup.ml -configure --enable-tests
+
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	$(OCAMLBUILD) $(TARGETS)
-ifeq ($(OCAML_OPT_ARCH),)
-	./test.byte
-else
-	./test.native
+	ocaml setup.ml -build
+ifeq ($(OCAML_NATDYNLINK),yes)
 	ocamlopt -shared -o _build/src/react.cmxs _build/src/react.cmx
 endif
 
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+	ocaml setup.ml -test
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	mkdir -p '$(OCAMLFIND_DESTDIR)'
+	ocaml setup.ml -install
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing
+
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
-	$(OCAMLBUILD) -clean
+	ocaml setup.ml -distclean
 
 .PHONY: override_dh_compress
 override_dh_compress:

-- 
react packaging