Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release] version bump to 13.0 alpha3 as we start new merge window. #2510

Merged
merged 1 commit into from
Mar 31, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/xbmc.addon/addon.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="xbmc.addon" version="12.9.2" provider-name="Team XBMC">
<addon id="xbmc.addon" version="12.9.3" provider-name="Team XBMC">
<backwards-compatibility abi="12.0"/>
<requires>
<import addon="xbmc.core" version="0.1.0"/>
Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.59)
AC_INIT([xbmc], [12.9.2], [http://trac.xbmc.org])
AC_INIT([xbmc], [12.9.3], [http://trac.xbmc.org])
AC_CONFIG_HEADERS([xbmc/config.h])
AH_TOP([#pragma once])
m4_include([m4/ax_python_devel.m4])
Expand Down
4 changes: 2 additions & 2 deletions tools/android/packaging/xbmc/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="13.0-ALPHA2" >
android:versionCode="9"
android:versionName="13.0-ALPHA3" >

<!-- This is the platform API where NativeActivity was introduced. -->
<uses-sdk android:minSdkVersion="9" />
Expand Down
2 changes: 1 addition & 1 deletion tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fi
PACKAGE=org.xbmc.xbmc-atv2

VERSION=13.0
REVISION=0~alpha2
REVISION=0~alpha3
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb

echo Creating $PACKAGE package version $VERSION revision $REVISION
Expand Down
2 changes: 1 addition & 1 deletion tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fi
PACKAGE=org.xbmc.xbmc-ios

VERSION=13.0
REVISION=0~alpha2
REVISION=0~alpha3
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb

echo Creating $PACKAGE package version $VERSION revision $REVISION
Expand Down
2 changes: 1 addition & 1 deletion xbmc/GUIInfoManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ namespace INFO

#define VERSION_MAJOR 13
#define VERSION_MINOR 0
#define VERSION_TAG "-ALPHA2"
#define VERSION_TAG "-ALPHA3"

#define LISTITEM_START 35000
#define LISTITEM_THUMB (LISTITEM_START)
Expand Down
4 changes: 2 additions & 2 deletions xbmc/osx/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>XBMC</string>
<key>CFBundleGetInfoString</key>
<string>13.0.alpha2</string>
<string>13.0.alpha3</string>
<key>CFBundleIconFile</key>
<string>xbmc.icns</string>
<key>CFBundleIdentifier</key>
Expand All @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>13.0.alpha2</string>
<string>13.0.alpha3</string>
<key>CFBundleVersion</key>
<string>r####</string>
<key>CFBundleSignature</key>
Expand Down
8 changes: 4 additions & 4 deletions xbmc/win32/XBMC_PC.rc
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 12,9,2,0
PRODUCTVERSION 12,9,2,0
FILEVERSION 12,9,3,0
PRODUCTVERSION 12,9,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -71,12 +71,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Team XBMC"
VALUE "FileDescription", "XBMC"
VALUE "FileVersion", "13.0-ALPHA2"
VALUE "FileVersion", "13.0-ALPHA3"
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-ALPHA2"
VALUE "ProductVersion", "13.0-ALPHA3"
END
END
BLOCK "VarFileInfo"
Expand Down