[Pkg-ocaml-maint-commits] [SCM] ocamlgsl packaging branch, master, updated. debian/0.6.0-6

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 1a2eb6727b2fe0e433261362ae8c4f1d62702e0c
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Mon Dec 14 23:45:41 2009 +0000

    dh-ocaml transition
    
    * Use dh-ocaml features
    * Upgrade Standards-version to 3.8.3 (section ocaml)

diff --git a/debian/changelog b/debian/changelog
index a964b8e..12254fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-ocamlgsl (0.6.0-6) UNRELEASED; urgency=low
+ocamlgsl (0.6.0-6) unstable; urgency=low
 
   * Update upstream homepage
   * Restore .depend in clean target
+  * Use dh-ocaml features
+  * Upgrade Standards-version to 3.8.3 (section ocaml)
 
- -- Sylvain Le Gall <gildor at debian.org>  Fri, 01 May 2009 18:32:04 +0200
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 14 Dec 2009 23:44:52 +0000
 
 ocamlgsl (0.6.0-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fd9f8a5..6091699 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: ocamlgsl
-Section: devel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>
@@ -12,16 +12,16 @@ Build-Depends: cdbs (>= 0.4.23-1.1),
  chrpath, 
  gawk, 
  camlp4 (>= 3.10.0),
- 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/ocamlgsl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlgsl.git
 Homepage: http://code.google.com/p/ocamlgsl/
 
 Package: libocamlgsl-ocaml-dev
-Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlgsl-ocaml (= ${binary:Version}), libgsl0-dev, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${ocaml:Depends}, libocamlgsl-ocaml (= ${binary:Version}), libgsl0-dev, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: GNU scientific library for OCaml
  This is an interface to GSL (GNU scientific library), for the
  Objective Caml language.
@@ -29,9 +29,9 @@ Description: GNU scientific library for OCaml
  See the libgsl0 package for more details.
 
 Package: libocamlgsl-ocaml
-Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: GNU scientific library for OCaml
  This is an interface to GSL (GNU scientific library), for the
  Objective Caml language.
diff --git a/debian/libocamlgsl-ocaml-dev.doc-base b/debian/libocamlgsl-ocaml-dev.doc-base
new file mode 100644
index 0000000..81eb132
--- /dev/null
+++ b/debian/libocamlgsl-ocaml-dev.doc-base
@@ -0,0 +1,8 @@
+Document: libocamlgsl-ocaml-dev-ocamldoc-api-reference
+Title: libocamlgsl-ocaml-dev OCamldoc API Reference
+Abstract: API reference manual for libocamlgsl-ocaml-dev (generated via OCamldoc)
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libocamlgsl-ocaml-dev/html/api/index.html
+Files: /usr/share/doc/libocamlgsl-ocaml-dev/html/api/*
diff --git a/debian/rules b/debian/rules
index dbfc0c6..ca9c63b 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/makefile.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
 DEB_MAKE_CLEAN_TARGET    := clean
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
@@ -39,8 +39,6 @@ DESTDIR := $(CURDIR)/debian/$(PACKAGE)
 
 DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
 
-OCAML_OCAMLDOC_PACKAGES_DOCBASE := libocamlgsl-ocaml-dev
-
 pre-build::
 	cp .depend .depend.save
 

-- 
ocamlgsl packaging