aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <mcm.kaijser@gmail.com>2013-04-14 14:05:11 +0200
committerS. Davilla <davilla@4pi.com>2013-05-02 10:46:47 -0400
commit32b1a5ef9e7f257a2559a3b766e85a55b22aec5f (patch)
treef062591b0dec7578d92c91bc57bc7ee62f106780
parent4dfa1aa8f65f906b71e4c5071c552d57c0cd0323 (diff)
bump version to 12.212.2-Frodo
-rw-r--r--configure.in2
-rw-r--r--media/Splash.pngbin32447 -> 32044 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
-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/configure.in b/configure.in
index 6565ed17d9..e98cc953c8 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.2-pre], [http://trac.xbmc.org])
+AC_INIT([xbmc], [12.2], [http://trac.xbmc.org])
AC_CONFIG_HEADERS([xbmc/config.h])
AH_TOP([#pragma once])
m4_include([m4/ax_python_devel.m4])
diff --git a/media/Splash.png b/media/Splash.png
index 7ab5fd0f56..e82ecc22de 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 208df9d484..27d72709ca 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="8"
- android:versionName="12.2-PRE" >
+ android:versionCode="9"
+ android:versionName="12.2" >
<!-- This is the platform API where NativeActivity was introduced. -->
<uses-sdk android:minSdkVersion="9" />
diff --git a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
index 8ccf839a76..4fa3b1e123 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=12.2
-REVISION=0~pre
+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 9e3ccab0eb..d7ca429db8 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=12.2
-REVISION=0~pre
+REVISION=0
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
echo Creating $PACKAGE package version $VERSION revision $REVISION
diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h
index 0b45f58b76..6d8b70f964 100644
--- a/xbmc/GUIInfoManager.h
+++ b/xbmc/GUIInfoManager.h
@@ -504,7 +504,7 @@ namespace INFO
#define VERSION_MAJOR 12
#define VERSION_MINOR 2
-#define VERSION_TAG "-PRE"
+#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 4d68fc12c0..7cd1235cac 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>12.2.pre</string>
+ <string>12.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>12.2.pre</string>
+ <string>12.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 517e1a3448..0da456789b 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", "12.2-PRE"
+ VALUE "FileVersion", "12.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", "12.2-PRE"
+ VALUE "ProductVersion", "12.2"
END
END
BLOCK "VarFileInfo"