The following commit has been merged in the master branch:
commit 1a7dd595b1cb9db6da5981d73ab3cd782d272c5f
Author: Mehdi Dogguy <me...@dogguy.org>
Date:   Thu Dec 8 17:24:37 2011 +0100

    Update patches

diff --git a/debian/changelog b/debian/changelog
index 06a50d2..cd0bb2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 alt-ergo (0.94) unstable; urgency=low
 
   * New upstream release.
+  * Rebase patches
 
  -- Mehdi Dogguy <me...@debian.org>  Thu, 08 Dec 2011 17:18:57 +0100
 
diff --git a/debian/patches/0001-No-need-to-activate-debug-flag.patch 
b/debian/patches/0001-No-need-to-activate-debug-flag.patch
index bdefe04..33176bf 100644
--- a/debian/patches/0001-No-need-to-activate-debug-flag.patch
+++ b/debian/patches/0001-No-need-to-activate-debug-flag.patch
@@ -1,22 +1,22 @@
 From: Mehdi Dogguy <me...@debian.org>
 Date: Tue, 1 Jun 2010 20:41:04 +0200
-Subject: [PATCH] No need to activate debug flag
+Subject: No need to activate debug flag
 
 ---
  Makefile.in |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 84f46d5..82eab28 100644
+index 04a5b0e..80a4f4b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -54,7 +54,7 @@ EXE = @EXE@
+@@ -55,7 +55,7 @@ EXE = @EXE@
  
  INCLUDES = @OCAMLGRAPHLIB@ @LABLGTK2LIB@
  
--BFLAGS = -dtypes -g $(INCLUDES)
-+BFLAGS = -dtypes $(INCLUDES)
- OFLAGS = -dtypes $(INCLUDES)
+-BFLAGS = -dtypes -g $(INCLUDES) -annot
++BFLAGS = -dtypes $(INCLUDES) -annot
+ OFLAGS = -dtypes $(INCLUDES) -annot -for-pack AltErgo
  
- BIBBYTE=nums.cma graph.cma unix.cma
+ BIBBYTE = nums.cma graph.cma unix.cma
 -- 
diff --git 
a/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
 
b/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
index eb41420..831e2f9 100644
--- 
a/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
+++ 
b/debian/patches/0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
@@ -1,18 +1,19 @@
 From: Mehdi Dogguy <me...@debian.org>
 Date: Tue, 1 Jun 2010 21:08:31 +0200
-Subject: [PATCH] Do not run the test if test.mlw is absent and use best target 
(not opt)
+Subject: Do not run the test if test.mlw is absent and use best target (not
+ opt)
 
 ---
  Makefile.in |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 82eab28..7730838 100644
+index 80a4f4b..5cc8092 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -133,8 +133,8 @@ run: $(MAINCMX)
-       strip $@
-       tar -czvf alt-ergo.tgz run smt_prelude.mlw
+@@ -145,8 +145,8 @@ gui: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
+       $(if $(QUIET),@echo 'Linking $@' &&) 
+       $(OCAMLOPT) $(OFLAGS) -o altgr-ergo.opt $(BIBOPT) $(BIBGUIOPT) $^
  
 -test: $(OPT)
 -      ./$(OPT) test.mlw
diff --git a/debian/patches/0003-Fix-a-typo.patch 
b/debian/patches/0003-Fix-a-typo.patch
index 75f6bb5..fa3f261 100644
--- a/debian/patches/0003-Fix-a-typo.patch
+++ b/debian/patches/0003-Fix-a-typo.patch
@@ -1,22 +1,22 @@
 From: Mehdi Dogguy <me...@debian.org>
 Date: Tue, 1 Jun 2010 21:24:16 +0200
-Subject: [PATCH] Fix a typo
+Subject: Fix a typo
 
 ---
  cc.ml |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/cc.ml b/cc.ml
-index b048a13..6f874d4 100644
+index a647543..fc280cf 100644
 --- a/cc.ml
 +++ b/cc.ml
