[Pkg-ocaml-maint-commits] [SCM] omake packaging branch, master, updated. debian/0.9.8.5-3-4-18-g6503605

[Stephane Glondu]

The following commit has been merged in the master branch:
commit d73d23c9a092db7c547b9530c2fa4afd82c3c8ea
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Apr 1 23:48:53 2009 +0200

    Add build-dependency on dh-ocaml and use ocamlvars.mk

diff --git a/debian/control b/debian/control
index 51c4919..6562743 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,15 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Mike Furr <mfurr at debian.org>, Stephane Glondu <steph at glondu.net>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox (>= 3.10.0), libfam-dev, libreadline5-dev, libncurses5-dev, dpatch
+Build-Depends:
+ debhelper (>= 4.0.0),
+ autotools-dev,
+ ocaml-nox (>= 3.10.0),
+ libfam-dev,
+ libreadline5-dev,
+ libncurses5-dev,
+ dpatch,
+ dh-ocaml
 Standards-Version: 3.7.2
 Homepage: http://omake.metaprl.org/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/omake.git
diff --git a/debian/rules b/debian/rules
index 0986879..e78aea6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,12 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAML_HAVE_OCAMLOPT := $(shell if test -x /usr/bin/ocamlopt ; then echo "yes" ; else echo "no" ; fi)
-
 PACKAGE=omake
 include /usr/share/dpatch/dpatch.make
-OCAMLABI = $(shell ocamlc -version)
+include /usr/share/ocaml/ocamlvars.mk
 
 build: build-stamp
 build-stamp: patch

-- 
omake packaging