From: Stefano Zacchiroli <zack@debian.org>
Date: Fri, 28 Sep 2007 14:50:04 +0000 (+0000)
Subject: * ... fixes in cdbs class for ocamldoc generation ... (TODO: still to be
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~514
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bbb8ade07fcfdfdc53884331f6b9407baf064b15;p=ocaml.git

* ... fixes in cdbs class for ocamldoc generation ... (TODO: still to be
  checked) [ entry added by Zack ]
---

diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index 6f4be6eb..4b253238 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 4403 2007-09-07 21:09:52Z gildor $
+# $Id: ocaml.mk 4592 2007-09-28 14:50:04Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -52,7 +52,7 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
 		fi; \
 		OCAMLDOC="ocamlfind $$OCAMLDOC $(OCAML_OCAMLDOC_OCAMLFIND_FLAGS)"; \
 	fi; \
-	OCAML_OCAMLDOC_INCLUDE=`for i in $(OCAML_OCAMLDOC_PACKAGES); do \
+	OCAML_OCAMLDOC_INCLUDE=`for i in "$(OCAML_OCAMLDOC_PACKAGES)"; do \
        					find debian/$$i/$(OCAML_STDLIB_DIR)/ -type d -exec echo -I \{} \; ; \
 				done`; \
 	if (echo $(OCAML_OCAMLDOC_PACKAGES) | egrep '( |^)$(cdbs_curpkg)( |$$)' > /dev/null) ; then \
@@ -70,7 +70,7 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
 $(patsubst %,build/%,$(DEB_PACKAGES))::
 	@if (echo $(OCAML_OCAMLDOC_PACKAGES) $(OCAML_OCAMLDOC_PACKAGES_DOCBASE) \
 	  | egrep '( |^)$(cdbs_curpkg)( |$$)' > /dev/null) ; then \
-	  	ocamldoc-api-ref-config --doc-base-generate $(cdbs_curpkg)
+	  	ocamldoc-api-ref-config --doc-base-generate $(cdbs_curpkg) ; \
 	fi
 
 clean::
diff --git a/debian/changelog b/debian/changelog
index cfb605cd..23b662dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,11 @@ ocaml (3.10.0-9) UNRELEASED; urgency=low
   * Suggest "tarballs" instead of "upstream" in the policy as directory name
     for storing upstream sources since it is more standard.
 
- -- Samuel Mimram <smimram@debian.org>  Tue, 25 Sep 2007 10:59:07 +0100
+  [ Sylvain Le Gall ]
+  * ... fixes in cdbs class for ocamldoc generation ... (TODO: still to be
+    checked) [ entry added by Zack ]
+
+ -- Stefano Zacchiroli <zack@debian.org>  Fri, 28 Sep 2007 15:50:37 +0200
 
 ocaml (3.10.0-8) unstable; urgency=low