-@@ -63,7 +63,7 @@ module Make (X : Sig.X) = struct
-     let make_cst t ctx =
-       if ctx = [] then ()
-       else begin
--        fprintf fmt "[cc] contraints of make(%a)@." Term.print t;
-+        fprintf fmt "[cc] constraints of make(%a)@." Term.print t;
-         let c = ref 0 in
-         List.iter 
-           (fun a ->
+@@ -84,7 +84,7 @@ module Make (X : Sig.X) = struct
+       if debug_cc then 
+       if ctx = [] then ()
+       else begin
+-          fprintf fmt "[cc] contraints of make(%a)@." Term.print t;
++          fprintf fmt "[cc] constraints of make(%a)@." Term.print t;
+           let c = ref 0 in
+           List.iter 
+             (fun a ->
 -- 
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 75d9235..f1b8d74 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
@@ -1,49 +1,49 @@
 From: Mehdi Dogguy <me...@debian.org>
 Date: Sat, 16 Apr 2011 00:46:35 +0200
-Subject: [PATCH] Add rules and targets for gui.byte
+Subject: Add rules and targets for gui.byte
 
 ---
- Makefile.in |   13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
+ Makefile.in |   14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 7730838..b2dcc53 100644
+index 5cc8092..cc06315 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -62,11 +62,13 @@ BIBBYTE=nums.cma graph.cma unix.cma
- BIBOPT=$(BIBBYTE:.cma=.cmxa)
+@@ -63,11 +63,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
+ 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
+ LIBNAME = altErgo
  BYTE=$(NAME).byte
  OPT=$(NAME).opt
- 
-@@ -123,10 +125,16 @@ $(NAME).opt: $(MAINCMX)
+@@ -141,9 +143,16 @@ $(NAME).opt: $(PRECMX) $(OPTIONSCMX) $(MAINCMX)
        $(if $(QUIET),@echo 'Linking $@' &&) 
        $(OCAMLOPT) $(OFLAGS) -o $@ $(BIBOPT) $^
  
--gui: $(GUICMX)
-+$(GUINAME).byte: $(GUICMO)
-+      $(if $(QUIET),@echo 'Linking $@' &&)
-+      $(OCAMLC) $(OFLAGS) -o $@ $(BIBBYTE) $(BIBGUIBYTE) $^
-+
+-gui: $(PRECMX) $(OPTIONSCMX) $(GUICMX)
 +$(GUINAME).opt: $(GUICMX)
        $(if $(QUIET),@echo 'Linking $@' &&) 
 -      $(OCAMLOPT) $(OFLAGS) -o altgr-ergo.opt $(BIBOPT) $(BIBGUIOPT) $^
 +      $(OCAMLOPT) $(OFLAGS) -o $@ $(BIBOPT) $(BIBGUIOPT) $^
- 
-+$(GUINAME): $(GUINAME).$(OCAMLBEST)
++
++$(GUINAME).byte: $(GUICMO)
++      $(if $(QUIET),@echo 'Linking $@' &&)
++      $(OCAMLC) $(OFLAGS) -o $@ $(BIBBYTE) $(BIBGUIBYTE) $^
++
++gui: $(GUINAME).$(OCAMLBEST)
 +      cp $^ $@
  
- run: $(MAINCMX)
-       $(OCAMLOPT) -ccopt -static $(OFLAGS) -o $@ $(BIBOPT) $^
-@@ -369,6 +377,7 @@ clean::
+ test: $(NAME).$(OCAMLBEST)
+       [ ! -f test.mlw ] || ./$^ test.mlw
+@@ -351,6 +360,7 @@ clean::
        @rm -f *.cm[iox] *.o *~ *.annot *.owz *mlocamlwizard_tmp_file*
        @rm -f $(GENERATED) *.output
        @rm -f $(NAME).byte $(NAME).opt
diff --git 
a/debian/patches/0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch 
b/debian/patches/0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch
index 3426205..4ec3efb 100644
--- 
a/debian/patches/0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch
+++ 
b/debian/patches/0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch
@@ -1,6 +1,6 @@
 From: Mehdi Dogguy <me...@debian.org>
 Date: Sat, 16 Apr 2011 16:26:40 +0200
-Subject: [PATCH] Look for cma instead of cmxa for lablgtksourceview2
+Subject: Look for cma instead of cmxa for lablgtksourceview2
 
 ---
  configure    |    8 ++++----
@@ -8,7 +8,7 @@ Subject: [PATCH] Look for cma instead of cmxa for 
lablgtksourceview2
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/configure b/configure
-index 3cb367c..c6987f0 100755
+index baca0ec..f017968 100755
 --- a/configure
 +++ b/configure
 @@ -2107,15 +2107,15 @@ fi
@@ -32,10 +32,10 @@ index 3cb367c..c6987f0 100755
  else
    eval "$as_ac_File=no"
 diff --git a/configure.in b/configure.in
-index 7bb109b..d8791e4 100644
+index eada4f2..d15ffb5 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -163,7 +163,7 @@ dnl       LABLGTK2LIB
+@@ -165,7 +165,7 @@ dnl       LABLGTK2LIB
  dnl    fi      
  dnl fi
  

-- 
alt-ergo packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to