[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/5.12-1-1-g4ff5455

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4ff5455e753661aa824967aba86d6cc17860b2d3
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 26 03:09:38 2009 +0200

    Update debian/{control,rules} to use new dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index 5d1cd9c..a17ac88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+camlp5 (5.12-2) UNRELEASED; urgency=low
+
+  * Update debian/{control,rules} to use new dh-ocaml
+
+ -- Stephane Glondu <steph at glondu.net>  Sun, 26 Jul 2009 03:21:37 +0200
+
 camlp5 (5.12-1) unstable; urgency=low
 
   * New upstream release, ready for OCaml 3.11.1 (Closes: #534924)
diff --git a/debian/control b/debian/control
index 06107ad..e1dedbd 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ DM-Upload-Allowed: yes
 Build-Depends:
  cdbs,
  debhelper (>= 7),
- dh-ocaml (>= 0.4),
+ dh-ocaml (>= 0.9),
  ocaml-nox (>= 3.11.1),
  ocaml-compiler-libs (>= 3.11.1)
 Standards-Version: 3.8.2
@@ -20,7 +20,12 @@ Homepage: http://pauillac.inria.fr/~ddr/camlp5/
 
 Package: camlp5
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-compiler-libs, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ocaml-compiler-libs,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Conflicts: ocaml-nox (<< 3.10.0)
 Description: Pre Processor Pretty Printer for OCaml - classical version
  Objective Caml (OCaml) is an implementation of the ML language,
diff --git a/debian/rules b/debian/rules
index 0b698b5..37ef181 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,9 @@ PKGNAME = camlp5
 OCAML_OCAMLDOC_PACKAGES = $(PKGNAME)
 OCAML_OCAMLDOC_FLAGS += -pp debian/camlp5r_w_macro.sh
 OCAML_OCAMLDOC_FLAGS += -I +compiler-libs/parsing/
+OCAML_DHOCAML_FLAGS += \
+  --runtime-map camlp5 \
+  --nodefined-map camlp5:Dynlinkaux,Dynlink
 
 CONFIGURE_FLAGS =
 CONFIGURE_FLAGS += -name $(PKGNAME)

-- 
camlp5 packaging