[Pkg-ocaml-maint-commits] [SCM] mlpcap packaging branch, master, updated. debian/0.9-15

[Sylvain Le Gall]

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

    dh-ocaml transition
    
    * Use dh-ocaml 0.9.1 features
    * Upgrade Standards-Version to 3.8.3 (section ocaml)
    * Depends on libpcap0.8-dev and camlidl (Closes: #559741)

diff --git a/debian/changelog b/debian/changelog
index 2265c81..e4d8075 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-mlpcap (0.9-15) UNRELEASED; urgency=low
+mlpcap (0.9-15) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Use dh-ocaml 0.9.1 features 
+  * Upgrade Standards-Version to 3.8.3 (section ocaml)
+  * Depends on libpcap0.8-dev and camlidl (Closes: #559741)
 
- -- Sylvain Le Gall <gildor at debian.org>  Sat, 07 Mar 2009 00:14:23 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 08 Dec 2009 23:50:04 +0000
 
 mlpcap (0.9-14) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d6aa4cb..76d729e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: mlpcap
-Section: libdevel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>
@@ -11,24 +11,24 @@ Build-Depends: cdbs (>= 0.4.23-1.1),
  libffcall1-dev, 
  ocaml-findlib (>= 1.1.2pl1-4), 
  libpcap0.8-dev,
- dh-ocaml (>= 0.4.1)
-Standards-Version: 3.8.0
+ dh-ocaml (>= 0.9.1)
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mlpcap.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mlpcap.git
 Homepage: http://www.drugphish.ch/~jonny/mlpcap.html
 
 Package: libmlpcap-ocaml
 Architecture: any
-Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: binding of libpcap for OCaml
  MLpcap implements OCaml stubs to libpcap. It allows to call almost
  all function of libpcap from OCaml.
 
 Package: libmlpcap-ocaml-dev
 Architecture: any
-Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libmlpcap-ocaml (= ${binary:Version}), libffcall1-dev, ${misc:Depends}
+Depends: ${ocaml:Depends}, libmlpcap-ocaml (= ${binary:Version}), libffcall1-dev, libpcap0.8-dev, camlidl, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: binding of libpcap for OCaml
  MLpcap implements OCaml stubs to libpcap. It allows to call almost
  all function of libpcap from OCaml.
diff --git a/debian/libmlpcap-ocaml-dev.doc-base b/debian/libmlpcap-ocaml-dev.doc-base
new file mode 100644
index 0000000..f3ad67f
--- /dev/null
+++ b/debian/libmlpcap-ocaml-dev.doc-base
@@ -0,0 +1,9 @@
+Document: mlpcap-ocamldoc-api-reference
+Title: mlpcap OCamldoc API Reference
+Abstract: API reference manual for mlpcap
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libmlpcap-ocaml-dev/html/api/index.html
+Files: /usr/share/doc/libmlpcap-ocaml-dev/html/api/*
+
diff --git a/debian/rules b/debian/rules
index 2c0a7c3..7dbcb00 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 := libmlpcap-ocaml
 DESTDIR := $(CURDIR)/debian/$(PACKAGE)
@@ -38,8 +38,6 @@ DEB_MAKE_INSTALL_TARGET  := install \
 
 CFLAGS += -fPIC
 
-OCAML_OCAMLDOC_PACKAGES_DOCBASE := libmlpcap-ocaml-dev
-
 install/libmlpcap-ocaml-dev::
 	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/pcap/*.so \
 	 '$(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/'

-- 
mlpcap packaging