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

    adapt patch 0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2 to new 
upstream release

diff --git a/debian/changelog b/debian/changelog
index f87eaba..b5ef902 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ alt-ergo (0.95.1-1) UNRELEASED; urgency=low
      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
+     0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2
   * Drop patches since issue is fixed upstream:
      0004-Add-rules-and-targets-for-gui.byte.patch
   
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 4ec3efb..84fd2d8 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
@@ -2,46 +2,40 @@ From: Mehdi Dogguy <me...@debian.org>
 Date: Sat, 16 Apr 2011 16:26:40 +0200
 Subject: Look for cma instead of cmxa for lablgtksourceview2
 
----
- configure    |    8 ++++----
- configure.in |    2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure b/configure
-index baca0ec..f017968 100755
---- a/configure
-+++ b/configure
-@@ -2107,15 +2107,15 @@ fi
- 
- # checking for lablgtk2
- 
--as_ac_File=`$as_echo "ac_cv_file_$OCAMLLIB/lablgtk2/lablgtksourceview2.cmxa" 
| $as_tr_sh`
+Index: alt-ergo/configure
+===================================================================
+--- alt-ergo.orig/configure    2013-04-03 18:54:01.000000000 +0200
++++ alt-ergo/configure 2013-04-03 21:05:15.000000000 +0200
+@@ -2207,15 +2207,15 @@
+   LABLGTK2=yes
+   ENABLEGUI="yes"
+ else
+-  as_ac_File=`$as_echo 
"ac_cv_file_$OCAMLLIB/lablgtk2/lablgtksourceview2.cmxa" | $as_tr_sh`
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 
$OCAMLLIB/lablgtk2/lablgtksourceview2.cmxa" >&5
 -$as_echo_n "checking for $OCAMLLIB/lablgtk2/lablgtksourceview2.cmxa... " >&6; 
}
-+as_ac_File=`$as_echo "ac_cv_file_$OCAMLLIB/lablgtk2/lablgtksourceview2.cma" | 
$as_tr_sh`
++  as_ac_File=`$as_echo "ac_cv_file_$OCAMLLIB/lablgtk2/lablgtksourceview2.cma" 
| $as_tr_sh`
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 
$OCAMLLIB/lablgtk2/lablgtksourceview2.cma" >&5
 +$as_echo_n "checking for $OCAMLLIB/lablgtk2/lablgtksourceview2.cma... " >&6; }
- if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval \${$as_ac_File+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    test "$cross_compiling" = yes &&
-   as_fn_error "cannot check for file existence when cross compiling" 
"$LINENO" 5
+   as_fn_error $? "cannot check for file existence when cross compiling" 
"$LINENO" 5
 -if test -r "$OCAMLLIB/lablgtk2/lablgtksourceview2.cmxa"; then
 +if test -r "$OCAMLLIB/lablgtk2/lablgtksourceview2.cma"; then
    eval "$as_ac_File=yes"
  else
    eval "$as_ac_File=no"
-diff --git a/configure.in b/configure.in
-index eada4f2..d15ffb5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -165,7 +165,7 @@ dnl       LABLGTK2LIB
- dnl    fi      
- dnl fi
- 
--AC_CHECK_FILE($OCAMLLIB/lablgtk2/lablgtksourceview2.cmxa,LABLGTK2=yes,LABLGTK2=no)
-+AC_CHECK_FILE($OCAMLLIB/lablgtk2/lablgtksourceview2.cma,LABLGTK2=yes,LABLGTK2=no)
- if test "$LABLGTK2" = no ; then
-       AC_MSG_RESULT(Will not be able to compile GUI. Please install the 
*liblablgtksourceview2-ocaml-dev* Debian package - or use the GODI caml package 
system *http://godi.ocaml-programming.de/* - or compile from sources 
*http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html*)
+Index: alt-ergo/configure.in
+===================================================================
+--- alt-ergo.orig/configure.in 2013-04-03 18:54:01.000000000 +0200
++++ alt-ergo/configure.in      2013-04-03 21:04:16.000000000 +0200
+@@ -198,7 +198,7 @@
+   LABLGTK2=yes
+   ENABLEGUI="yes"
  else
--- 
+-  
AC_CHECK_FILE($OCAMLLIB/lablgtk2/lablgtksourceview2.cmxa,LABLGTK2=yes,LABLGTK2=no)
++  
AC_CHECK_FILE($OCAMLLIB/lablgtk2/lablgtksourceview2.cma,LABLGTK2=yes,LABLGTK2=no)
+   if test "$LABLGTK2" = no ; then
+     AC_MSG_RESULT(Will not be able to compile GUI. Please install the 
*liblablgtksourceview2-ocaml-dev* Debian package - or use the GODI caml package 
system *http://godi.ocaml-programming.de/* - or compile from sources 
*http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html*)
+   else

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