[Pkg-ocaml-maint-commits] [tyxml] 05/08: 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 tyxml.

commit 40de3c0f36d09d29ebd665c013796e06a5fbff2e
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon May 26 21:11:09 2014 +0200

    Update packaging
---
 debian/clean                         |  2 +-
 debian/libtyxml-ocaml-dev.install.in |  6 +++--
 debian/libtyxml-ocaml-doc.doc-base   |  4 ++--
 debian/libtyxml-ocaml-doc.docs       |  1 -
 debian/libtyxml-ocaml-doc.install    |  1 +
 debian/libtyxml-ocaml-doc.links      |  1 +
 debian/libtyxml-ocaml.install.in     | 10 +++++----
 debian/rules                         | 43 +++++++++++++++++-------------------
 8 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/debian/clean b/debian/clean
index ea21f4e..7ec1fdc 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1 @@
-META
+setup.exe
diff --git a/debian/libtyxml-ocaml-dev.install.in b/debian/libtyxml-ocaml-dev.install.in
index 94fff00..f915537 100644
--- a/debian/libtyxml-ocaml-dev.install.in
+++ b/debian/libtyxml-ocaml-dev.install.in
@@ -1,7 +1,9 @@
+ at OCamlStdlibDir@/tyxml/*.ml
 @OCamlStdlibDir@/tyxml/*.mli
 @OCamlStdlibDir@/tyxml/*.cmi
- at OCamlStdlibDir@/tyxml/pa_*.cmo
-OPT: @OCamlStdlibDir@/tyxml/*.o
+ at OCamlStdlibDir@/tyxml/pa_*.cma
 OPT: @OCamlStdlibDir@/tyxml/*.cmx
 OPT: @OCamlStdlibDir@/tyxml/*.a
 OPT: @OCamlStdlibDir@/tyxml/*.cmxa
+OPT: @OCamlStdlibDir@/tyxml/pa_*.cmxs
+syntax/pa_tyxml.mli @OCamlStdlibDir@/tyxml
diff --git a/debian/libtyxml-ocaml-doc.doc-base b/debian/libtyxml-ocaml-doc.doc-base
index 2fa2984..5336159 100644
--- a/debian/libtyxml-ocaml-doc.doc-base
+++ b/debian/libtyxml-ocaml-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: Documentation of TyXML (generated by ocamldoc)
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libtyxml-ocaml-doc/api-html/index.html
-Files: /usr/share/doc/libtyxml-ocaml-doc/api-html/*
+Index: /usr/share/doc/libtyxml-ocaml-dev/api/index.html
+Files: /usr/share/doc/libtyxml-ocaml-dev/api/*
diff --git a/debian/libtyxml-ocaml-doc.docs b/debian/libtyxml-ocaml-doc.docs
deleted file mode 100644
index 4dbbc8d..0000000
--- a/debian/libtyxml-ocaml-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/api-html
diff --git a/debian/libtyxml-ocaml-doc.install b/debian/libtyxml-ocaml-doc.install
new file mode 100644
index 0000000..cf455bc
--- /dev/null
+++ b/debian/libtyxml-ocaml-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libtyxml-ocaml-dev/api
diff --git a/debian/libtyxml-ocaml-doc.links b/debian/libtyxml-ocaml-doc.links
new file mode 100644
index 0000000..90788c8
--- /dev/null
+++ b/debian/libtyxml-ocaml-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libtyxml-ocaml-dev/api usr/share/doc/libtyxml-ocaml-doc/api
diff --git a/debian/libtyxml-ocaml.install.in b/debian/libtyxml-ocaml.install.in
index c69bc59..f4b3028 100644
--- a/debian/libtyxml-ocaml.install.in
+++ b/debian/libtyxml-ocaml.install.in
@@ -1,5 +1,7 @@
 @OCamlStdlibDir@/tyxml/META
- at OCamlStdlibDir@/tyxml/*.cma
- at OCamlStdlibDir@/tyxml/xmllexer.cmo
- at OCamlStdlibDir@/tyxml/simplexmlparser.cmo
-DYN: @OCamlStdlibDir@/tyxml/*.cmxs
+ at OCamlStdlibDir@/tyxml/tyxml.cma
+ at OCamlStdlibDir@/tyxml/tyxml_f.cma
+ at OCamlStdlibDir@/tyxml/tymlx_p.cma
+DYN: @OCamlStdlibDir@/tyxml/tyxml.cmxs
+DYN: @OCamlStdlibDir@/tyxml/tyxml_f.cmxs
+DYN: @OCamlStdlibDir@/tyxml/tymlx_p.cmxs
diff --git a/debian/rules b/debian/rules
index 9f7d82e..f706589 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,35 +7,32 @@ 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:
+	make setup.exe
+	./setup.exe -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libtyxml-ocaml-dev
+
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	$(MAKE) $(MAKE_EXTRA_VARS) $(BUILD_TARGET)
+	./setup.exe -build
+	./setup.exe -doc
+
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+	./setup.exe -test
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	mkdir -p $(OCAMLFIND_DESTDIR)
-	$(MAKE) $(MAKE_EXTRA_VARS) $(INSTALL_TARGET)
-ifneq ($(findstring libtyxml-ocaml-doc,$(shell dh_listpackages)),)
-	$(MAKE) $(MAKE_EXTRA_VARS) doc
-endif
+	mkdir -p '$(OCAMLFIND_DESTDIR)'
+	./setup.exe -install
 
-.PHONY: override_dh_install
-override_dh_install:
-	dh_install --fail-missing
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	if [ -x setup.exe ]; then ./setup.exe -distclean; fi

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