[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.18.dfsg-2-7-gb37f40e

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit b37f40eb6f1b8c9b9553464835528805b2d803b8
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Fri May 8 11:32:25 2009 +0200

    Export Jc_ast in jessie library and install cmo and cmx

diff --git a/debian/changelog b/debian/changelog
index 6faf06a..a69b521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ why (2.18.dfsg-3) UNRELEASED; urgency=low
     Lintian.
   * Make a long description for libwhy-coq, closes: #524054.
   * Bump standards version to 3.8.1, no changes needed
+  * Jessie library: 
+    - export jc_ast and jc_env
+    - install jc.cmo and jc.cmx
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Thu, 16 Apr 2009 17:23:41 +0200
 
diff --git a/debian/libjessie-ocaml-dev.install.in b/debian/libjessie-ocaml-dev.install.in
index 028ce63..895dfd6 100644
--- a/debian/libjessie-ocaml-dev.install.in
+++ b/debian/libjessie-ocaml-dev.install.in
@@ -1,4 +1,6 @@
 jc/jc.cm*a @OCamlStdlibDir@/jessie/
+jc/jc.cmo @OCamlStdlibDir@/jessie/
 jc/jc.cmi @OCamlStdlibDir@/jessie/
 OPT: jc/jc.a @OCamlStdlibDir@/jessie/
+OPT: jc/jc.cmx @OCamlStdlibDir@/jessie/
 debian/META @OCamlStdlibDir@/jessie/
diff --git a/debian/patches/jessie_lib.dpatch b/debian/patches/jessie_lib.dpatch
index 334ba4a..c24be24 100755
--- a/debian/patches/jessie_lib.dpatch
+++ b/debian/patches/jessie_lib.dpatch
@@ -4,11 +4,11 @@
 ## DP: Install jessie library jc.{cma,a,cmxa,cmi} : build jc.{cma,cmxa,a} and install jc.cmi
 
 @DPATCH@
-diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in	2008-09-09 09:20:14.000000000 +0200
-+++ trunk/Makefile.in	2008-09-10 16:40:16.000000000 +0200
-@@ -160,9 +160,9 @@
-       $(SIMPLIFY2WHY) $(WHYSTAT) 
+diff -urNad why~/Makefile.in why/Makefile.in
+--- why~/Makefile.in	2009-05-08 11:11:29.000000000 +0200
++++ why/Makefile.in	2009-05-08 11:13:30.000000000 +0200
+@@ -146,9 +146,9 @@
+       $(SIMPLIFY2WHY) $(WHYSTAT) $(TOOLSTAT)
  
  ifeq ($(OCAMLBEST),opt)
 -JCLIB=jc/jc.cmo jc/jc.cmx
@@ -18,9 +18,17 @@ diff -urNad trunk~/Makefile.in trunk/Makefile.in
 +JCLIB=jc/jc.cma jc/jc.cmi jc/jc.cmo
  endif
  
- all: $(BINARY) check $(CADUCEUS) $(JESSIE) $(KRAKATOA) coq- at COQ@ pvs- at PVS@ $(TOOLS) gwhy- at LABLGTK2@ $(JCLIB) $(REGTEST)
-@@ -311,6 +311,12 @@
- jc/jc.cmx: $(JCCMX_EXPORT)
+ all: $(BINARY) $(WHYCONFIG) check $(CADUCEUS) $(JESSIE) $(KRAKATOA) coq- at COQ@ pvs- at PVS@ $(TOOLS) gwhy- at LABLGTK2@ $(JCLIB) $(REGTEST)
+@@ -305,12 +305,18 @@
+ atp/atp.cmo: 
+ 	make -C atp atp.cmo
+ 
+-jc/jc.cmi jc/jc.cmo: $(JCCMO_EXPORT)
++jc/jc.cmi jc/jc.cmo: jc/jc_ast.cmi jc/jc_env.cmi $(JCCMO_EXPORT)
+ 	$(OCAMLC) $(BFLAGS) -pack -o jc/jc.cmo $^
+ 
+-jc/jc.cmx: $(JCCMX_EXPORT)
++jc/jc.cmx: jc/jc_ast.cmi jc/jc_env.cmi $(JCCMX_EXPORT)
  	$(OCAMLOPT) $(OFLAGS) -pack -o $@ $^
  
 +jc/jc.cma: jc/jc.cmo

-- 
why packaging