[Pkg-ocaml-maint-commits] [ocaml-deriving-ocsigen] 10/11: 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 ocaml-deriving-ocsigen.

commit f2128c3bc13d3562cee6c4dd68a241da41e137a2
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jun 14 14:59:58 2014 +0200

    Update packaging
---
 debian/control                                  |  1 +
 debian/libderiving-ocsigen-ocaml-dev.install.in |  4 +--
 debian/libderiving-ocsigen-ocaml-dev.ocamldoc   |  1 -
 debian/rules                                    | 43 ++++++++++++-------------
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index 2076fcb..3a18a12 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
   debhelper (>= 9),
   libtype-conv-camlp4-dev (>= 108),
   liboptcomp-camlp4-dev,
+  oasis (>= 0.4),
   camlp4-extra (>= 4.01)
 Standards-Version: 3.9.5
 Homepage: https://github.com/ocsigen/deriving
diff --git a/debian/libderiving-ocsigen-ocaml-dev.install.in b/debian/libderiving-ocsigen-ocaml-dev.install.in
index 7fe3eb5..ac8a850 100644
--- a/debian/libderiving-ocsigen-ocaml-dev.install.in
+++ b/debian/libderiving-ocsigen-ocaml-dev.install.in
@@ -1,7 +1,7 @@
 @OCamlStdlibDir@/deriving/*.cmi
 @OCamlStdlibDir@/deriving/*.mli
-DYN: @OCamlStdlibDir@/deriving/pa_deriving_tc.cmxs
-DYN: @OCamlStdlibDir@/deriving/pa_deriving.cmxs
+ at OCamlStdlibDir@/deriving/*.ml
+ at OCamlStdlibDir@/deriving/pa_*.*
 OPT: @OCamlStdlibDir@/deriving/*.cmxa
 OPT: @OCamlStdlibDir@/deriving/*.a
 OPT: @OCamlStdlibDir@/deriving/*.cmx
diff --git a/debian/libderiving-ocsigen-ocaml-dev.ocamldoc b/debian/libderiving-ocsigen-ocaml-dev.ocamldoc
deleted file mode 100644
index c01ade2..0000000
--- a/debian/libderiving-ocsigen-ocaml-dev.ocamldoc
+++ /dev/null
@@ -1 +0,0 @@
-# Nothing
diff --git a/debian/rules b/debian/rules
index d9879bf..da791dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,38 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 DESTDIR=$(CURDIR)/debian/tmp
 
 include /usr/share/ocaml/ocamlvars.mk
 
 export OCAMLFIND_DESTDIR := $(DESTDIR)/$(OCAML_STDLIB_DIR)
 
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-  BUILD_TARGET := byte opt
-  INSTALL_TARGET := install
-else
-  BUILD_TARGET := byte
-  INSTALL_TARGET := install-byte
-endif
-
-ifeq ($(OCAML_NATDYNLINK),yes)
-  MAKE_EXTRA_VARS :=
-else
-  MAKE_EXTRA_VARS := NATDYNLINK=NO
-endif
-
 %:
 	dh $@ --with ocaml
 
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing
+
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libderiving-ocsigen-ocaml-dev
+
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	$(MAKE) $(MAKE_EXTRA_VARS) $(BUILD_TARGET)
+	ocaml setup.ml -build
+	ocaml setup.ml -doc
+
+.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)
-	$(MAKE) $(MAKE_EXTRA_VARS) $(INSTALL_TARGET)
+	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:
+	ocaml setup.ml -distclean
+	rm -f setup*.exe

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