[Pkg-ocaml-maint-commits] [SCM] ocaml-bjack packaging branch, master, updated. debian/0.1.2-2-1-g0b7d2bc

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 0b7d2bc83df62275e818673b56006c710ffdf079
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 15:46:09 2009 +0200

    Various changes

diff --git a/debian/changelog b/debian/changelog
index 781db20..6819e35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml-bjack (0.1.2-3) UNRELEASED; urgency=low
+
+  * Bumped standard-versions to 3.8.3
+  * Use new features of dh-ocaml (>= 0.9~)
+    - Use dh_ocamldoc instead of ocamldoc-api-ref-config (Closes: #549719)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 15:32:11 +0200
+
 ocaml-bjack (0.1.2-2) unstable; urgency=low
 
   * Fix ocaml's standard library path, fixes FTBFS.
diff --git a/debian/control b/debian/control
index c61677f..ac39428 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,20 @@ Source: ocaml-bjack
 Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>, Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), libjack-dev, libsamplerate0-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml
-Standards-Version: 3.8.2
+Uploaders:
+ Samuel Mimram <smimram at debian.org>,
+ Romain Beauxis <toots at rastageeks.org>,
+ Mehdi Dogguy <mehdi at debian.org>
+Build-Depends:
+ cdbs (>= 0.4.23-1.1),
+ ocaml-nox (>= 3.11.1-3~),
+ debhelper (>= 7),
+ libjack-dev,
+ libsamplerate0-dev,
+ ocaml-findlib (>= 1.2.4),
+ pkg-config,
+ dh-ocaml (>= 0.9~)
+Standards-Version: 3.8.3
 Homepage: http://savonet.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-bjack/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-bjack/trunk/
@@ -12,7 +23,10 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-bja
 Package: libbjack-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: OCaml blocking interface to jack audio connection kit
  ocaml-bjack is a blocking interface to jack audio connection kit.
  Using it, you can create a jack device and read/write from it
@@ -23,8 +37,16 @@ Description: OCaml blocking interface to jack audio connection kit
 Package: libbjack-ocaml-dev
 Architecture: any
 Section: ocaml
-Depends: ocaml-nox-${F:OCamlABI}, libjack-dev, libsamplerate0-dev, 
-         libbjack-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ libjack-dev,
+ libsamplerate0-dev,
+ libbjack-ocaml (= ${binary:Version}),
+ ocaml-findlib,
+ ${misc:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: OCaml blocking interface to jack audio connection kit
  ocaml-bjack is a blocking interface to jack audio connection kit.
  Using it, you can create a jack device and read/write from it
diff --git a/debian/libbjack-ocaml-dev.docs b/debian/libbjack-ocaml-dev.docs
index cecaa8e..e845566 100644
--- a/debian/libbjack-ocaml-dev.docs
+++ b/debian/libbjack-ocaml-dev.docs
@@ -1,2 +1 @@
 README
-doc/html
diff --git a/debian/libbjack-ocaml-dev.ocamldoc b/debian/libbjack-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..caf8080
--- /dev/null
+++ b/debian/libbjack-ocaml-dev.ocamldoc
@@ -0,0 +1,2 @@
+# dh_ocamldoc file
+-d doc/html
diff --git a/debian/rules b/debian/rules
index 0879dc1..8ab6f64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,5 @@ DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_DH_INSTALL_ARGS :=  --list-missing
 
 build/libbjack-ocaml-dev::
-	/usr/share/ocaml/ocamldoc-api-ref-config --doc-base-generate libbjack-ocaml-dev
-	sed -i 's/api\///' debian/libbjack-ocaml-dev.doc-base.ocamldoc-apiref
 	mkdir -p $(DESTDIR)
-	make doc
+	dh_ocamldoc

-- 
ocaml-bjack packaging