diff options
author | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-03-03 15:11:24 -0500 |
---|---|---|
committer | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-03-03 15:11:24 -0500 |
commit | 128426f48955e352d555f22aac0e87c23f618d47 (patch) | |
tree | f520dac062d1a2cda649f0c88e4066cedfcfeaa4 | |
parent | ab0aec4057992edc875e4cd733eb80dc79dbfb4a (diff) | |
parent | 60e963944869257eb02c25debda5cb5a81605e43 (diff) |
Merge pull request #4314 from MartijnKaijser/beta1Gotham-beta1
[release] version bump to 13.0 beta1
-rw-r--r-- | addons/xbmc.addon/addon.xml | 2 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | media/Splash.png | bin | 23481 -> 127372 bytes | |||
-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 | 8 |
10 files changed, 14 insertions, 14 deletions
diff --git a/addons/xbmc.addon/addon.xml b/addons/xbmc.addon/addon.xml index b322a76185..2698c28d6b 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.12" provider-name="Team XBMC"> +<addon id="xbmc.addon" version="12.9.81" 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 7390167cdd..beb8aacd69 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.12], [http://issues.xbmc.org]) +AC_INIT([xbmc], [12.9.81], [http://issues.xbmc.org]) AC_CONFIG_HEADERS([xbmc/config.h]) AH_TOP([#pragma once]) m4_include([m4/ax_prog_cc_for_build.m4]) diff --git a/media/Splash.png b/media/Splash.png Binary files differindex 013c95176e..b070243788 100644 --- a/media/Splash.png +++ b/media/Splash.png diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml index 95cac4c312..ea5df1d192 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="18" - android:versionName="13.0-ALPHA12" > + android:versionCode="20" + android:versionName="13.0-BETA1" > <!-- 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 051b6d1930..7313e6e6e2 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~alpha12 +REVISION=0~beta1 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 1670ef1a35..bfd1739da3 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~alpha12 +REVISION=0~beta1 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 3c4ea15d64..cc8ce4ea39 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~alpha12 +REVISION=0~beta1 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 90b8c5a85e..15e6bea754 100644 --- a/xbmc/GUIInfoManager.h +++ b/xbmc/GUIInfoManager.h @@ -498,7 +498,7 @@ namespace INFO #define VERSION_MAJOR 13 #define VERSION_MINOR 0 -#define VERSION_TAG "-ALPHA12" +#define VERSION_TAG "-BETA1" #define LISTITEM_START 35000 #define LISTITEM_THUMB (LISTITEM_START) diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist index 4f6c6083c4..d17c96c880 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.alpha12</string> + <string>13.0.beta1</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.alpha12</string> + <string>13.0.beta1</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 03beb51eb0..a8039d0fe7 100644 --- a/xbmc/win32/XBMC_PC.rc +++ b/xbmc/win32/XBMC_PC.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 12,9,11,0 - PRODUCTVERSION 12,9,12,0 + FILEVERSION 12,9,81,0 + PRODUCTVERSION 12,9,81,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -71,12 +71,12 @@ BEGIN BEGIN VALUE "CompanyName", "Team XBMC" VALUE "FileDescription", "XBMC" - VALUE "FileVersion", "13.0-ALPHA12" + VALUE "FileVersion", "13.0-BETA1" 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-ALPHA12" + VALUE "ProductVersion", "13.0-BETA1" END END BLOCK "VarFileInfo" |