diff options
author | jmarshallnz <jcmarsha@gmail.com> | 2014-05-18 11:28:04 +1200 |
---|---|---|
committer | jmarshallnz <jcmarsha@gmail.com> | 2014-05-18 11:28:04 +1200 |
commit | a6a271389ce4a67a323e547412567ace9d84c274 (patch) | |
tree | 0bb6d952b3195df4b44e53c735244613210ee3e4 | |
parent | b4bffcf43c46d2940a409d1274d576ff96fc3839 (diff) | |
parent | e8b5b4decde5ef201a59fc4373c946aae62dedd1 (diff) |
Merge pull request #4700 from MartijnKaijser/13.1b213.1b2-Gotham
13.1b2
-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 |
7 files changed, 10 insertions, 10 deletions
diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml index 445b1cd7a2..1fb22bc99e 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="26" - android:versionName="13.1-BETA1" > + android:versionCode="27" + android:versionName="13.1-BETA2" > <!-- 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 9aa7b73cf8..69855b3f98 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.1 -REVISION=0~beta1 +REVISION=0~beta2 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 9a8a01d8c1..80089928f9 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.1 -REVISION=0~beta1 +REVISION=0~beta2 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 537cd96ca2..0bc73e42a2 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.1 -REVISION=0~beta1 +REVISION=0~beta2 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 08c62050e3..264fe9e1b5 100644 --- a/xbmc/GUIInfoManager.h +++ b/xbmc/GUIInfoManager.h @@ -498,7 +498,7 @@ namespace INFO #define VERSION_MAJOR 13 #define VERSION_MINOR 1 -#define VERSION_TAG "-BETA1" +#define VERSION_TAG "-BETA2" #define LISTITEM_START 35000 #define LISTITEM_THUMB (LISTITEM_START) diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist index c35292007b..bf2eee9e6a 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.1-beta1</string> + <string>13.1-beta2</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.1-beta1</string> + <string>13.1-beta2</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 e82e2a4f8a..46a9cdd6fe 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.1-BETA1" + VALUE "FileVersion", "13.1-BETA2" 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.1-BETA1" + VALUE "ProductVersion", "13.1-BETA2" END END BLOCK "VarFileInfo" |