[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0-1-11-gda2f0b0

[Nicolas Dandrimont]

The following commit has been merged in the master branch:
commit 003256ea8534bbf8684c977341beb51f49278db3
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Thu May 19 22:03:52 2011 +0200

    Update debian/ files for new upstream release

diff --git a/debian/libusb-ocaml-dev.install.in b/debian/libusb-ocaml-dev.install.in
index ec3241b..40eca78 100644
--- a/debian/libusb-ocaml-dev.install.in
+++ b/debian/libusb-ocaml-dev.install.in
@@ -1,7 +1,5 @@
-_build/usb.docdir/*.html          usr/share/doc/libusb-ocaml-dev/html/api
-_build/usb.docdir/*.css           usr/share/doc/libusb-ocaml-dev/html/api
+usr/share/doc/libusb-ocaml-dev/html/api
 @OCamlStdlibDir@/usb/*.cmi
 @OCamlStdlibDir@/usb/*.mli
 @OCamlStdlibDir@/usb/*.a
-OPT: @OCamlStdlibDir@/usb/*.cmx
 OPT: @OCamlStdlibDir@/usb/*.cmxa
diff --git a/debian/libusb-ocaml.install.in b/debian/libusb-ocaml.install.in
index 32bf0d0..100e99c 100644
--- a/debian/libusb-ocaml.install.in
+++ b/debian/libusb-ocaml.install.in
@@ -1,4 +1,4 @@
- at OCamlDllDir@/*.so
+ at OCamlStdlibDir@/usb/*.so @OCamlDllDir@
 @OCamlStdlibDir@/usb/META
 @OCamlStdlibDir@/usb/*.cma
 OPT: @OCamlStdlibDir@/usb/*.cmxs
diff --git a/debian/rules b/debian/rules
index 372e348..6a3c8d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,40 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+
+DESTDIR=$(CURDIR)/debian/tmp
+
 include /usr/share/ocaml/ocamlvars.mk
 
-export OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+export OCAML_DLL_DIR
+export OCAML_HAVE_OCAMLOPT
+export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_LDCONF=ignore
 
 %:
 	dh --with ocaml $@
 
-.PHONY: override_dh_auto_install
-override_dh_auto_install:
-	install -d $(OCAMLFIND_DESTDIR)
-	install -d $(CURDIR)/debian/tmp/$(OCAML_DLL_DIR)
-	$(MAKE) install
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libusb-ocaml-dev/html
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	$(MAKE) all
-	cp usb.mllib usb.odocl
-	$(MAKE) doc
+	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)'
+	ocaml setup.ml -install
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --list-missing
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	ocaml setup.ml -distclean

-- 
ocaml-usb packaging