This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository alt-ergo.
commit 368bca3e50cd942b2cb4ce14eb0d825a4e201aee Author: Ralf Treinen <trei...@pps.univ-paris-diderot.fr> Date: Tue Nov 5 15:37:20 2013 +0100 drop patch 0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch --- debian/changelog | 1 + ...ma-instead-of-cmxa-for-lablgtksourceview2.patch | 42 -------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 43 deletions(-) diff --git a/debian/changelog b/debian/changelog index ba8101c..0715213 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ alt-ergo (0.95.2-1) UNRELEASED; urgency=low * drop patches that have been applied by upstream: - 0003-Fix-a-typo.patch - 0004-Add-rules-and-targets-for-gui.byte.patch + - 0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch -- Ralf Treinen <trei...@debian.org> Tue, 05 Nov 2013 14:16:57 +0100 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 deleted file mode 100644 index 9290de9..0000000 --- a/debian/patches/0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Mehdi Dogguy <me...@debian.org> -Date: Sat, 16 Apr 2011 16:26:40 +0200 -Subject: Look for cma instead of cmxa for lablgtksourceview2 -Forwarded: https://gforge.inria.fr/tracker/index.php?func=detail&aid=15591&group_id=2340&atid=8106 - -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_echo "$as_me:${as_lineno-$LINENO}: checking for $OCAMLLIB/lablgtk2/lablgtksourceview2.cma" >&5 -+$as_echo_n "checking for $OCAMLLIB/lablgtk2/lablgtksourceview2.cma... " >&6; } - 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 --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" -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 diff --git a/debian/patches/series b/debian/patches/series index e4ee171..69ba50e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 0001-No-need-to-activate-debug-flag.patch -0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch 0007-Fix-all-target.patch 0008-Split-install-pack-into-two-separate-targets-opt-and.patch 0009-clean-remove-META.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git _______________________________________________ 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