[release] version bump to 13.0 alpha10 as we start new merge window

diff --git a/addons/xbmc.addon/addon.xml b/addons/xbmc.addon/addon.xml
index 48b15cf..6013b37 100644 (file)
--- a/addons/xbmc.addon/addon.xml
+++ b/addons/xbmc.addon/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<addon id="xbmc.addon" version="12.9.9" provider-name="Team XBMC">
+<addon id="xbmc.addon" version="12.9.10" provider-name="Team XBMC">

   <backwards-compatibility abi="12.0"/>
   <requires>
     <import addon="xbmc.core" version="0.1.0"/>
   <backwards-compatibility abi="12.0"/>
   <requires>
     <import addon="xbmc.core" version="0.1.0"/>

diff --git a/configure.in b/configure.in
index 9c05933..ac4e336 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)

-AC_INIT([xbmc], [12.9.9], [http://trac.xbmc.org])
+AC_INIT([xbmc], [12.9.10], [http://trac.xbmc.org])

 AC_CONFIG_HEADERS([xbmc/config.h])
 AH_TOP([#pragma once])
 m4_include([m4/ax_prog_cc_for_build.m4])
 AC_CONFIG_HEADERS([xbmc/config.h])
 AH_TOP([#pragma once])
 m4_include([m4/ax_prog_cc_for_build.m4])

diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml
index 469f60c..bd7766f 100644 (file)
--- 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"
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.xbmc.xbmc"

-    android:versionCode="15"
-    android:versionName="13.0-ALPHA9" >
+    android:versionCode="16"
+    android:versionName="13.0-ALPHA10" >

 
     <!-- This is the platform API where NativeActivity was introduced. -->
     <uses-sdk android:minSdkVersion="14" />
 
     <!-- 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
index 3649904..ae6e313 100755 (executable)
--- 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
 PACKAGE=org.xbmc.xbmc-atv2
 
 VERSION=13.0

-REVISION=0~alpha9
+REVISION=0~alpha10

 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
 
 echo Creating $PACKAGE package version $VERSION revision $REVISION
 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
index 63a298a..960dd31 100755 (executable)
--- 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
 PACKAGE=org.xbmc.xbmc-ios
 
 VERSION=13.0

-REVISION=0~alpha9
+REVISION=0~alpha10

 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
 
 echo Creating $PACKAGE package version $VERSION revision $REVISION
 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
index c1aea8e..36d68ab 100755 (executable)
--- 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
 PACKAGE=org.xbmc.xbmc-osx
 
 VERSION=13.0

-REVISION=0~alpha9
+REVISION=0~alpha10

 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_macosx-intel-${ARCHITECTURE}
 
 echo Creating $PACKAGE package version $VERSION revision $REVISION
 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
index 743e0d7..5274fca 100644 (file)
--- a/xbmc/GUIInfoManager.h
+++ b/xbmc/GUIInfoManager.h
@@ -492,7 +492,7 @@ namespace INFO
 
 #define VERSION_MAJOR               13
 #define VERSION_MINOR               0
 
 #define VERSION_MAJOR               13
 #define VERSION_MINOR               0

-#define VERSION_TAG                 "-ALPHA9"
+#define VERSION_TAG                 "-ALPHA10"

 
 #define LISTITEM_START              35000
 #define LISTITEM_THUMB              (LISTITEM_START)
 
 #define LISTITEM_START              35000
 #define LISTITEM_THUMB              (LISTITEM_START)

diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist
index 4f56a24..2c60732 100644 (file)
--- a/xbmc/osx/Info.plist
+++ b/xbmc/osx/Info.plist
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>XBMC</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleExecutable</key>
        <string>XBMC</string>
        <key>CFBundleGetInfoString</key>

-       <string>13.0.alpha9</string>
+       <string>13.0.alpha10</string>

        <key>CFBundleIconFile</key>
        <string>xbmc.icns</string>
        <key>CFBundleIdentifier</key>
        <key>CFBundleIconFile</key>
        <string>xbmc.icns</string>
        <key>CFBundleIdentifier</key>


@@ -19,7 +19,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>

-       <string>13.0.alpha9</string>
+       <string>13.0.alpha10</string>

        <key>CFBundleVersion</key>
        <string>r####</string>
        <key>CFBundleSignature</key>
        <key>CFBundleVersion</key>
        <string>r####</string>
        <key>CFBundleSignature</key>

diff --git a/xbmc/win32/XBMC_PC.rc b/xbmc/win32/XBMC_PC.rc
index f3d4bb2..721f058 100644 (file)
--- 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"
         BEGIN
             VALUE "CompanyName", "Team XBMC"
             VALUE "FileDescription", "XBMC"

-            VALUE "FileVersion", "13.0-ALPHA9"
+            VALUE "FileVersion", "13.0-ALPHA10"

             VALUE "InternalName", "XBMC.exe"
             VALUE "LegalCopyright", "Copyright (c) Team XBMC.  All rights reserved."
             VALUE "OriginalFilename", "XBMC.exe"
             VALUE "ProductName", "XBMC for Windows"
             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-ALPHA9"
+            VALUE "ProductVersion", "13.0-ALPHA10"

         END
     END
     BLOCK "VarFileInfo"
         END
     END
     BLOCK "VarFileInfo"