[Pkg-ocaml-maint-commits] [SCM] ocaml-fileutils packaging branch, master, updated. debian/0.4.0-1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 2d89eb6d4212df4326cdb6066d471e8d5a30a0bf
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Thu Oct 8 22:11:33 2009 +0000

    Use dh_ocaml 0.9 (dh_ocamldoc, depends/provides)

diff --git a/debian/changelog b/debian/changelog
index d8de08a..a091e8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ocaml-fileutils (0.4.0-1) UNRELEASED; urgency=low
   * New Upstream Version
   * Upgrade Standards-Version to 3.8.3 (section ocaml)
   * Remove all patches (integrated upstream)
+  * Use dh_ocaml 0.9 (dh_ocamldoc, depends/provides)
 
  -- Sylvain Le Gall <gildor at debian.org>  Wed, 16 Sep 2009 16:45:47 +0000
 
diff --git a/debian/control b/debian/control
index 05ee5a3..059282e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: cdbs (>= 0.4.23-1.1),
  ocaml-nox (>= 3.10.0-9),
  ocaml-findlib (>= 1.1.2pl1-4),
  camlp4 (>= 3.10.0-4),
- dh-ocaml (>= 0.4.1)
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-fileutils.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-fileutils.git
@@ -17,7 +17,8 @@ Homepage: http://le-gall.net/sylvain+violaine/ocaml-fileutils.html
 
 Package: libfileutils-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: File manipulation for OCaml
  This library provides some functions which operate on the file system
  for the Objective Caml (OCaml) programming language. The aim is to enhance
diff --git a/debian/libfileutils-ocaml-dev.ocamldoc b/debian/libfileutils-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..c01ade2
--- /dev/null
+++ b/debian/libfileutils-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+# Nothing
diff --git a/debian/rules b/debian/rules
index 9cff5d8..38f6c70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
+include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
 PACKAGE_DEV := libfileutils-ocaml-dev
 DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
@@ -29,6 +29,4 @@ DEB_MAKE_CLEAN_TARGET    := distclean
 DEB_MAKE_BUILD_TARGET    := all 
 DEB_MAKE_INSTALL_TARGET  := install OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-OCAML_OCAMLDOC_PACKAGES_DOCBASE := $(PACKAGE_DEV)
-
 DEB_CONFIGURE_EXTRA_FLAGS = --htmldir="$(DESTDIR_DEV)/usr/share/doc/$(PACKAGE_DEV)/html"

-- 
ocaml-fileutils packaging