The following commit has been merged in the experimental/master branch:
commit b82b89622883349a8b85ef7daaa9f7436ac6d3f9
Author: Ralf Treinen <trei...@free.fr>
Date:   Wed Apr 3 21:15:50 2013 +0200

    adapt patch 0006-PRECM-O-X-is-needed-to-link-altgr-ergo to new upstream

diff --git a/debian/changelog b/debian/changelog
index b5ef902..7994652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ alt-ergo (0.95.1-1) UNRELEASED; urgency=low
      0002-Do-not-run-the-test-if-test.mlw-is-absent-and-use-be.patch
      0003-Fix-a-typo.patch
      0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2
+     0006-PRECM-O-X-is-needed-to-link-altgr-ergo
   * Drop patches since issue is fixed upstream:
      0004-Add-rules-and-targets-for-gui.byte.patch
   
diff --git a/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch 
b/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
index 5b751b0..2fc0c96 100644
--- a/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
+++ b/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
@@ -2,21 +2,16 @@ From: Mehdi Dogguy <me...@dogguy.org>
 Date: Wed, 14 Dec 2011 14:05:46 +0100
 Subject: PRECM{O,X} is needed to link altgr-ergo
 
----
- Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 6a84eb4..b9d9afc 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -117,7 +117,7 @@ GENERATED = version.ml \
-       smt_parser.ml smt_parser.mli smt_lex.ml \
-       smtlib2_parse.ml smtlib2_parse.mli smtlib2_lex.ml
+Index: alt-ergo/Makefile.in
+===================================================================
+--- alt-ergo.orig/Makefile.in  2013-04-03 21:09:54.000000000 +0200
++++ alt-ergo/Makefile.in       2013-04-03 21:13:22.000000000 +0200
+@@ -115,7 +115,7 @@
  
--GUICMO = $(CMO) $(CMOFRONT) why_annoted.cmo why_connected.cmo gui.cmo
-+GUICMO = $(PRECMO) $(CMO) $(CMOFRONT) why_annoted.cmo why_connected.cmo 
gui.cmo
- GUICMX = $(GUICMO:.cmo=.cmx)
  
- byte: $(NAME).byte
--- 
+ ifeq ($(ENABLEGUI),yes)
+-      GUICMO = $(CMO) $(CMOFRONT) gui_session.cmo why_annoted.cmo \
++      GUICMO = $(PRECMO) $(CMO) $(CMOFRONT) gui_session.cmo why_annoted.cmo \
+          why_connected.cmo gui_replay.cmo gui.cmo
+ else 
+       GUICMO = 

-- 
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