[Pkg-ocaml-maint-commits] [SCM] coinst packaging branch, master, updated. debian/1.01-1-7-gcfe1a56

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 163d5a9d6527d7264219fa5ab296beae3a189783
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat Jan 21 22:12:09 2012 +0100

    build viewer in bytecode

diff --git a/debian/changelog b/debian/changelog
index cce0797..5522410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 coinst (1.01-2) UNRELEASED; urgency=low
 
   * Rename patch clean_viewer to make-clean, also clean coinst.byte.
-  * debian/rules: build bytecode coinst on non-native architectures.
+  * debian/rules: build bytecode on non-native architectures (closes: #656730)
 
  -- Ralf Treinen <treinen at debian.org>  Sat, 21 Jan 2012 21:58:07 +0100
 
diff --git a/debian/patches/make_viewer_byte b/debian/patches/make_viewer_byte
new file mode 100644
index 0000000..c1c4e66
--- /dev/null
+++ b/debian/patches/make_viewer_byte
@@ -0,0 +1,18 @@
+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 @@
+ coinst_viewer: $(OBJS)
+ 	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^
+ 
++coinst_viewer.byte: $(OBJS:.cmx=.cmo)
++	$(OCAMLC) -o $@  $(OPTLINKFLAGS) $^
++
+ coinst_converter: $(CONVERTER)
+ 	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^
+ 
diff --git a/debian/rules b/debian/rules
index 54aa9c0..f89f6d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,14 @@ OPTCOMPILER=/usr/bin/ocamlopt
 override_dh_auto_build:
 	if [ -x $(OPTCOMPILER) ]; then \
                 $(MAKE);\
-		cd viewer && make;\
+		cd viewer;\
+		make coinst_viewer;\
         else\
 		$(MAKE) byte;\
 		ln coinst.byte coinst;\
+		cd viewer;\
+		make coinst_viewer.byte;\
+		ln coinst_viewer.byte coinst_viewer;\
         fi
 
 override_dh_auto_clean:

-- 
coinst packaging