[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. debian/0.6.1.0-2

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 7c4d2a69bdde31a73499343f5aadd84d368c2a58
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Dec 8 23:44:06 2009 +0000

    dh_ocaml transition
    
    * Use dh_ocaml 0.9.1 features (dependencies, ocamldoc)
    * Upgrade Standards-Version to 3.8.3 (no change)

diff --git a/debian/changelog b/debian/changelog
index 14218de..5e4f8cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-libvirt (0.6.1.0-2) unstable; urgency=low
+
+  * Use dh_ocaml 0.9.1 features (dependencies, ocamldoc)
+  * Upgrade Standards-Version to 3.8.3 (no change)
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 08 Dec 2009 23:32:40 +0000
+
 ocaml-libvirt (0.6.1.0-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/debian/control b/debian/control
index 1f6c67f..90cb629 100644
--- a/debian/control
+++ b/debian/control
@@ -15,16 +15,17 @@ Build-Depends: cdbs,
  libxml2-utils, 
  xsltproc, 
  po4a, 
- dh-ocaml (>= 0.4.1), 
+ dh-ocaml (>= 0.9.1), 
  libgettext-ocaml-dev (>> 0.3.2-2)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-libvirt.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-libvirt.git
 Homepage: http://libvirt.org/ocaml/
 
 Package: libvirt-ocaml
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for libvirt
  This library provides OCaml bindings for using libvirt.
  .
@@ -37,7 +38,8 @@ Description: OCaml bindings for libvirt
 
 Package: libvirt-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libvirt-ocaml (= ${binary:Version}), libvirt-dev, ${misc:Depends}
+Depends: ${ocaml:Depends}, libvirt-ocaml (= ${binary:Version}), libvirt-dev, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for libvirt
  This library provides OCaml bindings for using libvirt.
  .
diff --git a/debian/libvirt-ocaml-dev.ocamldoc b/debian/libvirt-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..89abbcf
--- /dev/null
+++ b/debian/libvirt-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+# No flags
diff --git a/debian/rules b/debian/rules
index 9c0d3dd..fbb1e08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,9 @@
 # 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/class/autotools.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include $(CURDIR)/debian/mk/docbook-manpage.mk
 
@@ -37,8 +37,6 @@ DEB_MAKE_INSTALL_TARGET  := install-byte
 endif
 DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" prefix="$(DESTDIR)/usr"
 
-OCAML_OCAMLDOC_PACKAGES = libvirt-ocaml-dev
-
 PO4A_SOURCES := $(CURDIR)/debian/xml-man/po4a/po4a.cfg
 
 DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/mlvirsh.xml

-- 
ocaml-libvirt packaging