[Pkg-ocaml-maint-commits] [SCM] ocaml-libvirt packaging branch, master, updated. debian/0.4.4.2-1-1-g1f23eeb

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 5f1a3bf4fef795bfc0b867cb4c13c12108895bf1
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Mar 7 16:23:29 2009 +0100

    Migration to OCaml 3.11
    
    * Add dh-ocaml build-dependency (rules/ocaml.mk)
    * Upgrade debian/compat to 7 (use debian/clean)
    * Add ${misc:Depends} to dependencies

diff --git a/debian/changelog b/debian/changelog
index 1f4f6f3..a08f56f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,12 @@
-ocaml-libvirt (0.4.4.2-1) UNRELEASED; urgency=low
+ocaml-libvirt (0.4.4.2-1) unstable; urgency=low
 
   * New Upstream Version
-
- -- Sylvain Le Gall <gildor at debian.org>  Sat, 07 Mar 2009 15:39:55 +0100
-
-ocaml-libvirt (0.4.4.1-4) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
   * Add debian/gbp.conf
+  * Add dh-ocaml build-dependency (rules/ocaml.mk)
+  * Upgrade debian/compat to 7 (use debian/clean)
+  * Add ${misc:Depends} to dependencies
 
- -- Sylvain Le Gall <gildor at debian.org>  Sat, 07 Mar 2009 15:39:23 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Sat, 07 Mar 2009 15:50:02 +0100
 
 ocaml-libvirt (0.4.4.1-3) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f8d807c
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,7 @@
+META
+config.h
+config.log
+config.status
+libvirt/libvirt_version.ml
+mlvirsh/mlvirsh_gettext.ml
+debian/xml-man/en/mlvirsh.1
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 506e55b..c7d22cd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,19 @@ Section: libdevel
 Priority: extra
 Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
 Uploaders: Guido Guenther <agx at sigxcpu.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs, debhelper (>= 6), autotools-dev, ocaml-nox,
- ocaml-findlib, quilt, libvirt-dev, docbook-xml (>= 4.4), docbook-xsl, 
- libxml2-utils, xsltproc, po4a
+Build-Depends: cdbs, 
+ debhelper (>= 7), 
+ autotools-dev, 
+ ocaml-nox,
+ ocaml-findlib, 
+ quilt, 
+ libvirt-dev, 
+ docbook-xml (>= 4.4), 
+ docbook-xsl, 
+ libxml2-utils, 
+ xsltproc, 
+ po4a, 
+ dh-ocaml (>= 0.4.1)
 Standards-Version: 3.8.0
 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
@@ -26,7 +36,7 @@ Description: OCaml bindings for libvirt
 
 Package: libvirt-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libvirt-ocaml (= ${binary:Version}), libvirt-dev
+Depends: ocaml-nox-${F:OCamlABI}, libvirt-ocaml (= ${binary:Version}), libvirt-dev, ${misc:Depends}
 Description: OCaml bindings for libvirt
  This library provides OCaml bindings for using libvirt.
  .
diff --git a/debian/rules b/debian/rules
index 8a60f6d..deb4e19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/ocaml.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
 
@@ -35,7 +35,7 @@ DEB_MAKE_INSTALL_TARGET  := install-opt
 else
 DEB_MAKE_INSTALL_TARGET  := install-byte
 endif
-DEB_MAKE_INSTALL_TARGET  += OCAMLDESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" DESTDIR="$(DESTDIR_DEV)"
+DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" prefix="$(DESTDIR)/usr"
 
 OCAML_OCAMLDOC_PACKAGES = libvirt-ocaml-dev
 
@@ -54,21 +54,14 @@ install/libvirt-ocaml::
 
 clean::
 	if test -e $(CURDIR)/po/Makefile; then $(MAKE) -C '$(CURDIR)/po' clean; fi
-	-$(RM) '$(CURDIR)/META'
 	-$(RM) '$(CURDIR)/Make.rules'
 	-$(RM) '$(CURDIR)/Makefile'
-	-$(RM) '$(CURDIR)/config.h'
-	-$(RM) '$(CURDIR)/config.log'
-	-$(RM) '$(CURDIR)/config.status'
-	-$(RM) '$(CURDIR)/examples/Makefile'
+	-$(RM) '$(CURDIR)/po/Makefile'
 	-$(RM) '$(CURDIR)/libvirt/Makefile'
-	-$(RM) '$(CURDIR)/libvirt/libvirt_version.ml'
 	-$(RM) '$(CURDIR)/mlvirsh/Makefile'
-	-$(RM) '$(CURDIR)/mlvirsh/mlvirsh_gettext.ml'
-	-$(RM) '$(CURDIR)/po/Makefile'
-	-$(RM) '$(CURDIR)/debian/libvirt-ocaml-dev.dirs'
-	-$(RM) '$(CURDIR)/debian/libvirt-ocaml.dirs'
-	-$(RM) '$(CURDIR)/debian/xml-man/en/mlvirsh.1'
+	-$(RM) '$(CURDIR)/examples/Makefile'
+	-$(RM) '$(CURDIR)/libvirt/.depend'
+	-$(RM) '$(CURDIR)/mlvirsh/.depend'
 
 install/libvirt-ocaml-dev::
 	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/libvirt/*.so $(DESTDIR)/$(OCAML_DLL_DIR)/

-- 
ocaml-libvirt packaging