[Pkg-ocaml-maint-commits] [SCM] camlpdf packaging branch, master, updated. debian/0.4-3-4-gb77e089

[Stephane Glondu]

The following commit has been merged in the master branch:
commit acd92b124708dc113e07d8fe588158ed1a3674a8
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Sep 29 19:39:32 2009 +0200

    Switch to dh-ocaml 0.9

diff --git a/debian/changelog b/debian/changelog
index 832edd8..57291fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ camlpdf (0.4-4) UNRELEASED; urgency=low
 
   * Change makefile_fix.patch so that system libraries are not linked into
     cma (fixes FTBFS with new dh-ocaml)
+  * Switch to dh-ocaml 0.9
 
  -- Stéphane Glondu <glondu at debian.org>  Mon, 28 Sep 2009 17:25:01 +0200
 
diff --git a/debian/control b/debian/control
index 06026c8..e069bbc 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Uploaders:
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, quilt, patchutils (>= 0.2.25),
- ocaml-findlib (>= 1.2.4),
- libzip-ocaml-dev (>= 1.04-2),
- dh-ocaml
+ ocaml-findlib (>= 1.2.5),
+ libzip-ocaml-dev (>= 1.04-6~),
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
 XS-Autobuild: yes
 Homepage: http://www.coherentgraphics.co.uk/camlpdf.html
@@ -19,9 +19,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git
 Package: libcamlpdf-ocaml-dev
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
- libzip-ocaml-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Description: library for reading, writing and manipulating PDF files and data
  CamlPDF consists of a set of low level modules for representing,
diff --git a/debian/control.in b/debian/control.in
index c372138..79983c8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,9 +7,9 @@ Uploaders:
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  @cdbs@,
- ocaml-findlib (>= 1.2.4),
- libzip-ocaml-dev (>= 1.04-2),
- dh-ocaml
+ ocaml-findlib (>= 1.2.5),
+ libzip-ocaml-dev (>= 1.04-6~),
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
 XS-Autobuild: yes
 Homepage: http://www.coherentgraphics.co.uk/camlpdf.html
@@ -19,9 +19,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git
 Package: libcamlpdf-ocaml-dev
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
- libzip-ocaml-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Description: library for reading, writing and manipulating PDF files and data
  CamlPDF consists of a set of low level modules for representing,
diff --git a/debian/rules b/debian/rules
index dba7578..92d22b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,11 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 # Then check manually if everything's ok
 
 DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
-DEB_MAKE_INSTALL_TARGET := 
+DEB_MAKE_INSTALL_TARGET :=
 DEB_MAKE_CLEAN_TARGET   := clean clean-doc
 DEB_MAKE_BUILD_TARGET := byte-code-library
 
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes) 
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
         DEB_MAKE_BUILD_TARGET += native-code-library
 endif
 

-- 
camlpdf packaging