[Pkg-ocaml-maint-commits] r4359 - in /trunk/packages/camomile/trunk/debian: changelog control control.in libcamomile-ocaml-data.dirs libcamomile-ocaml-data.doc-base libcamomile-ocaml-data.install libcamomile-ocaml-dev.install rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Wed Sep  5 12:40:47 2007
New Revision: 4359

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4359
Log:
* Move api doc to html/api
* Build depends on findlib from ocaml 3.10.0 

Added:
    trunk/packages/camomile/trunk/debian/libcamomile-ocaml-dev.install
Removed:
    trunk/packages/camomile/trunk/debian/libcamomile-ocaml-data.dirs
    trunk/packages/camomile/trunk/debian/libcamomile-ocaml-data.doc-base
Modified:
    trunk/packages/camomile/trunk/debian/changelog
    trunk/packages/camomile/trunk/debian/control
    trunk/packages/camomile/trunk/debian/control.in
    trunk/packages/camomile/trunk/debian/libcamomile-ocaml-data.install
    trunk/packages/camomile/trunk/debian/rules

Modified: trunk/packages/camomile/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/changelog?rev=4359&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/changelog (original)
+++ trunk/packages/camomile/trunk/debian/changelog Wed Sep  5 12:40:47 2007
@@ -1,3 +1,10 @@
+camomile (0.7.1-3) unstable; urgency=low
+
+  * Build for ocaml 3.10.0
+  * Move API documentation in to usr/share/doc/libcamomile-ocaml-dev/html/api
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 04 Sep 2007 00:26:44 +0200
+
 camomile (0.7.1-2) experimental; urgency=low
 
   * Change email address to gildor at debian.org everywhere

Modified: trunk/packages/camomile/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/control?rev=4359&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/control (original)
+++ trunk/packages/camomile/trunk/debian/control Wed Sep  5 12:40:47 2007
@@ -2,7 +2,7 @@
 Section: libdevel
 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), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, ocaml-findlib, dpkg-dev (>= 1.13.19),
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, ocaml-findlib (>= 1.1.2pl1-4), dpkg-dev (>= 1.13.19),
  camlp4 (>= 3.10.0-4)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camomile

Modified: trunk/packages/camomile/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/control.in?rev=4359&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/control.in (original)
+++ trunk/packages/camomile/trunk/debian/control.in Wed Sep  5 12:40:47 2007
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-findlib, dpkg-dev (>= 1.13.19),
+Build-Depends: @cdbs@, ocaml-findlib (>= 1.1.2pl1-4), dpkg-dev (>= 1.13.19),
  camlp4 (>= 3.10.0-4)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camomile

Modified: trunk/packages/camomile/trunk/debian/libcamomile-ocaml-data.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/libcamomile-ocaml-data.install?rev=4359&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/libcamomile-ocaml-data.install (original)
+++ trunk/packages/camomile/trunk/debian/libcamomile-ocaml-data.install Wed Sep  5 12:40:47 2007
@@ -1,4 +1,3 @@
-dochtml/*                /usr/share/doc/libcamomile-ocaml-data/html/
 unidata/UnicodeData.html /usr/share/doc/libcamomile-ocaml-data/
 unidata/README           /usr/share/doc/libcamomile-ocaml-data/unidata/
 unidata/tr10/README      /usr/share/doc/libcamomile-ocaml-data/unidata/tr10

Added: trunk/packages/camomile/trunk/debian/libcamomile-ocaml-dev.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/libcamomile-ocaml-dev.install?rev=4359&op=file
==============================================================================
--- trunk/packages/camomile/trunk/debian/libcamomile-ocaml-dev.install (added)
+++ trunk/packages/camomile/trunk/debian/libcamomile-ocaml-dev.install Wed Sep  5 12:40:47 2007
@@ -1,0 +1,1 @@
+dochtml/*                /usr/share/doc/libcamomile-ocaml-dev/html/api/

Modified: trunk/packages/camomile/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camomile/trunk/debian/rules?rev=4359&op=diff
==============================================================================
--- trunk/packages/camomile/trunk/debian/rules (original)
+++ trunk/packages/camomile/trunk/debian/rules Wed Sep  5 12:40:47 2007
@@ -51,7 +51,13 @@
                                  $(CURDIR)/debian/xml-man/en/refentryinfo.xml
 
 
-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))
+
+build/libcamomile-ocaml-dev::
+	i=libcamomile-ocaml-dev; \
+	sed -e "s/@PACKAGE@/$$i/g" \
+	  /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
+	  > debian/$$i.doc-base.ocamldoc-apiref
 
 clean::
 	-$(RM) "$(CURDIR)/config.log"