aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <machine.sanctum@gmail.com>2014-08-17 15:19:05 +0200
committerMartijn Kaijser <machine.sanctum@gmail.com>2014-08-17 15:19:05 +0200
commit0f3db0516711e05765d297d060563730131c2f92 (patch)
treeb58af54efbba16f9584efa7f7b2736f6f0229cb1
parent9edc975926e075801e511b1f24124fe23b05ee55 (diff)
parent134adb10ceb2b788a33656ded8eb83345d48734f (diff)
Merge pull request #5213 from MartijnKaijser/13.2_final13.2-Gotham
[release] version bump to 13.2 final
-rw-r--r--media/Splash.pngbin125487 -> 124904 bytes
-rw-r--r--tools/android/packaging/xbmc/AndroidManifest.xml4
-rwxr-xr-xtools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh2
-rwxr-xr-xtools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh2
-rwxr-xr-xtools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh2
-rw-r--r--xbmc/GUIInfoManager.h2
-rw-r--r--xbmc/osx/Info.plist4
-rw-r--r--xbmc/win32/XBMC_PC.rc4
8 files changed, 10 insertions, 10 deletions
diff --git a/media/Splash.png b/media/Splash.png
index e79d78a122..8e4cd7b719 100644
--- a/media/Splash.png
+++ b/media/Splash.png
Binary files differ
diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml
index 87bb99498f..308b83ce83 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="31"
- android:versionName="13.2-RC1" >
+ android:versionCode="32"
+ android:versionName="13.2" >
<!-- 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 8739be098b..c21996294c 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~rc1
+REVISION=0
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 76967a7bbf..f686147c8a 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~rc1
+REVISION=0
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 92df958ae8..97b1802f3d 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~rc1
+REVISION=0
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 0e8c16c43e..0d7294a667 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 "-RC1"
+#define VERSION_TAG ""
#define LISTITEM_START 35000
#define LISTITEM_THUMB (LISTITEM_START)
diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist
index 3d18c7bd1d..62e5df427c 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-rc1</string>
+ <string>13.2</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-rc1</string>
+ <string>13.2</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 6d8bb6a26e..91693be637 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-RC1"
+ VALUE "FileVersion", "13.2"
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-RC1"
+ VALUE "ProductVersion", "13.2"
END
END
BLOCK "VarFileInfo"