[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, master, updated. debian/0.93-2-1-gf85e7d3

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f85e7d3f5f8fc45670d0982efdcb2dc06980a978
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Apr 16 16:33:18 2011 +0200

    Fix lablgtksourceview2 detection on bytecode architectures.
    
     - 0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch

diff --git a/debian/changelog b/debian/changelog
index e509e25..8d159c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alt-ergo (0.93-3) unstable; urgency=low
+
+  * Fix lablgtksourceview2 detection on bytecode architectures.
+    - 0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 16 Apr 2011 16:27:24 +0200
+
 alt-ergo (0.93-2) unstable; urgency=low
 
   * Add patch to fix FTBFS on bytecode architectures.
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
new file mode 100644
index 0000000..3426205
--- /dev/null
+++ b/debian/patches/0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch
@@ -0,0 +1,47 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sat, 16 Apr 2011 16:26:40 +0200
+Subject: [PATCH] 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 3cb367c..c6987f0 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`
+-{ $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_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 :
+   $as_echo_n "(cached) " >&6
+ else
+   test "$cross_compiling" = yes &&
+   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 7bb109b..d8791e4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -163,7 +163,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*)
+ else
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index afa39f2..2182652 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 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
+0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch

-- 
alt-ergo packaging