[Pkg-ocaml-maint-commits] r4386 - in /trunk/packages/ounit/trunk/debian: changelog control control.in libounit-ocaml-dev.doc-base.1 rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Wed Sep  5 20:54:51 2007
New Revision: 4386

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4386
Log:
* Use standard .doc-base.ocamldoc-apiref
* Upgrade build-dep on ocaml-findlib

Removed:
    trunk/packages/ounit/trunk/debian/libounit-ocaml-dev.doc-base.1
Modified:
    trunk/packages/ounit/trunk/debian/changelog
    trunk/packages/ounit/trunk/debian/control
    trunk/packages/ounit/trunk/debian/control.in
    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=4386&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/changelog (original)
+++ trunk/packages/ounit/trunk/debian/changelog Wed Sep  5 20:54:51 2007
@@ -1,3 +1,10 @@
+ounit (1.0.2-7) unstable; urgency=low
+
+  * Build for ocaml 3.10.0
+  * Use standard .doc-base.ocamldoc-apiref
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 04 Sep 2007 00:26:46 +0200
+
 ounit (1.0.2-6) experimental; urgency=low
 
   * Upgrade debian/watch version to 3,

Modified: trunk/packages/ounit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/control?rev=4386&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/control (original)
+++ trunk/packages/ounit/trunk/debian/control Wed Sep  5 20:54:51 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.09.2-7), ocaml-findlib (>= 1.0.4-1), docbook-utils
+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
 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/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/control.in?rev=4386&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/control.in (original)
+++ trunk/packages/ounit/trunk/debian/control.in Wed Sep  5 20:54:51 2007
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-findlib (>= 1.0.4-1), docbook-utils
+Build-Depends: @cdbs@, 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=4386&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/rules (original)
+++ trunk/packages/ounit/trunk/debian/rules Wed Sep  5 20:54:51 2007
@@ -39,15 +39,22 @@
 DEB_MAKE_INSTALL_TARGET  := install 
 DEB_MAKE_INSTALL_TARGET  += DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
 
 clean::
-	-$(RM) $(CURDIR)/depend 
-	-$(RM) -r $(CURDIR)/manual
-	-$(RM) $(CURDIR)/debian/libounit-ocaml-dev.dirs
+	-$(RM) '$(CURDIR)/depend'
+	-$(RM) -r '$(CURDIR)/manual'
+	-$(RM) '$(CURDIR)/debian/libounit-ocaml-dev.dirs'
+	-$(RM) '$(CURDIR)/debian/libounit-ocaml-dev.doc-base.ocamldoc-apiref'
               
 manual:
-	mkdir manual
-	docbook2html doc/manual/src/OUnit.xml --output 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
+
+