[Pkg-ocaml-maint-commits] r4372 - in /trunk/packages/ocaml-fileutils/trunk/debian: changelog control control.in libfileutils-ocaml-dev.dirs.in libfileutils-ocaml-dev.doc-base rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Wed Sep  5 14:37:52 2007
New Revision: 4372

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4372
Log:
* Upgrade the build-dep on ocaml-findlib to use the one with ocaml 3.10.0
* Move documentation html/api

Removed:
    trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.doc-base
Modified:
    trunk/packages/ocaml-fileutils/trunk/debian/changelog
    trunk/packages/ocaml-fileutils/trunk/debian/control
    trunk/packages/ocaml-fileutils/trunk/debian/control.in
    trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.dirs.in
    trunk/packages/ocaml-fileutils/trunk/debian/rules

Modified: trunk/packages/ocaml-fileutils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/debian/changelog?rev=4372&op=diff
==============================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-fileutils/trunk/debian/changelog Wed Sep  5 14:37:52 2007
@@ -1,3 +1,9 @@
+ocaml-fileutils (0.3.0-13) UNRELEASED; urgency=low
+
+  * Build for ocaml 3.10.0
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 04 Sep 2007 00:26:45 +0200
+
 ocaml-fileutils (0.3.0-12) experimental; urgency=low
 
   * Ooops, depends field is empty

Modified: trunk/packages/ocaml-fileutils/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/debian/control?rev=4372&op=diff
==============================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/control (original)
+++ trunk/packages/ocaml-fileutils/trunk/debian/control Wed Sep  5 14:37:52 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), ocaml-findlib, camlp4 (>= 3.10.0-4)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), ocaml-findlib (>= 1.1.2pl1-4), camlp4 (>= 3.10.0-4)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/

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

Modified: trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.dirs.in?rev=4372&op=diff
==============================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.dirs.in (original)
+++ trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.dirs.in Wed Sep  5 14:37:52 2007
@@ -1,3 +1,3 @@
 usr/share/ocaml-doc
-usr/share/doc/libfileutils-ocaml-dev/html
+usr/share/doc/libfileutils-ocaml-dev/html/api
 @OCamlStdlibDir@

Modified: trunk/packages/ocaml-fileutils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/debian/rules?rev=4372&op=diff
==============================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/rules (original)
+++ trunk/packages/ocaml-fileutils/trunk/debian/rules Wed Sep  5 14:37:52 2007
@@ -36,13 +36,19 @@
 			    --with-docdir="$(DESTDIR_DEV)/usr/share/ocaml-doc" \
 			    --libdir="$(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)/debian/libfileutils-ocaml-dev.dirs 
 
+build/libfileutils-ocaml-dev::
+	i=libfileutils-ocaml-dev; \
+	sed -e "s/@PACKAGE@/$$i/g" \
+	  /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
+	  > debian/$$i.doc-base.ocamldoc-apiref
+
 install/libfileutils-ocaml-dev::
-	ocamldoc -html -d $(DESTDIR_DEV)/usr/share/doc/libfileutils-ocaml-dev/html \
+	ocamldoc -html -d $(DESTDIR_DEV)/usr/share/doc/libfileutils-ocaml-dev/html/api \
 	  -load $(DESTDIR_DEV)/usr/share/ocaml-doc/fileutils.odoc
 	ocamlc -I libfileutils-ocaml/ -i libfileutils-ocaml/filePath.ml \
 	  > $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/fileutils/filePath.mli