[Pkg-ocaml-maint-commits] [coinst] 04/12: Import new upstream release

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository coinst.

commit 92846e65df1c65c0bf87b8d4044d86179e5ae779
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Jan 16 11:37:06 2014 +0100

    Import new upstream release
---
 debian/changelog          |  6 +++++-
 debian/patches/make_byte  | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/make_clean | 20 ++++++++------------
 debian/patches/series     |  1 +
 debian/rules              |  6 +-----
 5 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf3bf30..9e9e91f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-coinst (1.01-3) UNRELEASED; urgency=low
+coinst (1.9.0-1) UNRELEASED; urgency=low
 
   [ Ralf Treinen ]
   * debian/rules: use $(OCAML_HAVE_OCAMLOPT) to distinguish native from
@@ -7,6 +7,10 @@ coinst (1.01-3) UNRELEASED; urgency=low
   [ Mehdi Dogguy ]
   * Update debian/gbp.conf to automatically filter "migration-reports"
     and "snapshots" directories upon import using git-import-orig.
+  * Import new upstream release
+    - Update debian/patches/make_clean
+    - Update debian/patches/make_coinst
+    - Add debian/patches/make_byte
 
  -- Ralf Treinen <treinen at debian.org>  Thu, 02 Feb 2012 15:41:15 +0100
 
diff --git a/debian/patches/make_byte b/debian/patches/make_byte
new file mode 100644
index 0000000..f1a9e0b
--- /dev/null
+++ b/debian/patches/make_byte
@@ -0,0 +1,47 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,25 +18,43 @@
+        repository.cmx quotient.cmx conflicts.cmx graph.cmx coinst_common.cmx
+ COMPFLAGS=-package unix,str,bigarray,cudf -g -I viewer
+ OPTLINKFLAGS=$(COMPFLAGS) -linkpkg
++BYTELINKFLAGS=$(OPTLINKFLAGS) -dllib -lbytearray_stubs -cclib -lbytearray_stubs -dllib -ltask_stubs -cclib -ltask_stubs
+ 
+ OCAMLDEP=ocamlfind ocamldep
+ DEPFLAGS = -package js_of_ocaml,js_of_ocaml.syntax -syntax camlp4o -I viewer
+ 
+ all: $(COINST) $(UPGRADE) $(TRANS)
++opt: all
++byte: dllbytearray_stubs.so dlltask_stubs.so $(COINST).byte $(UPGRADE).byte $(TRANS).byte
++
++dllbytearray_stubs.so: bytearray_stubs.o
++	ocamlmklib -o bytearray_stubs $^
++
++dlltask_stubs.so: task_stubs.o
++	ocamlmklib -o task_stubs $^
+ 
+ $(COINST): $(OBJS) cudf_lib.cmx coinst.cmx
+ 	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
+ 
+ $(COINST).byte: $(OBJS:.cmx=.cmo) cudf_lib.cmo coinst.cmo
+-	$(OCAMLC) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
++	$(OCAMLC) -o $@  $(BYTELINKFLAGS) $^ $(LINKFLAGS)
++	cp $@ $(COINST)
+ 
+ 
+ $(UPGRADE): $(OBJS) $(TASK) $(SVG) upgrade_common.cmx upgrade.cmx upgrade_main.cmx
+ 	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
+ 
++$(UPGRADE).byte: $(OBJS:.cmx=.cmo) $(TASK:.cmx=.cmo) $(SVG:.cmx=.cmo)  upgrade_common.cmo upgrade.cmo upgrade_main.cmo
++	$(OCAMLC) -o $@  $(BYTELINKFLAGS) $^ $(LINKFLAGS)
++	cp $@ $(UPGRADE)
++
+ $(TRANS): $(OBJS) $(TASK) $(SVG) update_data.cmx upgrade_common.cmx upgrade.cmx horn.cmx transition.cmx
+ 	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
+ 
++$(TRANS).byte: $(OBJS:.cmx=.cmo) $(TASK:.cmx=.cmo) $(SVG:.cmx=.cmo) update_data.cmo upgrade_common.cmo upgrade.cmo horn.cmo transition.cmo
++	$(OCAMLC) -o $@  $(BYTELINKFLAGS) $^ $(LINKFLAGS)
++	cp $@ $(TRANS)
++
+ clean::
+ 	rm -f $(COINST) $(UPGRADE) $(TRANS) $(COINST).byte $(UPGRADE).byte $(TRANS).byte
+ 
diff --git a/debian/patches/make_clean b/debian/patches/make_clean
index 3f3d224..3487e60 100644
--- a/debian/patches/make_clean
+++ b/debian/patches/make_clean
@@ -1,10 +1,8 @@
 Author: Ralf Treinen <treinen at debian.org>
 Description: remove all generated files in clean target
 
-Index: coinst/viewer/Makefile
-===================================================================
---- coinst.orig/viewer/Makefile	2012-01-21 21:46:44.000000000 +0100
-+++ coinst/viewer/Makefile	2012-01-21 22:05:05.000000000 +0100
+--- a/viewer/Makefile
++++ b/viewer/Makefile
 @@ -38,8 +38,9 @@
  	rm -f dot_parser.ml dot_parser.mli dot_lexer.ml
  
@@ -16,16 +14,14 @@ Index: coinst/viewer/Makefile
  
  #####
  
-Index: coinst/Makefile
-===================================================================
---- coinst.orig/Makefile	2012-01-21 21:46:44.000000000 +0100
-+++ coinst/Makefile	2012-01-21 22:01:30.000000000 +0100
-@@ -19,7 +19,7 @@
- 	$(OCAMLC) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
+--- a/Makefile
++++ b/Makefile
+@@ -38,7 +38,7 @@
+ 	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
  
  clean::
--	rm -f $(COINST)
-+	rm -f $(COINST) $(COINST).byte
+-	rm -f $(COINST) $(UPGRADE) $(TRANS)
++	rm -f $(COINST) $(UPGRADE) $(TRANS) $(COINST).byte $(UPGRADE).byte $(TRANS).byte
  
  #####
  
diff --git a/debian/patches/series b/debian/patches/series
index 4182f16..8cea07c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 make_clean
 make_viewer_byte
+make_byte
diff --git a/debian/rules b/debian/rules
index 7f5c122..0ce6814 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,10 @@ include /usr/share/ocaml/ocamlvars.mk
 	dh $@ --with ocaml
 
 override_dh_auto_build:
+	$(MAKE) $(OCAML_BEST)
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	$(MAKE)
 	cd viewer && make coinst_viewer
 else
-	$(MAKE) coinst.byte
-	ln coinst.byte coinst
 	cd viewer && make coinst_viewer.byte
 	ln viewer/coinst_viewer.byte viewer/coinst_viewer
 endif
@@ -19,5 +17,3 @@ endif
 override_dh_auto_clean:
 	make clean
 	cd viewer && make clean
-
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git