[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20081201.dfsg-2-4-g0068a1d

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 0068a1d0029f80a6b2ad709d996e1dd810f71740
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Fri Jul 10 20:09:24 2009 +0200

    Rebuild with OCaml 3.11.1

diff --git a/debian/changelog b/debian/changelog
index ec92090..ad673a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 frama-c (20081201.dfsg-3) unstable; urgency=low
 
   * Fix long description (Closes: #533158)
+  * Tighten build dependencies versions to ease OCaml 3.11.1 transition
+  * Rebuild with OCaml 3.11.1
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Mon, 15 Jun 2009 11:12:52 +0200
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Fri, 10 Jul 2009 20:07:12 +0200
 
 frama-c (20081201.dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a9f63f5..f7f5658 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Mehdi Dogguy <dogguy at pps.jussieu.fr>
 Build-Depends:
  debhelper (>= 7),
- ocaml-nox (>= 3.10),
+ ocaml-nox (>= 3.11.1),
  ocaml-best-compilers,
- dh-ocaml,
- libocamlgraph-ocaml-dev (>= 1.0-2),
- liblablgtk2-gnome-ocaml-dev,
- liblablgtksourceview-ocaml-dev,
+ dh-ocaml (>= 0.4.1),
+ libocamlgraph-ocaml-dev (>= 1.1-1),
+ liblablgtk2-gnome-ocaml-dev (>= 2.12.0-3),
+ liblablgtksourceview-ocaml-dev (>= 2.12.0-3),
  libjessie-ocaml-dev (>= 2.18.dfsg-4),
  docbook-xsl,
  docbook-xml,
@@ -32,7 +32,7 @@ Depends:
  why (>= 2.18.dfsg-4),
  gcc,
  emacs | emacsen,
- libocamlgraph-ocaml-dev (>= 1.0-2),
+ libocamlgraph-ocaml-dev (>= 1.1),
  ${F:FramaCRuntime}
 Description: Framework for source code analysis of software written in C
  Frama-C is a framework dedicated to the analysis of the source code
diff --git a/debian/rules b/debian/rules
index 74a56d3..c067945 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 export DH_VERBOSE=1
 
 include /usr/share/quilt/quilt.make
-include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/ocaml/ocamlinit.mk
 
 override_dh_auto_configure: ocamlinit-stamp
@@ -29,7 +28,7 @@ override_dh_auto_install:
 ifeq ($(OCAML_OPT_ARCH),)
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c.byte
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c-gui.byte
-	echo 'F:FramaCRuntime=liblablgtk2-gnome-ocaml,liblablgtksourceview-ocaml,$(OCAML_RUNTIME)' >> debian/frama-c.substvars
+	echo 'F:FramaCRuntime=liblablgtk2-gnome-ocaml,liblablgtksourceview-ocaml,ocaml-base-$(OCAML_ABI)' >> debian/frama-c.substvars
 endif
 
 override_dh_auto_clean: ocamlinit-clean

-- 
frama-c packaging