[Pkg-ocaml-maint-commits] [react] 07/07: Update packaging

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository react.

commit e20943b5c8baf9c72d9a6ee5aa4c2e51a6811e3d
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 28 15:22:23 2015 +0100

    Update packaging
---
 debian/control                       |  1 +
 debian/libreact-ocaml-dev.docs       |  1 -
 debian/libreact-ocaml-dev.examples   |  1 -
 debian/libreact-ocaml-dev.install.in |  3 +++
 debian/rules                         | 32 +++++++++++++++-----------------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index 920a00d..e0ea1e6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends:
  debhelper (>= 7.0.50~),
  dh-ocaml (>= 0.9),
  ocaml-findlib (>= 1.4),
+ opam,
  ocaml-nox (>= 4)
 Standards-Version: 3.9.4
 Section: ocaml
diff --git a/debian/libreact-ocaml-dev.docs b/debian/libreact-ocaml-dev.docs
deleted file mode 100644
index e845566..0000000
--- a/debian/libreact-ocaml-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/libreact-ocaml-dev.examples b/debian/libreact-ocaml-dev.examples
deleted file mode 100644
index 8c205e6..0000000
--- a/debian/libreact-ocaml-dev.examples
+++ /dev/null
@@ -1 +0,0 @@
-test/*.ml
diff --git a/debian/libreact-ocaml-dev.install.in b/debian/libreact-ocaml-dev.install.in
index 83beda1..8c2fb5a 100644
--- a/debian/libreact-ocaml-dev.install.in
+++ b/debian/libreact-ocaml-dev.install.in
@@ -1,7 +1,10 @@
      @OCamlStdlibDir@/react/react.mli
      @OCamlStdlibDir@/react/react.cmi
+     @OCamlStdlibDir@/react/react.cmti
 OPT: @OCamlStdlibDir@/react/react.cmx
 OPT: @OCamlStdlibDir@/react/react.cmxa
 OPT: @OCamlStdlibDir@/react/react.a
+     @OCamlStdlibDir@/react/react_top.*
      doc/*.html      /usr/share/doc/libreact-ocaml-dev/html
      doc/*.css       /usr/share/doc/libreact-ocaml-dev/html
+     usr/share/doc/react/*  /usr/share/doc/libreact-ocaml-dev
diff --git a/debian/rules b/debian/rules
index 6effe8a..3d82c83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,37 +5,35 @@ DESTDIR=$(CURDIR)/debian/tmp
 
 include /usr/share/ocaml/ocamlvars.mk
 
-OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
-export OCAMLFIND_DESTDIR
+BUILD_ARGS :=
+
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+  BUILD_ARGS += native=true
+else
+  BUILD_ARGS += native=false
+endif
+
+ifeq ($(OCAML_NATDYNLINK),yes)
+  BUILD_ARGS += native-dynlink=true
+else
+  BUILD_ARGS += native-dynlink=false
+endif
 
 %:
 	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:
-	ocaml setup.ml -build
-
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-	ocaml setup.ml -test
+	ocaml pkg/build.ml $(BUILD_ARGS)
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	ocaml setup.ml -install
+	opam-installer --prefix=debian/tmp --libdir=.$(OCAML_STDLIB_DIR) --docdir=usr/share/doc react.install
 
 .PHONY: override_dh_install
 override_dh_install:
 	dh_install --fail-missing
 
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	ocaml setup.ml -distclean
-
 .PHONY: override_dh_compress
 override_dh_compress:
 	dh_compress -X.ml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/react.git