bump version strings for rc1. Also set PPA to build as release. All other platforms are handled at build time.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35324 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 7 insertions, 7 deletions

diff --git a/tools/Linux/packaging/debian/rules b/tools/Linux/packaging/debian/rules
index 2ba0d6891d..8cf0c3f9ae 100755
--- a/tools/Linux/packaging/debian/rules
+++ b/tools/Linux/packaging/debian/rules
@@ -10,7 +10,7 @@ SVNVERSION ?= $(shell dpkg-parsechangelog | grep '^Version:' | grep svn | sed 's
 
 # Set this variable to yes for release builds to disable debugging and enable
 # optimizations.
-XBMC_RELEASE ?= no
+XBMC_RELEASE ?= yes
 
 # If not set already, try to set from debian/svnrevision
 ifeq (,$(SVNVERSION))
@@ -19,7 +19,7 @@ endif
 
 # Whether we're building for release or not
 ifeq (yes,$(XBMC_RELEASE))
-  DEBUG_OPTIONS = --disable-debug --enable-optimizations
+  DEBUG_OPTIONS = --disable-debug
 else
   DEBUG_OPTIONS = --enable-debug
 endif
diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist
index c22f42aa6d..e9b6551a8a 100644
--- a/xbmc/osx/Info.plist
+++ b/xbmc/osx/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XBMC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>10.0-beta4</string>
+	<string>10.0-rc1</string>
 	<key>CFBundleIconFile</key>
 	<string>xbmc.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.0-beta4</string>
+	<string>10.0-rc1</string>
 	<key>CFBundleVersion</key>
 	<string>r####</string>
 	<key>CFBundleSignature</key>
diff --git a/xbmc/utils/GUIInfoManager.h b/xbmc/utils/GUIInfoManager.h
index 06b79e3b56..af966a0daf 100644
--- a/xbmc/utils/GUIInfoManager.h
+++ b/xbmc/utils/GUIInfoManager.h
@@ -433,7 +433,7 @@ class CDateTime;
 
 // Version string MUST NOT contain spaces.  It is used
 // in the HTTP request user agent.
-#define VERSION_STRING "10.0-beta4"
+#define VERSION_STRING "10.0-rc1"
 
 #define LISTITEM_START              35000
 #define LISTITEM_THUMB              (LISTITEM_START)
diff --git a/xbmc/win32/XBMC_PC.rc b/xbmc/win32/XBMC_PC.rc
index 1928aa1b15..1935991bac 100644
--- a/xbmc/win32/XBMC_PC.rc
+++ b/xbmc/win32/XBMC_PC.rc
@@ -71,12 +71,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "Team XBMC"

             VALUE "FileDescription", "XBMC"

-            VALUE "FileVersion", "10.0-beta4"

+            VALUE "FileVersion", "10.0-rc1"

             VALUE "InternalName", "XBMC.exe"

             VALUE "LegalCopyright", "Copyright (c) Team XBMC.  All rights reserved."

             VALUE "OriginalFilename", "XBMC.exe"

             VALUE "ProductName", "XBMC for Windows"

-            VALUE "ProductVersion", "10.0-beta4"

+            VALUE "ProductVersion", "10.0-rc1"

         END

     END

     BLOCK "VarFileInfo"