[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.09.3.3-1-11-gc8d5522

[Hendrik Tews]

The following commit has been merged in the master branch:
commit bf5b936d40c32c4642d42fc8ed877c5c7b43451c
Author: Hendrik Tews <hendrik at askra.de>
Date:   Wed Feb 1 13:21:27 2012 +0100

    debhelper compat level 8
    use OCAML_ABI from ocamlvars.mk

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index baccf0f..a574afe 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders:
 Build-Depends:
  ocaml-nox (>= 3.11.1-3~),
  ocaml-best-compilers,
- debhelper (>= 7.2.11~),
+ debhelper (>= 8),
  dh-ocaml (>= 0.9~),
  camlp4-extra (>= 3.12.1),
  camlp4-extra (<< 3.13)
diff --git a/debian/rules b/debian/rules
index a708a7b..9335f8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,12 +7,12 @@
 # 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
+#export DH_VERBOSE=1
 
-OCAMLABI:=$(shell ocamlc -version)
+include /usr/share/ocaml/ocamlvars.mk
 
 %:
-	dh --with ocaml $@
+	dh $@ --with ocaml
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
@@ -20,7 +20,7 @@ override_dh_auto_configure:
 
 .PHONY: override_dh_gencontrol
 override_dh_gencontrol:
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:

-- 
otags packaging