Merge pull request #3143 from MartijnKaijser/alpha8

[release] version bump to 13.0 alpha8 as we start new merge window.
xbmc · Aug 31, 2013 · 15eaf82 · 15eaf82
2 parents 2da9c97 + d2b6456
commit 15eaf82
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/addons/xbmc.addon/addon.xml b/addons/xbmc.addon/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="xbmc.addon" version="12.9.7" provider-name="Team XBMC">
+<addon id="xbmc.addon" version="12.9.8" provider-name="Team XBMC">
   <backwards-compatibility abi="12.0"/>
   <requires>
     <import addon="xbmc.core" version="0.1.0"/>

diff --git a/configure.in b/configure.in
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([xbmc], [12.9.7], [http://trac.xbmc.org])
+AC_INIT([xbmc], [12.9.8], [http://trac.xbmc.org])
 AC_CONFIG_HEADERS([xbmc/config.h])
 AH_TOP([#pragma once])
 m4_include([m4/ax_python_devel.m4])

diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.xbmc.xbmc"
-    android:versionCode="13"
-    android:versionName="13.0-ALPHA7" >
+    android:versionCode="14"
+    android:versionName="13.0-ALPHA8" >
 
     <!-- This is the platform API where NativeActivity was introduced. -->
     <uses-sdk android:minSdkVersion="14" />

diff --git a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
@@ -45,7 +45,7 @@ fi
 PACKAGE=org.xbmc.xbmc-atv2
 
 VERSION=13.0
-REVISION=0~alpha7
+REVISION=0~alpha8
 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
 
 echo Creating $PACKAGE package version $VERSION revision $REVISION

diff --git a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
@@ -46,7 +46,7 @@ fi
 PACKAGE=org.xbmc.xbmc-ios
 
 VERSION=13.0
-REVISION=0~alpha7
+REVISION=0~alpha8
 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
 
 echo Creating $PACKAGE package version $VERSION revision $REVISION

diff --git a/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh b/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh
@@ -25,7 +25,7 @@ ARCHITECTURE=`file $XBMC/Contents/MacOS/XBMC | awk '{print $NF}'`
 PACKAGE=org.xbmc.xbmc-osx
 
 VERSION=13.0
-REVISION=0~alpha7
+REVISION=0~alpha8
 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_macosx-intel-${ARCHITECTURE}
 
 echo Creating $PACKAGE package version $VERSION revision $REVISION

diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h
@@ -488,9 +488,9 @@ namespace INFO
 #define CONTROL_GROUP_HAS_FOCUS     29999
 #define CONTROL_HAS_FOCUS           30000
 
-#define VERSION_MAJOR 13
-#define VERSION_MINOR 0
-#define VERSION_TAG "-ALPHA7"
+#define VERSION_MAJOR               13
+#define VERSION_MINOR               0
+#define VERSION_TAG                 "-ALPHA8"
 
 #define LISTITEM_START              35000
 #define LISTITEM_THUMB              (LISTITEM_START)

diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XBMC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>13.0.alpha7</string>
+	<string>13.0.alpha8</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>13.0.alpha7</string>
+	<string>13.0.alpha8</string>
 	<key>CFBundleVersion</key>
 	<string>r####</string>
 	<key>CFBundleSignature</key>

diff --git a/xbmc/win32/XBMC_PC.rc b/xbmc/win32/XBMC_PC.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 12,9,5,0
- PRODUCTVERSION 12,9,5,0
+ FILEVERSION 12,9,8,0
+ PRODUCTVERSION 12,9,8,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Team XBMC"
             VALUE "FileDescription", "XBMC"
-            VALUE "FileVersion", "13.0-ALPHA7"
+            VALUE "FileVersion", "13.0-ALPHA8"
             VALUE "InternalName", "XBMC.exe"
             VALUE "LegalCopyright", "Copyright (c) Team XBMC.  All rights reserved."
             VALUE "OriginalFilename", "XBMC.exe"
             VALUE "ProductName", "XBMC for Windows"
-            VALUE "ProductVersion", "13.0-ALPHA7"
+            VALUE "ProductVersion", "13.0-ALPHA8"
         END
     END
     BLOCK "VarFileInfo"