diff options
author | jmarshallnz <jcmarsha@gmail.com> | 2014-08-08 18:52:33 +1200 |
---|---|---|
committer | jmarshallnz <jcmarsha@gmail.com> | 2014-08-08 18:52:33 +1200 |
commit | e4a47cc15f8fafbb4da61552f6cd5a92f657bc6d (patch) | |
tree | 24786323d18e9718c1ff788ee54d8c91806e3c8a | |
parent | 6066a5431c7e5042a66e3afac82fc83d2eedf6b8 (diff) | |
parent | 0ff9fb4324af13bb5f74615ac5cc8956567586e8 (diff) |
Merge pull request #5066 from MartijnKaijser/13.2rc113.2rc1-Gotham
[release] bump version to 13.2 rc1
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | media/Splash.png | bin | 137269 -> 125487 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 | 4 |
9 files changed, 11 insertions, 11 deletions
diff --git a/configure.in b/configure.in index ea4de56c62..2e49fa1c7f 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], [13.1.0], [http://issues.xbmc.org]) +AC_INIT([xbmc], [13.2.0], [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 df21b96fe2..e79d78a122 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 c893806839..87bb99498f 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="30" - android:versionName="13.2-BETA3" > + android:versionCode="31" + android:versionName="13.2-RC1" > <!-- 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 fe41f44916..8739be098b 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.2 -REVISION=0~beta3 +REVISION=0~rc1 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 7d4a88c063..76967a7bbf 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.2 -REVISION=0~beta3 +REVISION=0~rc1 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 71e27694c5..92df958ae8 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.2 -REVISION=0~beta3 +REVISION=0~rc1 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 d03a0bc1e9..0e8c16c43e 100644 --- a/xbmc/GUIInfoManager.h +++ b/xbmc/GUIInfoManager.h @@ -498,7 +498,7 @@ namespace INFO #define VERSION_MAJOR 13 #define VERSION_MINOR 2 -#define VERSION_TAG "-BETA3" +#define VERSION_TAG "-RC1" #define LISTITEM_START 35000 #define LISTITEM_THUMB (LISTITEM_START) diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist index 7771b0efd6..3d18c7bd1d 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.2-beta3</string> + <string>13.2-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>13.2-beta3</string> + <string>13.2-rc1</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 90a105648a..6d8bb6a26e 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.2-BETA3" + VALUE "FileVersion", "13.2-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", "13.2-BETA3" + VALUE "ProductVersion", "13.2-RC1" END END BLOCK "VarFileInfo" |