[Pkg-ocaml-maint-commits] [SCM] xml-light packaging branch, master, updated. debian/2.2-11-9-g579acfc

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f3a42eefa0b5409fa871d06a26ec5fa700961010
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Oct 9 00:01:45 2009 +0200

    Use new features of dh-ocaml 0.9

diff --git a/debian/changelog b/debian/changelog
index bc80b8e..af95efd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xml-light (2.2-12) UNRELEASED; urgency=low
   [ Mehdi Dogguy ]
   * Add myself to uploaders
   * Set the section to ocaml
+  * Use new features of dh-ocaml 0.9
+    - Generate the documentation using dh_ocamldoc
   * Bump standards version to 3.8.3
   * Reorder included files in debian/rules to workaround a CDBS bug
 
diff --git a/debian/control b/debian/control
index 803cfd2..69e08b2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,25 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Sylvain Le Gall <gildor at debian.org>,
  Mehdi Dogguy <mehdi at debian.org>
+Build-Depends:
+ cdbs (>= 0.4.23-1.1),
+ dpatch,
+ ocaml-nox (>= 3.11),
+ debhelper (>= 7),
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
-Build-Depends: cdbs (>= 0.4.23-1.1), dpatch, ocaml-nox (>= 3.11), debhelper (>= 7), dh-ocaml (>= 0.4.1)
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/xml-light.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/xml-light.git
 Homepage: http://tech.motion-twin.com/xmllight.html
 
 Package: libxml-light-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: mininal XML parser and printer for OCaml
  This is a XML parser and printer, designed to help parsing basic XML document
  into OCaml data structures and printing it back to a XML document.
diff --git a/debian/libxml-light-ocaml-dev.ocamldoc b/debian/libxml-light-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..2613083
--- /dev/null
+++ b/debian/libxml-light-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+# dh_ocamldoc file
diff --git a/debian/rules b/debian/rules
index 945b05a..f45ee6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,8 +38,6 @@ DEB_MAKE_INSTALL_TARGET  += installopt
 endif
 DEB_MAKE_INSTALL_TARGET  += INSTALLDIR='$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light'
 
-OCAML_OCAMLDOC_PACKAGES := libxml-light-ocaml-dev
-
 clean::
 	-$(RM) -r '$(CURDIR)/doc'
               

-- 
xml-light packaging