summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-08-30 10:34:01 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-08-30 10:34:01 +0000
commit61fa8b02857e9b5b08cee7abf21cc959445208c7 (patch)
tree49a4e5b358a002e8d99f45d7df94612fb6b8ac51
parent49133231e03a31f1f08e4d74709eccbe7d4cce00 (diff)
and up ver to 1.7.99 now in svn. nack to svnrev num at end.
SVN revision: 75869
-rw-r--r--README2
-rw-r--r--configure.ac4
2 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index 5cdabf099..8d73e5f89 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1Elementary 1.7.0 1Elementary 1.7.99
2 2
3****************************************************************************** 3******************************************************************************
4 4
diff --git a/configure.ac b/configure.ac
index 2aa7a5ed3..efffcf7f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [1]) 3m4_define([v_maj], [1])
4m4_define([v_min], [7]) 4m4_define([v_min], [7])
5m4_define([v_mic], [0]) 5m4_define([v_mic], [99])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) 7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
9m4_undefine([v_rev]) 9dnl m4_undefine([v_rev])
10##-- When doing snapshots - change soname. remove dnl on below line 10##-- When doing snapshots - change soname. remove dnl on below line
11dnl m4_define([relname], [ver-pre-svn-09]) 11dnl m4_define([relname], [ver-pre-svn-09])
12dnl m4_define([v_rel], [-release relname]) 12dnl m4_define([v_rel], [-release relname])