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

[scm-commit at wald.intevation.org]

Author: jan
Date: 2012-07-19 21:02:12 +0200 (Thu, 19 Jul 2012)
New Revision: 13760

Modified:
   trunk/openvas-cli/CMakeLists.txt
   trunk/openvas-cli/ChangeLog
Log:
Post release version bump.

* CMakeLists.txt: Updated version number to 1.2.0 and
increased minimum requirement for openvas-libraries to 6.0.



Modified: trunk/openvas-cli/CMakeLists.txt
===================================================================
--- trunk/openvas-cli/CMakeLists.txt	2012-07-19 18:49:19 UTC (rev 13759)
+++ trunk/openvas-cli/CMakeLists.txt	2012-07-19 19:02:12 UTC (rev 13760)
@@ -75,14 +75,14 @@
 set (CPACK_SYSTEM_NAME "")
 set (CPACK_TOPLEVEL_TAG "")
 set (CPACK_PACKAGE_VERSION_MAJOR "1")
-set (CPACK_PACKAGE_VERSION_MINOR "1")
+set (CPACK_PACKAGE_VERSION_MINOR "2")
 
 # Use this scheme for stable releases:
-set (CPACK_PACKAGE_VERSION_PATCH "5${SVN_REVISION}")
-set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+#set (CPACK_PACKAGE_VERSION_PATCH "0${SVN_REVISION}")
+#set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 # Use this scheme for +betaN and +rcN releases:
-#set (CPACK_PACKAGE_VERSION_PATCH "+beta1${SVN_REVISION}")
-#set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}${CPACK_PACKAGE_VERSION_PATCH}")
+set (CPACK_PACKAGE_VERSION_PATCH "+beta1${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}")
@@ -152,7 +152,7 @@
 ## list and throw an error, otherwise long install-cmake-install-cmake cycles
 ## might occur.
 
-pkg_check_modules (LIBOPENVAS REQUIRED libopenvas>=4.0.0)
+pkg_check_modules (LIBOPENVAS REQUIRED libopenvas>=6.0.0)
 pkg_check_modules (GNUTLS REQUIRED gnutls)
 pkg_check_modules (GLIB REQUIRED glib-2.0)
 

Modified: trunk/openvas-cli/ChangeLog
===================================================================
--- trunk/openvas-cli/ChangeLog	2012-07-19 18:49:19 UTC (rev 13759)
+++ trunk/openvas-cli/ChangeLog	2012-07-19 19:02:12 UTC (rev 13760)
@@ -1,5 +1,12 @@
 2012-07-19  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
+	Post release version bump.
+
+	* CMakeLists.txt: Updated version number to 1.2.0 and
+	increased minimum requirement for openvas-libraries to 6.0.
+
+2012-07-19  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
 	* CMakeLists.txt: Last minute fix on revisioning to
 	have proper version numbers in --version.