[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, master, updated. debian/0.91-2-9-g5d748c8

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 227476e106d76f90afb8c3b6e2748e94559fb1e1
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Apr 16 00:47:43 2011 +0200

    Add patch to fix FTBFS on bytecode architectures.
    
     - 0004-Add-rules-and-targets-for-gui.byte.patch

diff --git a/debian/changelog b/debian/changelog
index 0aa6780..e509e25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alt-ergo (0.93-2) unstable; urgency=low
+
+  * Add patch to fix FTBFS on bytecode architectures.
+    - 0004-Add-rules-and-targets-for-gui.byte.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 16 Apr 2011 00:47:04 +0200
+
 alt-ergo (0.93-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch b/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
new file mode 100644
index 0000000..75d9235
--- /dev/null
+++ b/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
@@ -0,0 +1,54 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sat, 16 Apr 2011 00:46:35 +0200
+Subject: [PATCH] Add rules and targets for gui.byte
+
+---
+ Makefile.in |   13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7730838..b2dcc53 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -62,11 +62,13 @@ BIBBYTE=nums.cma graph.cma unix.cma
+ BIBOPT=$(BIBBYTE:.cma=.cmxa)
+ 
+ BIBGUIOPT=threads.cmxa lablgtk.cmxa lablgtksourceview2.cmxa gtkThread.cmx 
++BIBGUIBYTE=threads.cma lablgtk.cma lablgtksourceview2.cma gtkThread.cmo
+ 
+ # main target
+ #############
+ 
+ NAME = alt-ergo
++GUINAME = altgr-ergo
+ BYTE=$(NAME).byte
+ OPT=$(NAME).opt
+ 
+@@ -123,10 +125,16 @@ $(NAME).opt: $(MAINCMX)
+ 	$(if $(QUIET), at echo 'Linking $@' &&) 
+ 	$(OCAMLOPT) $(OFLAGS) -o $@ $(BIBOPT) $^
+ 
+-gui: $(GUICMX)
++$(GUINAME).byte: $(GUICMO)
++	$(if $(QUIET), at echo 'Linking $@' &&)
++	$(OCAMLC) $(OFLAGS) -o $@ $(BIBBYTE) $(BIBGUIBYTE) $^
++
++$(GUINAME).opt: $(GUICMX)
+ 	$(if $(QUIET), at echo 'Linking $@' &&) 
+-	$(OCAMLOPT) $(OFLAGS) -o altgr-ergo.opt $(BIBOPT) $(BIBGUIOPT) $^
++	$(OCAMLOPT) $(OFLAGS) -o $@ $(BIBOPT) $(BIBGUIOPT) $^
+ 
++$(GUINAME): $(GUINAME).$(OCAMLBEST)
++	cp $^ $@
+ 
+ run: $(MAINCMX)
+ 	$(OCAMLOPT) -ccopt -static $(OFLAGS) -o $@ $(BIBOPT) $^
+@@ -369,6 +377,7 @@ clean::
+ 	@rm -f *.cm[iox] *.o *~ *.annot *.owz *mlocamlwizard_tmp_file*
+ 	@rm -f $(GENERATED) *.output
+ 	@rm -f $(NAME).byte $(NAME).opt
++	@rm -f $(GUINAME) $(GUINAME).opt $(GUINAME).byte
+ 	@rm -f unittest/*.cm[iox] unittest/*.o unittest/*.annot
+ 	@rm -f *.aux *.log $(NAME).tex $(NAME).dvi $(NAME).ps
+ 	@rm -f version.ml
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 179c211..afa39f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-No-need-to-activate-debug-flag.patch
 0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
 0003-Fix-a-typo.patch
+0004-Add-rules-and-targets-for-gui.byte.patch

-- 
alt-ergo packaging