From: Stefano Zacchiroli <zack@debian.org>
Date: Mon, 27 Aug 2007 08:58:20 +0000 (+0000)
Subject: - more consistent variable naming for OCAML_LIB*_PACKAGES variables
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~546
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b156fe7c764a3cf879f836aa343173f782904ad9;p=ocaml.git

- more consistent variable naming for OCAML_LIB*_PACKAGES variables
- install HTML API doc generated by ocamldoc under /usr/share/doc/PACKAGE/html/api/
- bump sample API version to 3.10.0
---

diff --git a/debian/cdbs/ocaml-vars.mk b/debian/cdbs/ocaml-vars.mk
index d889c9c9..694c6355 100644
--- a/debian/cdbs/ocaml-vars.mk
+++ b/debian/cdbs/ocaml-vars.mk
@@ -16,7 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: ocaml-vars.mk 4191 2007-08-25 18:29:47Z zack $
+# $Id: ocaml-vars.mk 4195 2007-08-27 08:58:20Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -25,7 +25,7 @@ _cdbs_class_path ?= /usr/share/cdbs/1/class
 ifndef _cdbs_class_ocaml_vars
 _cdbs_class_ocaml_vars = 1
 
-# current OCaml ABI version (e.g. 3.09.2).
+# current OCaml ABI version (e.g. 3.10.0).
 # Used internally by ocaml.mk (substituted for @OCamlABI@ in $(OCAML_IN_FILES)
 # below), may be useful to debian/rules writers as well
 OCAML_ABI := $(shell /usr/bin/ocamlc -version)
@@ -71,18 +71,22 @@ OCAML_TEAM += Sylvain Le Gall <gildor@debian.org>
 # no trailing "," (comma) on the last name
 
 # space separated list of packages matching the naming convention for OCaml
-# libraries, i.e. libXXX-ocaml-dev.
+# development libraries, i.e. libXXX-ocaml-dev.
 # For debian/rules writers
-OCAML_DEV_PACKAGES := $(filter lib%-ocaml-dev,$(DEB_PACKAGES))
+OCAML_LIBDEV_PACKAGES := $(filter lib%-ocaml-dev,$(DEB_PACKAGES))
+
+# as above, but keep packages matching the convention for OCaml runtime
+# libraries, i.e. libXX-ocaml
+OCAML_LIB_PACKAGES := $(filter lib%-ocaml,$(DEB_PACKAGES))
 
 # space separated list of packages on which ocamldoc usage is required. For
 # each package listed here will have ocamldoc invoked on all *.ml/*.mli files
 # installed under $(OCAML_STDLIB_DIR) to generated html documentation which
 # will be shipped in /usr/share/doc/PACKAGE/html/*.
-# Typical usage is OCAML_OCAMLDOC_PACKAGES = $(OCAML_DEV_PACKAGES).
+# Typical usage is OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES).
 # For debian/rules writers
 OCAML_OCAMLDOC_PACKAGES =
-#OCAML_OCAMLDOC_PACKAGES = $(OCAML_DEV_PACKAGES)	# more "aggressive" default
+#OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)	# more "aggressive" default
 
 # flags to be passed to ocamldoc (in addition to -html and -d DESTDIR).
 # For debian/rules writers
diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index 3de0323c..315049b6 100644
--- a/debian/cdbs/ocaml.mk
+++ b/debian/cdbs/ocaml.mk
@@ -16,7 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: ocaml.mk 4191 2007-08-25 18:29:47Z zack $
+# $Id: ocaml.mk 4195 2007-08-27 08:58:20Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -45,13 +45,13 @@ endif
 # post-install hooks for invoking ocamldoc on OCAML_OCAMLDOC_PACKAGES packages
 $(patsubst %,install/%,$(DEB_PACKAGES))::
 	@if (echo $(OCAML_OCAMLDOC_PACKAGES) | grep -w '$(cdbs_curpkg)' > /dev/null) ; then \
-		echo 'mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html' ; \
-		mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html ; \
+		echo 'mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api' ; \
+		mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api ; \
 		echo 'invoking ocamldoc on debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ ...' ; \
 		find debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ \
 			-type f -name '*.mli' -or -name '*.ml' \
 		| xargs ocamldoc $(OCAML_OCAMLDOC_FLAGS) -html \
-			-d debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html ; \
+			-d debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api ; \
 	fi
 
 # generate .in files counterpars before building, substituting @OCamlABI@