[Openvas-commits] r13161 - in trunk/gsa: . src/html

[scm-commit at wald.intevation.org]

Author: jan
Date: 2012-03-28 11:41:04 +0200 (Wed, 28 Mar 2012)
New Revision: 13161

Modified:
   trunk/gsa/CMakeLists.txt
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/help.xsl
Log:
Post branch version bump.

* CMakeLists.txt: Updated version number.

* src/html/help.xsl: Updated version number.



Modified: trunk/gsa/CMakeLists.txt
===================================================================
--- trunk/gsa/CMakeLists.txt	2012-03-28 09:35:49 UTC (rev 13160)
+++ trunk/gsa/CMakeLists.txt	2012-03-28 09:41:04 UTC (rev 13161)
@@ -188,13 +188,16 @@
 set (CPACK_SOURCE_TOPLEVEL_TAG "")
 set (CPACK_SYSTEM_NAME "")
 set (CPACK_TOPLEVEL_TAG "")
-set (CPACK_PACKAGE_VERSION_MAJOR "3")
+set (CPACK_PACKAGE_VERSION_MAJOR "4")
 set (CPACK_PACKAGE_VERSION_MINOR "0")
-set (CPACK_PACKAGE_VERSION_PATCH "1${SVN_REVISION}")
-set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+# Use this scheme for stable releases:
+#set (CPACK_PACKAGE_VERSION_PATCH "1${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 "+rc2${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}")
 set (CPACK_PACKAGE_VENDOR "The OpenVAS Project")

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2012-03-28 09:35:49 UTC (rev 13160)
+++ trunk/gsa/ChangeLog	2012-03-28 09:41:04 UTC (rev 13161)
@@ -1,5 +1,13 @@
 2012-03-28  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
+	Post branch version bump.
+
+	* CMakeLists.txt: Updated version number.
+
+	* src/html/help.xsl: Updated version number.
+
+2012-03-28  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
 	* CMakeLists.txt, INSTALL: Set dependency for glib and gnutls
 	to minimum of what openvas-libraries requires.
 

Modified: trunk/gsa/src/html/help.xsl
===================================================================
--- trunk/gsa/src/html/help.xsl	2012-03-28 09:35:49 UTC (rev 13160)
+++ trunk/gsa/src/html/help.xsl	2012-03-28 09:41:04 UTC (rev 13161)
@@ -71,7 +71,7 @@
       <table><tr><td valign="top">
 
       <h1>Greenbone Security Assistant</h1>
-      <h3>Version 3.0.1</h3>
+      <h3>Version 4.0+beta1</h3>
 
       <p>
       The Greenbone Security Assistant (GSA) is the web-based graphical