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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit d4a86795269af0f23f5cda8535ef84f034757644
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Tue May 12 10:43:34 2009 +0200

    Make jc_act and jc_env fit in the pack

diff --git a/debian/changelog b/debian/changelog
index a69b521..024c705 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ why (2.18.dfsg-3) UNRELEASED; urgency=low
   * 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
+    - Make jc_ast and jc_env fit in the pack
     - 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/patches/jessie_lib.dpatch b/debian/patches/jessie_lib.dpatch
index c24be24..500fd26 100755
--- a/debian/patches/jessie_lib.dpatch
+++ b/debian/patches/jessie_lib.dpatch
@@ -5,8 +5,8 @@
 
 @DPATCH@
 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
+--- why~/Makefile.in	2009-04-07 11:16:31.000000000 +0200
++++ why/Makefile.in	2009-05-12 10:41:37.000000000 +0200
 @@ -146,9 +146,9 @@
        $(SIMPLIFY2WHY) $(WHYSTAT) $(TOOLSTAT)
  
@@ -19,16 +19,27 @@ diff -urNad why~/Makefile.in why/Makefile.in
  endif
  
  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
+@@ -269,15 +269,14 @@
  
--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 $^
+ # jessie
+ JCCML_EXPORT = src/lib.ml src/rc.ml src/loc.ml src/pp.ml src/option_misc.ml \
+-	jc/jc_type_var.ml jc/output.ml \
++	jc/jc_type_var.ml jc/jc_env.ml jc/output.ml \
+ 	jc/jc_common_options.ml jc/jc_stdlib.ml \
+-	jc/jc_envset.ml jc/jc_region.ml jc/jc_fenv.ml jc/jc_constructors.ml \
++	jc/jc_envset.ml jc/jc_region.ml jc/jc_ast.ml jc/jc_fenv.ml jc/jc_constructors.ml \
+ 	jc/jc_pervasives.ml jc/jc_iterators.ml \
+ 	jc/jc_output_misc.ml jc/jc_poutput.ml jc/jc_output.ml jc/jc_noutput.ml
+ JCCMO_EXPORT = $(JCCML_EXPORT:.ml=.cmo)
+ JCCMX_EXPORT = $(JCCML_EXPORT:.ml=.cmx)
+-JCCMI_EXPORT = $(JCCML_EXPORT:.ml=.cmi) \
+-	jc/jc_ast.cmi jc/jc_env.cmi
++JCCMI_EXPORT = $(JCCML_EXPORT:.ml=.cmi)
  
--jc/jc.cmx: $(JCCMX_EXPORT)
-+jc/jc.cmx: jc/jc_ast.cmi jc/jc_env.cmi $(JCCMX_EXPORT)
+ JCCMO = src/version.cmo \
+ 	@ATPCMO@ $(JCCMO_EXPORT) \
+@@ -311,6 +310,12 @@
+ jc/jc.cmx: $(JCCMX_EXPORT)
  	$(OCAMLOPT) $(OFLAGS) -pack -o $@ $^
  
 +jc/jc.cma: jc/jc.cmo
diff --git a/debian/rules b/debian/rules
index faa3584..5881d90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ include /usr/share/coq/coqvars.mk
 
 WHYDIR    = $(CURDIR)/debian/why
 VERSION   = $(shell cat Version | grep ^VERSION | cut -d= -f 2)
+MLBACKUP  = jc/jc_ast jc/jc_env
 
 OCAMLINIT_SED += -e 's/@VERSION@/$(VERSION)/g'
 
@@ -31,6 +32,9 @@ config.status: configure
 	    --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
 	    LDFLAGS="-Wl,-z,defs"
 	cp .depend .depend.debian
+	for i in $(MLBACKUP); do \
+		mv $$i.mli $$i.ml; \
+	done
 
 build: ocamlinit patch-stamp build-stamp
 build-stamp: config.status
@@ -45,6 +49,9 @@ clean: unpatch ocamlinit-clean
 	[ ! -f Makefile.debian ] || $(MAKE) -f Makefile.debian clean
 	-cp lib/coq/WhyCoq8.v lib/coq/WhyCoqCompat.v
 	[ ! -f .depend.debian ]  || mv .depend.debian .depend
+	for i in $(MLBACKUP); do \
+		[ ! -f $$i.ml ] || mv $$i.ml $$i.mli; \
+	done
 	$(RM) -f lib/coq/*.glob
 	dh_clean
 
@@ -56,7 +63,7 @@ install: build
 	$(MAKE) prefix=$(WHYDIR)/usr install COQLIB=$(CURDIR)/debian/libwhy-coq/$(COQ_STDLIB_DIR)
 	#-rm -f $(WHYDIR)/usr/lib/coq/jessie_why.v
 	#Used to remove jessie_why.v which is alone in /usr/lib/coq/
-	-rm -rf $(WHYDIR)/usr/lib/coq/
+	-$(RM) -rf $(WHYDIR)/usr/lib/coq/
 	mv $(WHYDIR)/usr/lib/why/why-logo-1.png $(WHYDIR)/usr/share/why
 	echo 'F:OCamlRuntime=$(OCAML_RUNTIME_NOX)' >> debian/libjessie-ocaml-dev.substvars
 	echo 'F:CoqABI=$(COQ_ABI)' >> debian/libwhy-coq.substvars

-- 
why packaging