[Pkg-ocaml-maint-commits] [eliom] 07/09: 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 eliom.

commit 384bf0795711d8ece0855ab0a08677fb919094d3
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 28 13:31:14 2015 +0100

    Update packaging
---
 debian/control                    |  5 +++--
 debian/eliom.install              |  2 +-
 debian/libeliom-ocaml-doc.install |  5 +----
 debian/rules                      | 24 ++----------------------
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index bd7f58d..09dcb42 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,11 @@ Build-Depends:
   libjs-of-ocaml-dev (>= 2.2),
   libcalendar-ocaml-dev (>= 2.03.1),
   liblwt-ssl-ocaml-dev,
-  libreact-ocaml-dev (>= 0.9.3),
-  js-of-ocaml (>= 2.2),
+  libreactivedata-ocaml-dev,
+  js-of-ocaml (>= 2.5-2~),
   libtyxml-ocaml-dev (>= 3),
   liboptcomp-camlp4-dev,
+  opam,
   ocaml-findlib,
   ocaml-nox
 Standards-Version: 3.9.5
diff --git a/debian/eliom.install b/debian/eliom.install
index 1b6716c..8f079d8 100644
--- a/debian/eliom.install
+++ b/debian/eliom.install
@@ -1,3 +1,3 @@
 usr/bin
 usr/share/man/man1
-usr/share/eliom
+usr/etc/eliom etc
diff --git a/debian/libeliom-ocaml-doc.install b/debian/libeliom-ocaml-doc.install
index 285cac2..cfd17ca 100644
--- a/debian/libeliom-ocaml-doc.install
+++ b/debian/libeliom-ocaml-doc.install
@@ -1,5 +1,2 @@
-usr/share/doc/eliom/client
-usr/share/doc/eliom/server
-usr/share/doc/eliom/ocamlbuild
+usr/share/doc
 doc/manual-wiki usr/share/doc/eliom
-usr/share/man/man3
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 2ac1163..a265e8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,42 +17,22 @@ export OCAMLFIND_LDCONF=ignore
 # force dynlink...
 ifeq ($(OCAML_NATDYNLINK),yes)
   BUILD_TARGET := all
-  INSTALL_TARGET := install
 else
   BUILD_TARGET := byte
-  INSTALL_TARGET := install.byte
 endif
 
 %:
 	dh $@ --with ocaml
 
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure:
-	chmod +x configure
-#we must recreate those directories from the tar because git remove
-#the empty directories.
-	mkdir -p local/etc
-	mkdir -p src/client/sigs
-	./configure \
-	    --prefix /usr \
-	    --libdir $(OCAML_STDLIB_DIR) \
-	    --temproot $(DESTDIR) \
-	    --mandir /usr/share/man/ \
-
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
 	$(MAKE) $(BUILD_TARGET)
-	$(MAKE) doc
+	$(MAKE) man doc
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	mkdir -p $(OCAMLFIND_DESTDIR)
-	$(MAKE) $(INSTALL_TARGET) install.doc
+	opam-installer --prefix=debian/tmp/usr --libdir=$(subst /usr/,,$(OCAML_STDLIB_DIR)) --mandir=share/man --docdir=share/doc eliom.install
 
 .PHONY: override_dh_install
 override_dh_install:
 	dh_install --fail-missing
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	[ ! -f Makefile.config ] || $(MAKE) distclean

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