[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, experimental/master, updated. debian/0.94-2-37-g7010c52

[Ralf Treinen]

The following commit has been merged in the experimental/master branch:
commit 65ccba7f42b20e06671f9026525968c035c1483d
Author: Ralf Treinen <treinen at debian.org>
Date:   Fri Apr 12 15:11:57 2013 +0200

    improve patch 0004

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
index 6666e44..2acea51 100644
--- a/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
+++ b/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
@@ -5,8 +5,8 @@ Forwarded: https://gforge.inria.fr/tracker/index.php?func=detail&aid=15593&group
 
 Index: alt-ergo/Makefile.in
 ===================================================================
---- alt-ergo.orig/Makefile.in	2013-04-09 15:13:30.000000000 +0200
-+++ alt-ergo/Makefile.in	2013-04-09 15:13:57.000000000 +0200
+--- alt-ergo.orig/Makefile.in	2013-04-12 15:06:08.000000000 +0200
++++ alt-ergo/Makefile.in	2013-04-12 15:09:59.000000000 +0200
 @@ -70,6 +70,7 @@
  #############
  
@@ -15,7 +15,7 @@ Index: alt-ergo/Makefile.in
  LIBNAME = altErgo
  BYTE=$(NAME).byte
  OPT=$(NAME).opt
-@@ -148,23 +149,24 @@
+@@ -148,23 +149,23 @@
  	$(if $(QUIET), at echo 'Linking $@' &&) 
  	$(OCAMLOPT) $(OFLAGS) -o $@ $(BIBOPT) $^
  
@@ -23,22 +23,21 @@ Index: alt-ergo/Makefile.in
 -
 -ifeq ($(ENABLEGUI),yes)
 -gui: altgr-ergo.opt
--
--altgr-ergo.opt: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
 +$(GUINAME).opt: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
- 	$(if $(QUIET), at echo 'Linking $@' &&) 
- 	$(OCAMLOPT) $(OFLAGS) -o altgr-ergo.opt $(BIBOPT) $(BIBGUIOPT) $^
-+
-+$(GUINAME).byte: $(PRECMO) $(OPTIONSCMO) $(GUICMO)
 +	$(if $(QUIET), at echo 'Linking $@' &&) 
-+	$(OCAMLC) $(BFLAGS) -o altgr-ergo.byte $(BIBBYTE) $(BIBGUIBYTE) $^
++	$(OCAMLOPT) $(OFLAGS) -o $(GUINAME).opt $(BIBOPT) $(BIBGUIOPT) $^
+ 
+-altgr-ergo.opt: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
++$(GUINAME).byte: $(PRECMO) $(OPTIONSCMO) $(GUICMO)
+ 	$(if $(QUIET), at echo 'Linking $@' &&) 
+-	$(OCAMLOPT) $(OFLAGS) -o altgr-ergo.opt $(BIBOPT) $(BIBGUIOPT) $^
++	$(OCAMLC) $(BFLAGS) -o $(GUINAME).byte $(BIBBYTE) $(BIBGUIBYTE) $^
 +
 +ifeq ($(ENABLEGUI),yes)
-+gui $(GUINAME): $(GUINAME).$(OCAMLBEST)
-+	cp $^ $@
++gui: $(GUINAME).$(OCAMLBEST)
  else
 -gui: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
-+gui $(GUINAME):
++gui:
  	@echo "gui compilation skipped (lablgtksourceview not detected)"
  endif
  
@@ -50,7 +49,7 @@ Index: alt-ergo/Makefile.in
  
  test: $(NAME).$(OCAMLBEST)
  	[ ! -f test.mlw ] || ./$^ test.mlw
-@@ -244,7 +246,7 @@
+@@ -244,7 +245,7 @@
  	mkdir -p $(BINDIR)
  	cp -f $(NAME).$(OCAMLBEST) $(BINDIR)/$(NAME)$(EXE)
  ifeq ($(ENABLEGUI),yes)
@@ -59,7 +58,7 @@ Index: alt-ergo/Makefile.in
  	mkdir -p $(DATADIR)/gtksourceview-2.0/language-specs
  	cp -f util/gtk-lang/alt-ergo.lang $(DATADIR)/gtksourceview-2.0/language-specs/alt-ergo.lang
  endif
-@@ -399,6 +401,7 @@
+@@ -399,10 +400,10 @@
  	@rm -f *.cm[ioxt] *.cmti *.o *~ *.annot *.owz *mlocamlwizard_tmp_file*
  	@rm -f $(GENERATED) *.output
  	@rm -f $(NAME).byte $(NAME).opt
@@ -67,3 +66,7 @@ Index: alt-ergo/Makefile.in
  	@rm -f unittest/*.cm[iox] unittest/*.o unittest/*.annot
  	@rm -f *.aux *.log $(NAME).tex $(NAME).dvi $(NAME).ps
  	@rm -f version.ml
+-	@rm -f altgr-ergo.opt
+ 	@rm -f *.$(REVISIONSUFFIX)
+ 
+ dist-clean distclean:: clean
diff --git a/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch b/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch
index 50dab7b..4902e37 100644
--- a/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch
+++ b/debian/patches/0008-Split-install-pack-into-two-separate-targets-opt-and.patch
@@ -4,9 +4,9 @@ Subject: Split install-pack into two separate targets (opt and byte)
 
 Index: alt-ergo/Makefile.in
 ===================================================================
---- alt-ergo.orig/Makefile.in	2013-04-09 10:55:16.000000000 +0200
-+++ alt-ergo/Makefile.in	2013-04-09 10:56:25.000000000 +0200
-@@ -257,14 +257,22 @@
+--- alt-ergo.orig/Makefile.in	2013-04-12 15:10:39.000000000 +0200
++++ alt-ergo/Makefile.in	2013-04-12 15:10:40.000000000 +0200
+@@ -256,14 +256,22 @@
  	cp -f util/gtk-lang/alt-ergo.lang $(DATADIR)/gtksourceview-2.0/language-specs/alt-ergo.lang
  endif
  

-- 
alt-ergo packaging