From 523f4af080418f13a810259ed84c6ac8649bc51f Mon Sep 17 00:00:00 2001
From: Tarek Soliman <tsoliman@scummvm.org>
Date: Fri, 2 Dec 2011 12:26:58 -0600
Subject: [PATCH] RELEASE: This is 1.4.1pre

Actually, 007d9ef7734917e7666189eddc0ab5d6878b2c87 is but it's never too late
---
 backends/platform/psp/README.PSP   | 2 +-
 base/internal_version.h            | 2 +-
 dists/android/AndroidManifest.xml  | 4 +---
 dists/android/plugin-manifest.xml  | 2 +-
 dists/iphone/Info.plist            | 4 ++--
 dists/irix/scummvm.spec            | 2 +-
 dists/macosx/Info.plist            | 6 +++---
 dists/redhat/scummvm-tools.spec    | 2 +-
 dists/redhat/scummvm.spec          | 2 +-
 dists/scummvm.rc                   | 8 ++++----
 dists/slackware/scummvm.SlackBuild | 2 +-
 dists/wii/meta.xml                 | 2 +-
 dists/win32/scummvm.nsi            | 4 ++--
 13 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index b74a8f03e55..536572e3151 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,4 +1,4 @@
-ScummVM-PSP 1.4.0pre README
+ScummVM-PSP 1.4.1pre README
 ==============================================================================
 
 Installation
diff --git a/base/internal_version.h b/base/internal_version.h
index 2d1417ea4ea..406d1ffa0bc 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,4 +16,4 @@
 #define SCUMMVM_REVISION
 #endif
 
-#define SCUMMVM_VERSION "1.4.0pre" SCUMMVM_REVISION
+#define SCUMMVM_VERSION "1.4.1pre" SCUMMVM_REVISION
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index d04f9c1afc2..26c2de06370 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -4,7 +4,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
-		android:versionName="1.4.0pre"
+		android:versionName="1.4.1pre"
 		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
@@ -48,8 +48,6 @@
 
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-	<uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
-
 	<!-- Always needs some sort of qwerty keyboard.
 			Can work with a D-pad / trackball -->
 	<!-- <uses-configuration android:reqFiveWayNav="true"
diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml
index cd9674cc026..0b69505b083 100644
--- a/dists/android/plugin-manifest.xml
+++ b/dists/android/plugin-manifest.xml
@@ -3,7 +3,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
 		android:versionCode="@PLUGIN_VERSION_CODE@"
-		android:versionName="1.4.0pre"
+		android:versionName="1.4.1pre"
 		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index e34fb950a24..e6389c32907 100644
--- a/dists/iphone/Info.plist
+++ b/dists/iphone/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0pre</string>
+	<string>1.4.1pre</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0pre</string>
+	<string>1.4.1pre</string>
 	<key>CFBundleIconFile</key>
 	<string>icon.png</string>
 	<key>CFBundleIconFiles</key>
diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec
index 9ec804c3e7c..7e4c7a8c474 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
 product scummvm
-    id "ScummVM 1.4.0pre"
+    id "ScummVM 1.4.1pre"
     image sw
         id "software"
         version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 270b5c6cf67..55d51ec76b5 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.4.0pre, Copyright 2001-2011 The ScummVM team</string>
+	<string>1.4.1pre, Copyright 2001-2011 The ScummVM team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -40,9 +40,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0pre</string>
+	<string>1.4.1pre</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0pre</string>
+	<string>1.4.1pre</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index e3f26191d39..ef91aa2648a 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm-tools
-Version		: 1.4.0pre
+Version		: 1.4.1pre
 Release		: 1
 Summary		: ScummVM-related tools
 Group		: Interpreters
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 4da42a629f4..a3bd737a7d3 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 1.4.0pre
+Version		: 1.4.1pre
 Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 8adcfa279ca..a7bb099725f 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -51,8 +51,8 @@ pred.dic               FILE    "dists/pred.dic"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION     1,4,0,0
- PRODUCTVERSION  1,4,0,0
+ FILEVERSION     1,4,1,0
+ PRODUCTVERSION  1,4,1,0
  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS       VS_FF_DEBUG
@@ -69,13 +69,13 @@ BEGIN
         BEGIN
             VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
             VALUE "FileDescription", "http://www.scummvm.org/\0"
-            VALUE "FileVersion", "1.4.0pre\0"
+            VALUE "FileVersion", "1.4.1pre\0"
             VALUE "InternalName", "scummvm\0"
             VALUE "LegalCopyright", "Copyright © 2001-2011 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "ProductName", "ScummVM\0"
-            VALUE "ProductVersion", "1.4.0pre\0"
+            VALUE "ProductVersion", "1.4.1pre\0"
         END
     END
 
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index aa98c8a87ad..521ed30c0a6 100755
--- a/dists/slackware/scummvm.SlackBuild
+++ b/dists/slackware/scummvm.SlackBuild
@@ -9,7 +9,7 @@ if [ "$TMP" = "" ]; then
 fi
 PKG=$TMP/package-scummvm
 
-VERSION=1.4.0pre
+VERSION=1.4.1pre
 ARCH=i486
 BUILD=1
 
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index f33c2f7dfac..d30856170fc 100644
--- a/dists/wii/meta.xml
+++ b/dists/wii/meta.xml
@@ -2,7 +2,7 @@
 <app version="1">
   <name>ScummVM</name>
   <coder>The ScummVM Team</coder>
-  <version>1.4.0pre@REVISION@</version>
+  <version>1.4.1pre@REVISION@</version>
   <release_date>@TIMESTAMP@</release_date>
   <short_description>Point &amp; Click Adventures</short_description>
   <long_description>ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed!
diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi
index 23adb610de7..6803ba25a75 100644
--- a/dists/win32/scummvm.nsi
+++ b/dists/win32/scummvm.nsi
@@ -72,7 +72,7 @@ Name ScummVM
 # General Symbol Definitions
 #########################################################################################
 !define REGKEY      "Software\$(^Name)\$(^Name)"
-!define VERSION     "1.4.0pre"
+!define VERSION     "1.4.1pre"
 !define COMPANY     "ScummVM Team"
 !define URL         "http://scummvm.org/"
 !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!"
@@ -92,7 +92,7 @@ XPStyle  on
 #TargetMinimalOS 5.0    ; Minimal version of windows for installer: Windows 2000 or more recent
                         ; (will build unicode installer with NSIS 2.50+)
 
-VIProductVersion 1.4.0.0
+VIProductVersion 1.4.1.0
 VIAddVersionKey  ProductName      $(^Name)
 VIAddVersionKey  ProductVersion  "${VERSION}"
 VIAddVersionKey  CompanyName     "${COMPANY}"