[Pkg-ocaml-maint-commits] r4637 - in /trunk/packages/ounit/trunk/debian: changelog control rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Wed Oct 17 23:35:19 2007
New Revision: 4637

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4637
Log:
* Use OCAML_OCAMLDOC_PACKAGES_DOCBASE CDBS variable

Modified:
    trunk/packages/ounit/trunk/debian/changelog
    trunk/packages/ounit/trunk/debian/control
    trunk/packages/ounit/trunk/debian/rules

Modified: trunk/packages/ounit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/changelog?rev=4637&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/changelog (original)
+++ trunk/packages/ounit/trunk/debian/changelog Wed Oct 17 23:35:19 2007
@@ -1,8 +1,9 @@
 ounit (1.0.2-8) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
 
- -- Sylvain Le Gall <gildor at debian.org>  Wed, 05 Sep 2007 22:56:04 +0200
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 18 Oct 2007 01:13:41 +0200
 
 ounit (1.0.2-7) unstable; urgency=low
 

Modified: trunk/packages/ounit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/control?rev=4637&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/control (original)
+++ trunk/packages/ounit/trunk/debian/control Wed Oct 17 23:35:19 2007
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), ocaml-findlib (>= 1.1.2pl1-4), docbook-utils
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9), ocaml-findlib (>= 1.1.2pl1-4), docbook-utils
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ounit
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/

Modified: trunk/packages/ounit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/rules?rev=4637&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/rules (original)
+++ trunk/packages/ounit/trunk/debian/rules Wed Oct 17 23:35:19 2007
@@ -39,22 +39,18 @@
 DEB_MAKE_INSTALL_TARGET  := install 
 DEB_MAKE_INSTALL_TARGET  += DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
+
+OCAML_OCAMLDOC_PACKAGES_DOCBASE := libounit-ocaml-dev
 
 clean::
 	-$(RM) '$(CURDIR)/depend'
 	-$(RM) -r '$(CURDIR)/manual'
 	-$(RM) '$(CURDIR)/debian/libounit-ocaml-dev.dirs'
 	-$(RM) '$(CURDIR)/debian/libounit-ocaml-dev.doc-base.ocamldoc-apiref'
-              
+
+build/libounit-ocaml-dev::manual
 manual:
 	mkdir '$@'
 	docbook2html '$(CURDIR)/doc/manual/src/OUnit.xml' --output '$@'
 
-build/libounit-ocaml-dev::manual
-	i=libounit-ocaml-dev; \
-	sed -e "s/@PACKAGE@/$$i/g" \
-	  /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
-	  > debian/$$i.doc-base.ocamldoc-apiref
-
-