[Openvas-commits] r9494 - trunk/openvas-cli

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2010-11-22 16:00:12 +0100 (Mon, 22 Nov 2010)
New Revision: 9494

Modified:
   trunk/openvas-cli/CMakeLists.txt
   trunk/openvas-cli/ChangeLog
   trunk/openvas-cli/INSTALL
Log:
Preparing the openvas-cli 1.1+rc1 release.

  * CMakeLists.txt: Updated version number and required
  openvas-libraries version. Changed CPACK_PACKAGE_VERSION for use with
  "+rc" versioning scheme.

  * INSTALL: Updated prerequisites.


Modified: trunk/openvas-cli/CMakeLists.txt
===================================================================
--- trunk/openvas-cli/CMakeLists.txt	2010-11-22 14:40:58 UTC (rev 9493)
+++ trunk/openvas-cli/CMakeLists.txt	2010-11-22 15:00:12 UTC (rev 9494)
@@ -72,8 +72,8 @@
 set (CPACK_TOPLEVEL_TAG "")
 set (CPACK_PACKAGE_VERSION_MAJOR "1")
 set (CPACK_PACKAGE_VERSION_MINOR "1")
-set (CPACK_PACKAGE_VERSION_PATCH "0${SVN_REVISION}")
-set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+set (CPACK_PACKAGE_VERSION_PATCH "+rc1${SVN_REVISION}")
+set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH}")
 set (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 set (CPACK_PACKAGE_VENDOR "The OpenVAS Project")
@@ -170,9 +170,9 @@
   # TODO Would like something like set (MIN_LO_VER "3" "0" "1")
   #      which would then make it easier to modify these. However, had serious
   #      issues with the conditionals, thus this clumsy implementation.
-  set (LO_MAJOR_MIN_VER 3)
-  set (LO_MINOR_MIN_VER 1)
-  set (LO_PATCH_MIN_VER 1)
+  set (LO_MAJOR_MIN_VER 4)
+  set (LO_MINOR_MIN_VER 0)
+  set (LO_PATCH_MIN_VER 0)
   set (LO_MAJOR_VER_FAIL FALSE)
   set (LO_MINOR_VER_FAIL FALSE)
   set (LO_PATCH_VER_FAIL FALSE)

Modified: trunk/openvas-cli/ChangeLog
===================================================================
--- trunk/openvas-cli/ChangeLog	2010-11-22 14:40:58 UTC (rev 9493)
+++ trunk/openvas-cli/ChangeLog	2010-11-22 15:00:12 UTC (rev 9494)
@@ -1,3 +1,13 @@
+2010-11-22  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	Preparing the openvas-cli 1.1+rc1 release.
+
+	* CMakeLists.txt: Updated version number and required
+	openvas-libraries version. Changed CPACK_PACKAGE_VERSION for use with
+	"+rc" versioning scheme.
+
+	* INSTALL: Updated prerequisites.
+
 2010-11-22  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
 	* CHANGES: Updated.

Modified: trunk/openvas-cli/INSTALL
===================================================================
--- trunk/openvas-cli/INSTALL	2010-11-22 14:40:58 UTC (rev 9493)
+++ trunk/openvas-cli/INSTALL	2010-11-22 15:00:12 UTC (rev 9494)
@@ -9,7 +9,7 @@
 * cmake
 * glib-2.0
 * gnutls
-* openvas-libraries 3.1.1 or greater
+* openvas-libraries 4.0.0 or greater
 
 Prerequisites for building documentation:
 * Doxygen