[Pkg-ocaml-maint-commits] [coinst] 06/12: Install coinst_converter and jsviewer.js

[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 a0a7d687e2693b96d6b5a5740f3fe059840d1df7
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Jan 16 14:34:40 2014 +0100

    Install coinst_converter and jsviewer.js
---
 debian/changelog                |  4 ++++
 debian/coinst-viewer.dirs       |  1 +
 debian/coinst-viewer.install    |  4 +++-
 debian/patches/make_viewer_byte | 29 ++++++++++++++++++++++++-----
 debian/rules                    |  7 +++----
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 584c40a..a1b3060 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,12 @@ coinst (1.9.0-1) UNRELEASED; urgency=low
   * Import new upstream release
     - Update debian/patches/make_clean
     - Update debian/patches/make_coinst
+    - Update debian/patches/make_viewer_byte in order to build coinst_converter.byte
+      as well on bytecode architectures.
     - Add debian/patches/make_byte
   * Install comigrate and coinst-upgrades utilities.
+  * Install coinst_converter and jsviewer.js in the coinst-viewer package
+    (Closes: #665447).
 
  -- Ralf Treinen <treinen at debian.org>  Thu, 02 Feb 2012 15:41:15 +0100
 
diff --git a/debian/coinst-viewer.dirs b/debian/coinst-viewer.dirs
new file mode 100644
index 0000000..1158c2d
--- /dev/null
+++ b/debian/coinst-viewer.dirs
@@ -0,0 +1 @@
+usr/share/coinst-viewer
diff --git a/debian/coinst-viewer.install b/debian/coinst-viewer.install
index 07aa5f1..645c087 100644
--- a/debian/coinst-viewer.install
+++ b/debian/coinst-viewer.install
@@ -1 +1,3 @@
-viewer/coinst_viewer		/usr/bin
+viewer/coinst_viewer		usr/bin
+viewer/coinst_converter		usr/bin
+viewer/jsviewer.js		usr/share/coinst-viewer
diff --git a/debian/patches/make_viewer_byte b/debian/patches/make_viewer_byte
index c1c4e66..e4c3070 100644
--- a/debian/patches/make_viewer_byte
+++ b/debian/patches/make_viewer_byte
@@ -2,11 +2,15 @@ Author: Ralf Treinen <treinen at debian.org>
 Description: add target for building viewer in bytecode
 Debian-bug:  #656730
 
-Index: coinst/viewer/Makefile
-===================================================================
---- coinst.orig/viewer/Makefile	2012-01-21 22:01:30.000000000 +0100
-+++ coinst/viewer/Makefile	2012-01-21 22:04:02.000000000 +0100
-@@ -25,6 +25,9 @@
+--- a/viewer/Makefile
++++ b/viewer/Makefile
+@@ -21,13 +21,21 @@
+ LINKFLAGS=-package js_of_ocaml -linkpkg
+ 
+ all: coinst_viewer jsviewer.js coinst_converter
++opt: all
++byte: coinst_viewer.byte jsviewer.js coinst_converter.byte
+ 
  coinst_viewer: $(OBJS)
  	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^
  
@@ -16,3 +20,18 @@ Index: coinst/viewer/Makefile
  coinst_converter: $(CONVERTER)
  	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^
  
++coinst_converter.byte: $(CONVERTER:.cmx=.cmo)
++	$(OCAMLC) -o $@  $(OPTLINKFLAGS) $^
++
+ jsviewer.js: jsviewer.byte
+ 	js_of_ocaml $^ -pretty
+ 
+@@ -38,7 +46,7 @@
+ 	rm -f dot_parser.ml dot_parser.mli dot_lexer.ml
+ 
+ clean::
+-	rm -f coinst_converter coinst_viewer coinst_viewer.byte
++	rm -f coinst_converter coinst_viewer coinst_viewer.byte coinst_converter.byte
+ 	rm -f jsviewer.js jsviewer.byte
+ 	rm -f dot_lexer.ml dot_parser.ml
+ 
diff --git a/debian/rules b/debian/rules
index 0ce6814..0ff38e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,10 @@ include /usr/share/ocaml/ocamlvars.mk
 
 override_dh_auto_build:
 	$(MAKE) $(OCAML_BEST)
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	cd viewer && make coinst_viewer
-else
-	cd viewer && make coinst_viewer.byte
+	$(MAKE) -C viewer $(OCAML_BEST)
+ifeq ($(OCAML_HAVE_OCAMLOPT),no)
 	ln viewer/coinst_viewer.byte viewer/coinst_viewer
+	ln viewer/coinst_converter.byte viewer/coinst_converter
 endif
 
 override_dh_auto_clean:

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