diff options
author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2013-10-23 15:26:38 +0200 |
---|---|---|
committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2013-10-23 15:26:38 +0200 |
commit | 345ca4d85e937455013dcd1f2f91a5df1eb5e56a (patch) | |
tree | 3321c53e52cf206dc9584d3d18c45e822a219c32 | |
parent | 598171dc16c0e658eadca5d1151c41eef47ac9c2 (diff) |
[release] version bump to 13.0 alpha10 as we start new merge window
-rw-r--r-- | addons/xbmc.addon/addon.xml | 2 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | tools/android/packaging/xbmc/AndroidManifest.xml | 4 | ||||
-rwxr-xr-x | tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh | 2 | ||||
-rwxr-xr-x | tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh | 2 | ||||
-rwxr-xr-x | tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh | 2 | ||||
-rw-r--r-- | xbmc/GUIInfoManager.h | 2 | ||||
-rw-r--r-- | xbmc/osx/Info.plist | 4 | ||||
-rw-r--r-- | xbmc/win32/XBMC_PC.rc | 4 |
9 files changed, 12 insertions, 12 deletions
diff --git a/addons/xbmc.addon/addon.xml b/addons/xbmc.addon/addon.xml index 48b15cfb50..6013b373be 100644 --- 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.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"/> diff --git a/configure.in b/configure.in index 9c05933e03..ac4e33679a 100644 --- 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.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]) diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml index 469f60c448..bd7766f06d 100644 --- 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="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" /> diff --git a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh index 364990489d..ae6e313bfd 100755 --- 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~alpha9 +REVISION=0~alpha10 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 63a298af87..960dd317fa 100755 --- 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~alpha9 +REVISION=0~alpha10 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 c1aea8eab8..36d68ab748 100755 --- 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~alpha9 +REVISION=0~alpha10 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 743e0d7754..5274fca6e4 100644 --- a/xbmc/GUIInfoManager.h +++ b/xbmc/GUIInfoManager.h @@ -492,7 +492,7 @@ namespace INFO #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) diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist index 4f56a243d7..2c6073295a 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>13.0.alpha9</string> + <string>13.0.alpha10</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.alpha9</string> + <string>13.0.alpha10</string> <key>CFBundleVersion</key> <string>r####</string> <key>CFBundleSignature</key> diff --git a/xbmc/win32/XBMC_PC.rc b/xbmc/win32/XBMC_PC.rc index f3d4bb2028..721f058355 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", "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 "ProductVersion", "13.0-ALPHA9" + VALUE "ProductVersion", "13.0-ALPHA10" END END BLOCK "VarFileInfo" |