[Pkg-ocaml-maint-commits] [SCM] hol-light packaging branch, master, updated. debian/20120423-1-7-g452b483

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 074b903e7ec3efeb67abfa298a29dfdfd7fa7038
Author: Hendrik Tews <hendrik at askra.de>
Date:   Wed May 30 16:54:37 2012 +0200

    don't override dh_gencontrol

diff --git a/debian/changelog b/debian/changelog
index 29f1d31..34ccd6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
 hol-light (20120530-1) unstable; urgency=low
 
   * new upstream version revision 141 from 2012-05-30
-  * remove patches that have been applied upstream: 
+  * remove patches that have been applied upstream:
       adapt-holtest-for-debian and pa-j-makefile-fix
-  * adapt debian/copyright 
+  * adapt debian/copyright
+  * simplify debian/rules
 
- -- Hendrik Tews <hendrik at askra.de>  Wed, 30 May 2012 09:29:26 +0200
+ -- Hendrik Tews <hendrik at askra.de>  Wed, 30 May 2012 16:54:15 +0200
 
 hol-light (20120423-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 182fd58..e8b7c83 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Package: hol-light
 Architecture: any
 Depends:
  camlp5,
- ocaml-base-nox-${F:OCamlABI},
  ${ocaml:Depends},
  ${shlibs:Depends}, 
  ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index bba8111..ba5cc84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,8 @@
 # build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-#export DH_OPTIONS=-v 
-
-include /usr/share/ocaml/ocamlvars.mk
+# export DH_VERBOSE=1
+# export DH_OPTIONS=-v 
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -50,7 +48,3 @@ override_dh_auto_test:
 .PHONY: override_dh_ocaml
 override_dh_ocaml:
 	dh_ocaml --runtime-map hol-light
-
-.PHONY: override_dh_gencontrol
-override_dh_gencontrol:
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"

-- 
hol-light packaging