[Pkg-ocaml-maint-commits] [ocaml-sqlite3] 04/08: Adapt packaging to new build system

[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-sqlite3.

commit 36e67cafae7160d8fbe4b659f0de3afca0b5044f
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed May 8 15:34:09 2013 +0200

    Adapt packaging to new build system
---
 debian/libsqlite3-ocaml-dev.doc-base   |    4 ++--
 debian/libsqlite3-ocaml-dev.docs       |    1 -
 debian/libsqlite3-ocaml-dev.install.in |    1 +
 debian/libsqlite3-ocaml.install.in     |    2 +-
 debian/rules                           |   36 ++++++++++++++++++++------------
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/debian/libsqlite3-ocaml-dev.doc-base b/debian/libsqlite3-ocaml-dev.doc-base
index 033e758..fdc5796 100644
--- a/debian/libsqlite3-ocaml-dev.doc-base
+++ b/debian/libsqlite3-ocaml-dev.doc-base
@@ -5,5 +5,5 @@ Abstract: Ocamldoc-generated documentation for OCaml sqlite3 bindings
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libsqlite3-ocaml-dev/doc/index.html
-Files: /usr/share/doc/libsqlite3-ocaml-dev/doc/*.html
+Index: /usr/share/doc/libsqlite3-ocaml-dev/api/index.html
+Files: /usr/share/doc/libsqlite3-ocaml-dev/api/*.html
diff --git a/debian/libsqlite3-ocaml-dev.docs b/debian/libsqlite3-ocaml-dev.docs
deleted file mode 100644
index 8e695ec..0000000
--- a/debian/libsqlite3-ocaml-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc
diff --git a/debian/libsqlite3-ocaml-dev.install.in b/debian/libsqlite3-ocaml-dev.install.in
index a8e9af7..6a0012d 100644
--- a/debian/libsqlite3-ocaml-dev.install.in
+++ b/debian/libsqlite3-ocaml-dev.install.in
@@ -3,3 +3,4 @@
 @OCamlStdlibDir@/sqlite3/*.a
 OPT: @OCamlStdlibDir@/sqlite3/*.cmx
 OPT: @OCamlStdlibDir@/sqlite3/*.cmxa
+usr/share/doc/sqlite3-ocaml/api usr/share/doc/libsqlite3-ocaml-dev/
diff --git a/debian/libsqlite3-ocaml.install.in b/debian/libsqlite3-ocaml.install.in
index fcd2f39..182cea1 100644
--- a/debian/libsqlite3-ocaml.install.in
+++ b/debian/libsqlite3-ocaml.install.in
@@ -1,4 +1,4 @@
 @OCamlDllDir@/*.so
 @OCamlStdlibDir@/sqlite3/sqlite3.cma
 @OCamlStdlibDir@/sqlite3/META
-OPT: sqlite3.cmxs @OCamlStdlibDir@/sqlite3
+DYN: @OCamlStdlibDir@/sqlite3/*.cmxs
diff --git a/debian/rules b/debian/rules
index bf01d76..784b363 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,31 +4,41 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DESTDIR := $(CURDIR)/debian/tmp
+
 include /usr/share/ocaml/ocamlvars.mk
 
-DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
+OCAMLFIND_LDCONF=ignore
+export OCAMLFIND_LDCONF
 
 %:
 	dh $@ --with ocaml
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
-	dh_auto_configure -- LDFLAGS="-Wl,-z,defs"
+	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)'
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	$(MAKE) bytecode docs
-ifneq ($(OCAML_OPT_ARCH),)
-	$(MAKE) opt
-	ocamlopt -I . -shared -linkall -o sqlite3.cmxs sqlite3.cmxa
-endif
+	ocaml setup.ml -build
+	ocaml setup.ml -doc
 
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	[ ! -f Makefile ] || $(MAKE) distclean
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+	ocaml setup.ml -test
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	mkdir -p $(CURDIR)/debian/tmp$(OCAML_DLL_DIR)
-	mkdir -p $(CURDIR)/debian/tmp/usr/bin
-	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
+	mkdir -p '$(DESTDIR)/usr/bin'
+	mkdir -p '$(DESTDIR)/$(OCAML_DLL_DIR)'
+	ocaml setup.ml -install
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing -X.so.owner
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	ocaml setup.ml -distclean

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