[Pkg-ocaml-maint-commits] [SCM] type-conv packaging branch, master, updated. debian/1.6.7-2-6-g48a71d9

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 39f5ec03c2fed9f82da8896761f6e12619cb4c9e
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Oct 13 21:22:29 2009 +0200

    Switch packaging to dh-ocaml 0.9

diff --git a/debian/control b/debian/control
index 3addaf1..1231a1a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,11 @@ Uploaders: Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <gildor at debian.
 Build-Depends:
  cdbs,
  debhelper (>= 7),
- ocaml-nox (>= 3.11),
- ocaml-findlib (>= 1.2.4),
+ ocaml-nox (>= 3.11.1-3~),
+ ocaml-findlib (>= 1.2.5),
  camlp4,
  camlp4-extra,
- dh-ocaml (>= 0.4)
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.0
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/type-conv.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/type-conv.git
@@ -20,10 +20,11 @@ Package: libtype-conv-camlp4-dev
 Section: libdevel
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
  ocaml-findlib,
- camlp4,
- ${shlibs:Depends}, ${misc:Depends}
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: support library for OCaml preprocessor type conversions
  The type-conv library factors out functionality needed by different
  CamlP4 extensions that generate code from type specifications.
diff --git a/debian/libtype-conv-camlp4-dev.ocamldoc b/debian/libtype-conv-camlp4-dev.ocamldoc
new file mode 100644
index 0000000..5376110
--- /dev/null
+++ b/debian/libtype-conv-camlp4-dev.ocamldoc
@@ -0,0 +1 @@
+ -package camlp4
diff --git a/debian/rules b/debian/rules
index a8dad08..25bfc1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,12 +7,11 @@ LIB_NAME = type-conv
 PKG_NAME = lib$(LIB_NAME)-camlp4-dev
 DESTDIR = $(CURDIR)/debian/$(PKG_NAME)$(OCAML_STDLIB_DIR)
 
-OCAML_OCAMLDOC_PACKAGES = $(PKG_NAME)
-OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package camlp4
-
 DEB_MAKE_BUILD_TARGET = all
 DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_INSTFLAGS="-destdir $(DESTDIR)"
 
+OCAML_DHOCAML_FLAGS := --runtime-map=libtype-conv-camlp4-dev
+
 build/$(PKG_NAME)::
 	mkdir -p $(DESTDIR)
 

-- 
type-conv packaging