[Pkg-ocaml-maint-commits] [SCM] ulex packaging branch, master, updated. debian/1.1-1-7-gb38801f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 52740600fd2fce6799186cc6a9abf6e198670734
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Apr 20 14:47:34 2010 +0200

    Use dh-ocaml for dependency generation

diff --git a/debian/control b/debian/control
index 0bda325..9bf6712 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stefano Zacchiroli <zack at debian.org>
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 7.1.0~),
  ocaml-nox (>= 3.11),
  camlp4,
  camlp4-extra,
  ocaml-findlib (>= 1.2.4),
- dh-ocaml (>= 0.4),
+ dh-ocaml (>= 0.9),
  dpatch,
  cdbs
 Standards-Version: 3.8.0
@@ -20,10 +20,11 @@ Homepage: http://www.cduce.org/download.html#side
 Package: ocaml-ulex
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
- camlp4-${F:OCamlABI},
  ocaml-findlib,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml lexer generator with Unicode support
  ulex is a lexer generator for the Objective Caml (OCaml) programming
  language.
@@ -34,4 +35,4 @@ Description: OCaml lexer generator with Unicode support
  Generated lexers work with a new kind of "lexbuf" that supports
  Unicode; a single lexer can work with arbitrary encodings of the input
  stream.
- 
+
diff --git a/debian/rules b/debian/rules
index 029ad34..c0a386b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
 PKGNAME = ocaml-ulex
 OCAML_OCAMLDOC_PACKAGES = $(PKGNAME)
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
+OCAML_DHOCAML_FLAGS = --runtime-map=ocaml-ulex
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::

-- 
ulex packaging