[Pkg-ocaml-maint-commits] r4274 - in /trunk/packages/ocaml/trunk/debian: cdbs/ocaml.mk changelog

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Sep  2 17:12:05 2007
New Revision: 4274

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4274
Log:
  - better test for package membership to OCAML_OCAMLDOC_PACKAGES

Modified:
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
    trunk/packages/ocaml/trunk/debian/changelog

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk?rev=4274&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Sun Sep  2 17:12:05 2007
@@ -44,7 +44,7 @@
 
 # post-install hook to invoke ocamldoc on OCAML_OCAMLDOC_PACKAGES packages
 $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
-	@if (echo $(OCAML_OCAMLDOC_PACKAGES) | grep -w '$(cdbs_curpkg)' > /dev/null) ; then \
+	@if (echo $(OCAML_OCAMLDOC_PACKAGES) | egrep '( |^)$(cdbs_curpkg)( |$$)' > /dev/null) ; then \
 		echo 'mkdir -p debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML)' ; \
 		mkdir -p debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML) ; \
 		echo 'invoking ocamldoc on debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ ...' ; \
@@ -58,7 +58,7 @@
 
 # post-build hook to create doc-base entries for OCAML_OCAMLDOC_PACKAGES packages
 $(patsubst %,build/%,$(DEB_PACKAGES))::
-	@if (echo $(OCAML_OCAMLDOC_PACKAGES) | grep -w '$(cdbs_curpkg)' > /dev/null) ; then \
+	@if (echo $(OCAML_OCAMLDOC_PACKAGES) | egrep '( |^)$(cdbs_curpkg)( |$$)' > /dev/null) ; then \
 		sed -e 's/@PACKAGE@/$(cdbs_curpkg)/g' \
 			$(_cdbs_class_path)/ocaml-docbase-template.txt$(_cdbs_makefile_suffix) \
 			> debian/$(cdbs_curpkg).doc-base.ocamldoc-apiref ; \

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=4274&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Sun Sep  2 17:12:05 2007
@@ -6,11 +6,12 @@
       likely to generate empty API references ...)
     - add support for automatic generation of doc-base entries for ocamldoc
       generated API reference
+    - better test for package membership to OCAML_OCAMLDOC_PACKAGES
   * debian/ocaml-base-nox.README.Debian
     - add an entry describing the requirement for compiling ocamldoc-generated
       LaTeX documentation (closes: #420782)
 
- -- Stefano Zacchiroli <zack at debian.org>  Sun, 02 Sep 2007 18:32:17 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 02 Sep 2007 19:11:14 +0200
 
 ocaml (3.10.0-7) unstable; urgency=low