[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.1-11-g8409cbc

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 8409cbcbc9ace7c7b4b7827a00b7f57164ee3204
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Nov 1 22:41:03 2009 +0100

    OCAML_OCAMLDOC_PACKAGES is not needed anymore. Thus, removing each occurence and reference to it.

diff --git a/cdbs/1/rules/ocaml.mk b/cdbs/1/rules/ocaml.mk
index f098aed..458b4cd 100644
--- a/cdbs/1/rules/ocaml.mk
+++ b/cdbs/1/rules/ocaml.mk
@@ -47,15 +47,6 @@ OCAML_LIBDEV_PACKAGES ?= $(filter lib%-ocaml-dev,$(DEB_PACKAGES))
 # 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 $(OCAML_OCAMLDOC_DESTDIR_HTML).
-# Typical usage is OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES).
-# For debian/rules writers
-OCAML_OCAMLDOC_PACKAGES =
-#OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)	# more "aggressive" default
-
 # to ensure invocations and tests on /usr/bin/ocaml* are meaningful
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), ocaml-nox
 
@@ -67,7 +58,7 @@ DEB_DH_GENCONTROL_ARGS +=    -VF:OCamlNativeArchs="$(OCAML_NATIVE_ARCHS)"
 
 endif
 
-# post-install hook to invoke ocamldoc on OCAML_OCAMLDOC_PACKAGES packages
+# post-install hook to invoke dh_ocamldoc
 $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
 	dh_ocamldoc -p$(cdbs_curpkg)
 
diff --git a/debian/changelog b/debian/changelog
index bf00d82..2037beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,11 +13,13 @@ dh-ocaml (0.9.2) UNRELEASED; urgency=low
     packages (Closes: #552392).
   * dh_ocamlinit: Do not generate a stamp file after cleaning
   * ocaml.mk: run dh_ocamldoc only on the current package
+  * OCAML_OCAMLDOC_PACKAGES is not needed anymore. Thus, removing each
+    occurence and reference to it.
 
   [ Samuel Mimram ]
   * dom-git-checkout: add --no-ssh option
 
- -- Mehdi Dogguy <mehdi at debian.org>  Sun, 01 Nov 2009 14:07:57 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 01 Nov 2009 22:39:32 +0100
 
 dh-ocaml (0.9.1) unstable; urgency=low
 

-- 
dh-ocaml packaging