[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090901+beryllium+dfsg-2-13-g9f4d396

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 08f8f699fa27c014a0ceeb3fa22fe404443365e2
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 10 16:36:58 2010 +0100

    Run dh using "--with ocaml" to trigger dh-ocaml sequence

diff --git a/debian/changelog b/debian/changelog
index e20d3fd..4e8cafd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ frama-c (20090902+beryllium+dfsg-1) UNRELEASED; urgency=low
   * Update copyright file
   * Remove libjessie-ocaml-dev from build-deps (Why is not needed anymore
     to build Frama-C).
+  * Run dh using "--with ocaml" to trigger dh-ocaml sequence
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sun, 10 Jan 2010 15:56:17 +0100
 
diff --git a/debian/rules b/debian/rules
index 33970cc..df05ac3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,11 @@
 
 export DH_VERBOSE=1
 
-include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/ocaml/ocamlvars.mk
 
 FRAMA_DIR=$(CURDIR)/debian/frama-c
 
-override_dh_auto_configure: ocamlinit-stamp
+override_dh_auto_configure:
 	mkdir -p lib/plugins
 	mkdir -p lib/gui
 	touch .depend .make-clean .make-clean-stamp
@@ -41,11 +41,11 @@ ifdef OCAML_OPT_ARCH
 	dh_strip -X frama-c-gui.byte -X frama-c.byte
 endif
 
-override_dh_auto_clean: ocamlinit-clean
+override_dh_auto_clean:
 	touch .depend
 	[ ! -f src/kernel/config.ml.debian ] || mv src/kernel/config.ml.debian src/kernel/config.ml
 	[ ! -f Makefile -o ! -f share/Makefile.config ] || $(MAKE) clean
 	$(RM) -rf lib .depend
 
 %:
-	dh --with quilt $@
+	dh --with quilt,ocaml $@

-- 
frama-c packaging