[Pkg-ocaml-maint-commits] [SCM] ocaml-text packaging branch, master, updated. debian/0.3-1-7-g60d5ea7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit f37971c45a5eeb493c0c58806ccc1c7d4e42b222
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Dec 29 23:29:34 2010 +0100

    Update packaging
    
    Main changes:
     - upstream build system switched to oasis
     - documentation moved
     - new text-bigarray sub-library
    
    Shortcomings being worked around here to avoid regression:
     - *.cmx files are not installed
     - *.cmxs are not built

diff --git a/debian/libtext-ocaml-dev.dirs.in b/debian/libtext-ocaml-dev.dirs.in
deleted file mode 100644
index c716d43..0000000
--- a/debian/libtext-ocaml-dev.dirs.in
+++ /dev/null
@@ -1,2 +0,0 @@
- at OCamlStdlibDir@/text
-/usr/share/doc/libtext-ocaml-dev/html
diff --git a/debian/libtext-ocaml-dev.doc-base b/debian/libtext-ocaml-dev.doc-base
index a92cbff..83b4b1e 100644
--- a/debian/libtext-ocaml-dev.doc-base
+++ b/debian/libtext-ocaml-dev.doc-base
@@ -5,5 +5,5 @@ Abstract: OCaml-Text ocamldoc-generated API documentation
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libtext-ocaml-dev/html/index.html
-Files: /usr/share/doc/libtext-ocaml-dev/html/*
+Index: /usr/share/doc/libtext-ocaml-dev/api/index.html
+Files: /usr/share/doc/libtext-ocaml-dev/api/*
diff --git a/debian/libtext-ocaml-dev.install.in b/debian/libtext-ocaml-dev.install.in
index ee6e899..19ff5cb 100644
--- a/debian/libtext-ocaml-dev.install.in
+++ b/debian/libtext-ocaml-dev.install.in
@@ -1,8 +1,8 @@
- at OCamlStdlibDir@/text/pa_*.cma
+/usr/share/doc/libtext-ocaml-dev
+ at OCamlStdlibDir@/text/text-pcre-syntax.cma
 @OCamlStdlibDir@/text/*.mli
 @OCamlStdlibDir@/text/*.cmi
 @OCamlStdlibDir@/text/*.a
-OPT: @OCamlStdlibDir@/text/*.cmx
 OPT: @OCamlStdlibDir@/text/*.cmxa
-_build/text.docdir/*.html /usr/share/doc/libtext-ocaml-dev/html
-_build/text.docdir/*.css /usr/share/doc/libtext-ocaml-dev/html
+OPT: _build/src/*.cmx                        @OCamlStdlibDir@/text
+DYN: _build/syntax/text-pcre-syntax.cmxs     @OCamlStdlibDir@/text
diff --git a/debian/libtext-ocaml.dirs.in b/debian/libtext-ocaml.dirs.in
deleted file mode 100644
index 42b3b86..0000000
--- a/debian/libtext-ocaml.dirs.in
+++ /dev/null
@@ -1,2 +0,0 @@
- at OCamlDllDir@
- at OCamlStdlibDir@/text
diff --git a/debian/libtext-ocaml.install.in b/debian/libtext-ocaml.install.in
index a21c631..c386ef4 100644
--- a/debian/libtext-ocaml.install.in
+++ b/debian/libtext-ocaml.install.in
@@ -1,6 +1,8 @@
- at OCamlDllDir@/*.so
 @OCamlStdlibDir@/text/META
 @OCamlStdlibDir@/text/text.cma
- at OCamlStdlibDir@/text/text_pcre.cma
-OPT: @OCamlStdlibDir@/text/text.cmxs
-OPT: @OCamlStdlibDir@/text/text_pcre.cmxs
+ at OCamlStdlibDir@/text/text-pcre.cma
+ at OCamlStdlibDir@/text/text-bigarray.cma
+ at OCamlStdlibDir@/text/*.so             @OCamlDllDir@
+DYN: _build/src/text.cmxs              @OCamlStdlibDir@/text
+DYN: _build/src/text-pcre.cmxs         @OCamlStdlibDir@/text
+DYN: _build/src/text-bigarray.cmxs     @OCamlStdlibDir@/text
diff --git a/debian/rules b/debian/rules
index 5f72314..1a9f306 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,42 @@
 # -*- makefile -*-
 include /usr/share/ocaml/ocamlvars.mk
 
-export OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+DESTDIR=$(CURDIR)/debian/tmp
+export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_LDCONF=ignore
+
+# Needed for running tests on bytecode architectures
+export CAML_LD_LIBRARY_PATH=$(CURDIR)/_build/src
 
 %:
 	dh --with ocaml $@
 
-.PHONY: override_dh_installchangelogs
-override_dh_installchangelogs:
-	dh_installchangelogs CHANGES.darcs
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --enable-pcre --docdir /usr/share/doc/libtext-ocaml-dev
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	ocaml setup.ml -build
+ifeq ($(OCAML_NATDYNLINK),yes)
+	cd _build && for u in text text-pcre text-bigarray; do ocamlopt -shared -I src -o src/$$u.cmxs src/$$u.cmxa; done
+	cd _build && for u in text-pcre-syntax; do ocamlopt -shared -I syntax -o syntax/$$u.cmxs syntax/$$u.cmxa; done
+endif
+	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:
-	install -d $(OCAMLFIND_DESTDIR)
-	install -d $(CURDIR)/debian/tmp/$(OCAML_DLL_DIR)
-	$(MAKE) 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:
+	ocaml setup.ml -distclean

-- 
ocaml-text packaging