[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090901+beryllium+dfsg-1-5-g6e558e7

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 4396974f7f0187f8bf085b79a9e4fdabd118d4bd
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Dec 1 23:34:30 2009 +0100

    Use new features of dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index dbd1a7d..4d9c579 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ frama-c (20090901+beryllium+dfsg-2) unstable; urgency=low
 
   * Fix watch file
   * Build-depend on lablgtk2 (>= 2.14)
+  * Use new features of dh-ocaml
 
- -- Mehdi Dogguy <mehdi at debian.org>  Tue, 01 Dec 2009 23:33:05 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 01 Dec 2009 23:34:01 +0100
 
 frama-c (20090901+beryllium+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a61c72e..390b4ec 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 7.0.50),
  ocaml-nox (>= 3.11.1),
  ocaml-best-compilers,
- dh-ocaml (>= 0.4.1),
+ dh-ocaml (>= 0.9),
  libocamlgraph-ocaml-dev (>= 1.2+debian),
  liblablgtk2-gnome-ocaml-dev (>= 2.14),
  liblablgtksourceview2-ocaml-dev (>= 2.14),
@@ -23,11 +23,11 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ ${ocaml:Depends},
  graphviz,
  why (>= 2.19+dfsg-2),
  gcc,
- emacs | emacsen,
- ${F:FramaCRuntime}
+ emacs | emacsen
 Recommends:
  alt-ergo,
  libwhy-coq
diff --git a/debian/rules b/debian/rules
index 6af6503..d7758cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,6 @@ override_dh_auto_install:
 	$(RM) -rf $(CURDIR)/debian/frama-c/usr/share/frama-c/why
 ifeq ($(OCAML_OPT_ARCH),)
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c.byte
-#	echo 'F:FramaCRuntime=liblablgtk2-gnome-ocaml,liblablgtksourceview-ocaml,ocaml-base-$(OCAML_ABI)' >> debian/frama-c.substvars
 endif
 
 override_dh_strip:

-- 
frama-c packaging