[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.4.3-1-12-gc625581

[Stephane Glondu]

The following commit has been merged in the master branch:
commit f38e873bb685c59c0f395cb157829135376cc406
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 6 14:33:50 2013 +0200

    Update packaging

diff --git a/debian/libbatteries-ocaml-dev.docs b/debian/libbatteries-ocaml-dev.docs
index 64741c4..cded749 100644
--- a/debian/libbatteries-ocaml-dev.docs
+++ b/debian/libbatteries-ocaml-dev.docs
@@ -1,3 +1,3 @@
 FAQ
-README
+README.md
 README.folders
diff --git a/debian/libbatteries-ocaml-doc.doc-base b/debian/libbatteries-ocaml-doc.doc-base
index 0acab43..b3a0a7a 100644
--- a/debian/libbatteries-ocaml-doc.doc-base
+++ b/debian/libbatteries-ocaml-doc.doc-base
@@ -4,5 +4,5 @@ Abstract: API reference manual for libbatteries-ocaml-doc (generated via OCamldo
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libbatteries-ocaml-doc/html/index.html
-Files: /usr/share/doc/libbatteries-ocaml-doc/html/*
+Index: /usr/share/doc/libbatteries-ocaml-doc/html/api/index.html
+Files: /usr/share/doc/libbatteries-ocaml-doc/html/api/*
diff --git a/debian/rules b/debian/rules
index db5286d..f74947b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 include /usr/share/ocaml/ocamlvars.mk
 
-DEB_DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 BATTERIES_DEB_DOCROOT = $(CURDIR)/debian/tmp/doc
 export BATTERIES_DOCROOT = /usr/share/doc/libbatteries-ocaml-doc/
 export DESTDIR = $(OCAML_STDLIB_DIR)
@@ -28,8 +28,8 @@ override_dh_auto_test:
 	make test
 
 override_dh_auto_install:
-	mkdir -p $(DEB_DESTDIR)/estring $(DEB_DESTDIR)/batteries $(BATTERIES_DEB_DOCROOT)
-	make DESTDIR=$(DEB_DESTDIR) install
+	mkdir -p $(OCAMLFIND_DESTDIR)/batteries $(BATTERIES_DEB_DOCROOT)
+	make DESTDIR=$(OCAMLFIND_DESTDIR) install
 ifneq (,$(findstring $(DOC_PKG),$(shell dh_listpackages)))
 	make DOCROOT=$(BATTERIES_DEB_DOCROOT) install-doc
 endif
@@ -44,3 +44,7 @@ override_dh_compress:
 
 .PHONY: override_dh_auto_build override_dh_auto_test override_dh_auto_install
 .PHONY: override_dh_auto_clean override_dh_compress
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing

-- 
ocaml-batteries packaging