Update version to 2.0.0 stable

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/ChangeLog b/ChangeLog
index 0dffcbf03de5050ec6c42c121db5f9fb3352ac38..2620b509d4793a74a61781a3f147431f317bd656 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-20 lttng-ust 2.0.0
+       * First STABLE version
+       * Add version name
+
 2012-03-20 lttng-ust 2.0.0-rc4
        * Fix out-of-bound write in ltt-events.c
        * Document LTTNG_UST_DEBUG_VALGRIND compilation flag

diff --git a/configure.ac b/configure.ac
index 468ec24ed09f9c0bb8f37d11dd6637510ea90f3a..f0fcdb40d9a980ffc50bb4c2b5c97c328af183e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.0.0-rc4],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.0.0],[mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -34,8 +34,10 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number])
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
 AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number])
 
-AC_DEFINE_UNQUOTED([VERSION_NAME], "TBD", [UST version name])
-AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], "TBD", [UST version description])
+version_name="Annedd'ale"
+version_description="New type of beer, 100% from Quebec, flavored with sapin beaumier needles, with a touch of hops."
+AC_DEFINE_UNQUOTED([VERSION_NAME], [$version_name], [UST version name])
+AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], [$version_description], [UST version description])
 
 # Checks for programs.
 AC_PROG_CC
@@ -281,6 +283,10 @@ AC_CONFIG_FILES([
 
 AC_OUTPUT
 
+AS_ECHO()
+AS_ECHO("Version name: $version_name")
+AS_ECHO("$version_description")
+
 # Report on the configuration options
 AS_ECHO()
 AS_ECHO("LTTng-UST will be built with the following options:")