[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, master, updated. debian/0.2.2.deb-1-3-gb5faaf4

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit b5faaf49f1051bf60ef0cdf7443d90a8786b0386
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Mon Jun 21 14:54:21 2010 +0200

    Use dh-ocaml to calculate dependencies

diff --git a/debian/changelog b/debian/changelog
index ecbdf29..6d40b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ coccinelle (0.2.2.deb-2) unstable; urgency=medium
   * Updated patches:
     - system-pycaml.diff - do not add pycaml to ocamldep include path,
       otherwise it tries to compile pycaml.ml
+  * Use dh-ocaml to calculate dependencies
 
- -- Євгеній Мещеряков <eugen at debian.org>  Mon, 21 Jun 2010 14:43:22 +0200
+ -- Євгеній Мещеряков <eugen at debian.org>  Mon, 21 Jun 2010 14:54:01 +0200
 
 coccinelle (0.2.2.deb-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e03ad87..c9f0ee6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Євгеній Мещеряков <eugen at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), ocaml-nox (>= 3.11.0), libpycaml-ocaml-dev, python,
- menhir (>= 20090204.dfsg), libmenhir-ocaml-dev (>= 20090204.dfsg), ocaml-findlib, dh-ocaml,
- ocaml-best-compilers, python-support (>= 0.6), libsexplib-camlp4-dev
+Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~), ocaml-nox (>= 3.11.1-3~),
+ libpycaml-ocaml-dev, python,  menhir (>= 20090204.dfsg), libmenhir-ocaml-dev (>= 20090204.dfsg),
+ ocaml-findlib, dh-ocaml,  ocaml-best-compilers, python-support (>= 0.6), libsexplib-camlp4-dev
 Standards-Version: 3.8.4
 Homepage: http://coccinelle.lip6.fr
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/coccinelle.git
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/coccinelle.git
 
 Package: coccinelle
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${F:OCamlRun}, ${python:Depends}, python-gobject,
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${ocaml:Depends}, ${python:Depends}, python-gobject,
  python-gtk2, python-glade2
 Suggests: vim-addon-manager
 Description: semantic patching tool for C
diff --git a/debian/rules b/debian/rules
index 78e4be0..69335cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,17 +13,15 @@ VIM_RDIR = $(CURDIR)/debian/coccinelle/usr/share/vim/registry
 COMMON_CONFIG = --prefix=/usr --with-python --without-trac
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-OCAMLRUN =
 CONFIG_FLAGS = $(COMMON_CONFIG) --opt
 MAKE_TGT = all.opt
 else
-OCAMLRUN = ocaml-base-nox-$(OCAML_ABI), pycaml (>= 0.82-10)
 CONFIG_FLAGS = $(COMMON_CONFIG) --no-opt
 MAKE_TGT = all
 endif
 
 build clean binary binary-arch binary-indep install:
-	dh $@
+	dh --with ocaml $@
 
 override_dh_auto_configure:
 	./configure $(CONFIG_FLAGS)
@@ -54,9 +52,5 @@ override_dh_auto_install:
 	# Emacs files
 	cp $(CURDIR)/editors/emacs/cocci.el $(CURDIR)/debian/coccinelle/usr/share/emacs/site-lisp/
 
-override_dh_gencontrol:
-	dh_gencontrol -a -- -VF:OCamlRun="$(OCAMLRUN)"
-
 .PHONY: build clean binary-indep binary-arch binary install
 .PHONY: override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install
-.PHONY: override_dh_gencontrol

-- 
Debian packaging for coccinelle