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

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 13086525508c10957beb94b054c186b6dc8ecea1
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Nov 3 23:07:19 2009 +0000

    Upgrade to dh-ocaml 0.9
    
    * Upgrade standards-version to 3.8.3 (no change)
    * Use dh-ocaml 0.9 features

diff --git a/debian/changelog b/debian/changelog
index 77e946a..036ad54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+camomile (0.7.2-2) unstable; urgency=low
+
+  * Upgrade standards-version to 3.8.3 (no change)
+  * Use dh-ocaml 0.9 features
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 03 Nov 2009 22:34:10 +0000
+
 camomile (0.7.2-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/debian/control b/debian/control
index ef24042..73945ab 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: camomile
-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>
@@ -9,15 +9,14 @@ Build-Depends: cdbs (>= 0.4.23-1.1),
  ocaml-nox (>= 3.11.1), 
  po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, 
  ocaml-findlib (>= 1.2.4-2), 
- dh-ocaml (>= 0.4.1), 
+ dh-ocaml (>= 0.9.1), 
  camlp4
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camomile.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camomile.git
 Homepage: http://sourceforge.net/projects/camomile/
 
 Package: libcamomile-ocaml-data
-Section: ocaml
 Architecture: all
 Suggests: libcamomile-ocaml-dev
 Depends: ${misc:Depends}
@@ -28,9 +27,12 @@ Description: Unicode data for OCaml
  This package contains the data needed by camomile.
  
 Package: libcamomile-ocaml-dev
-Section: ocaml
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} 
+Depends: libcamomile-ocaml-data (= ${source:Version}), 
+  ${misc:Depends}, 
+  ${shlibs:Depends}, 
+  ${ocaml:Depends}
+Provides: ${ocaml:Provides}
 Description: Unicode library for OCaml
  Camomile is a comprehensive Unicode library for objective caml language. 
  The library is currently designed to conform Unicode Standard 3.2.
diff --git a/debian/libcamomile-ocaml-dev.ocamldoc b/debian/libcamomile-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..ed36c3b
--- /dev/null
+++ b/debian/libcamomile-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+-I public/ -I internal/
diff --git a/debian/rules b/debian/rules
index 7b1e801..c30cb03 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
 include $(CURDIR)/debian/mk/docbook-manpage.mk
 
 PACKAGE_DEV := libcamomile-ocaml-dev
@@ -47,9 +47,6 @@ DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/camomilecharmap.xml  \
 DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml      \
                                  $(CURDIR)/debian/xml-man/en/refentryinfo.xml
 
-
-OCAML_OCAMLDOC_PACKAGES_DOCBASE := libcamomile-ocaml-dev
-
 clean::
 	-$(RM) '$(CURDIR)/Makefile'
 	-$(RM) -r '$(CURDIR)/dochtml'

-- 
camomile packaging