From 7b770971ebb7caf8c40200ff5609a7488bbd5c1f Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Thu, 26 Jan 2012 20:46:25 +0000
Subject: [PATCH]     - Tag for 7.0.12 release, all platforms      
 boinc_core_release_7_0_12

    /
        configure.ac
        version.h

svn path=/trunk/boinc/; revision=25155
---
 checkin_notes                |  8 ++++++++
 configure.ac                 |  2 +-
 version.h                    | 10 +++++-----
 version.h.in                 |  2 +-
 win_build/vboxwrapper.vcproj |  8 ++++----
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 403bcac00d..1076adfebd 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1043,3 +1043,11 @@ David  26 Jan 2012
 
     client/
         client_types.cpp
+
+Rom    26 Jan 2012
+    - Tag for 7.0.12 release, all platforms
+      boinc_core_release_7_0_12
+
+    /
+        configure.ac
+        version.h
diff --git a/configure.ac b/configure.ac
index f3ad93ba99..d1b3d71099 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
 AC_PREREQ(2.58)
 
 dnl Set the BOINC version here.  You can also use the set-version script.
-AC_INIT(BOINC, 7.0.11)
+AC_INIT(BOINC, 7.0.12)
 AC_CONFIG_MACRO_DIR([m4])
 LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
 AC_SUBST([LIBBOINC_VERSION])
diff --git a/version.h b/version.h
index 9e2fe388d4..e0f1ddd921 100644
--- a/version.h
+++ b/version.h
@@ -10,13 +10,13 @@
 #define BOINC_MINOR_VERSION 0
 
 /* Release part of BOINC version number */
-#define BOINC_RELEASE 11
+#define BOINC_RELEASE 12
 
 /* String representation of BOINC version number */
-#define BOINC_VERSION_STRING "7.0.11"
+#define BOINC_VERSION_STRING "7.0.12"
 
 /* Package is a pre-release (Alpha/Beta) package */
-#define BOINC_PRERELEASE 1
+/* #define BOINC_PRERELEASE 1 */
 
 #if (defined(_WIN32) || defined(__APPLE__))
 /* Name of package */
@@ -29,13 +29,13 @@
 #define PACKAGE_NAME "BOINC"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "BOINC 7.0.11"
+#define PACKAGE_STRING "BOINC 7.0.12"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "boinc"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "7.0.11"
+#define PACKAGE_VERSION "7.0.12"
 
 #endif /* #if (defined(_WIN32) || defined(__APPLE__)) */
 
diff --git a/version.h.in b/version.h.in
index ca1b11af03..f0b957d98b 100644
--- a/version.h.in
+++ b/version.h.in
@@ -16,7 +16,7 @@
 #define BOINC_VERSION_STRING "@BOINC_VERSION_STRING@"
 
 /* Package is a pre-release (Alpha/Beta) package */
-#define BOINC_PRERELEASE 1
+/* #define BOINC_PRERELEASE 1 */
 
 #if (defined(_WIN32) || defined(__APPLE__))
 /* Name of package */
diff --git a/win_build/vboxwrapper.vcproj b/win_build/vboxwrapper.vcproj
index 20a3158afd..abba673162 100644
--- a/win_build/vboxwrapper.vcproj
+++ b/win_build/vboxwrapper.vcproj
@@ -81,13 +81,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
-				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25100_windows_intelx86.exe"
+				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25133_windows_intelx86.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreAllDefaultLibraries="true"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25100_windows_intelx86.pdb"
+				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25133_windows_intelx86.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -182,13 +182,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libcmt.lib libcpmt.lib  kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
-				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25100_windows_x86_64.exe"
+				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25133_windows_x86_64.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreAllDefaultLibraries="true"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25100_windows_x86_64.pdb"
+				ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25133_windows_x86_64.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>