Navigation Menu

Skip to content

Commit

Permalink
Merge pull request xbmc#1918 from MartijnKaijser/version_bump
Browse files Browse the repository at this point in the history
[release] bump version to 12.0rc1
  • Loading branch information
davilla committed Dec 11, 2012
2 parents 49b2d1f + 884b721 commit baaa51c
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion configure.in
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.


AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([xbmc], [12.0b3], [http://trac.xbmc.org]) AC_INIT([xbmc], [12.0rc1], [http://trac.xbmc.org])
AC_CONFIG_HEADERS([xbmc/config.h]) AC_CONFIG_HEADERS([xbmc/config.h])
AH_TOP([#pragma once]) AH_TOP([#pragma once])
m4_include([m4/ax_python_devel.m4]) m4_include([m4/ax_python_devel.m4])
Expand Down
4 changes: 2 additions & 2 deletions tools/android/packaging/xbmc/AndroidManifest.xml
Expand Up @@ -2,8 +2,8 @@
<!-- BEGIN_INCLUDE(manifest) --> <!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.xbmc.xbmc" package="org.xbmc.xbmc"
android:versionCode="2" android:versionCode="3"
android:versionName="12.0-BETA3" > android:versionName="12.0-RC1" >


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


VERSION=12.0 VERSION=12.0
REVISION=0~beta3 REVISION=0~rc1
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb


echo Creating $PACKAGE package version $VERSION revision $REVISION 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
Expand Up @@ -46,7 +46,7 @@ fi
PACKAGE=org.xbmc.xbmc-ios PACKAGE=org.xbmc.xbmc-ios


VERSION=12.0 VERSION=12.0
REVISION=0~beta3 REVISION=0~rc1
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb


echo Creating $PACKAGE package version $VERSION revision $REVISION echo Creating $PACKAGE package version $VERSION revision $REVISION
Expand Down
2 changes: 1 addition & 1 deletion xbmc/GUIInfoManager.h
Expand Up @@ -504,7 +504,7 @@ namespace INFO


#define VERSION_MAJOR 12 #define VERSION_MAJOR 12
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_TAG "-BETA3" #define VERSION_TAG "-RC1"


#define LISTITEM_START 35000 #define LISTITEM_START 35000
#define LISTITEM_THUMB (LISTITEM_START) #define LISTITEM_THUMB (LISTITEM_START)
Expand Down
4 changes: 2 additions & 2 deletions xbmc/osx/Info.plist
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>XBMC</string> <string>XBMC</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>12.0.beta3</string> <string>12.0.rc1</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>xbmc.icns</string> <string>xbmc.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
Expand All @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>12.0.beta3</string> <string>12.0.rc1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>r####</string> <string>r####</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
Expand Down
4 changes: 2 additions & 2 deletions xbmc/win32/XBMC_PC.rc
Expand Up @@ -71,12 +71,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Team XBMC" VALUE "CompanyName", "Team XBMC"
VALUE "FileDescription", "XBMC" VALUE "FileDescription", "XBMC"
VALUE "FileVersion", "12.0-BETA3" VALUE "FileVersion", "12.0-RC1"
VALUE "InternalName", "XBMC.exe" VALUE "InternalName", "XBMC.exe"
VALUE "LegalCopyright", "Copyright (c) Team XBMC. All rights reserved." VALUE "LegalCopyright", "Copyright (c) Team XBMC. All rights reserved."
VALUE "OriginalFilename", "XBMC.exe" VALUE "OriginalFilename", "XBMC.exe"
VALUE "ProductName", "XBMC for Windows" VALUE "ProductName", "XBMC for Windows"
VALUE "ProductVersion", "12.0-BETA3" VALUE "ProductVersion", "12.0-RC1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
Expand Down

0 comments on commit baaa51c

Please sign in to comment.