Le 04/07/2012 12:19, Jean-Marc Lasgouttes a écrit :
The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 4471e65fa19135652874a9fde948c7d6dd54c261
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Wed Jul 4 12:18:15 2012 +0200

     Handle version numbers like 2.0.5dev in LYX_CHECK_VERSION

Richard, to branch? Without this the current branch version is not understood as development (only svn is tested).

JMarc


diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index ed12f3d..d915d5c 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -22,7 +22,7 @@ AC_ARG_ENABLE(build-type,
      *) AC_ERROR([Bad build type specification \"$enableval\". Please use one 
of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);;
     esac],
    [case AC_PACKAGE_VERSION in
-    *svn*) build_type=development;;
+    *svn*|*dev*) build_type=development;;
      *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;;
      *) build_type=release ;;
     esac])

-----------------------------------------------------------------------

Summary of changes:
  config/lyxinclude.m4 |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive



Reply via email to