Merge remote branch 'upstream/master' into pegasus

Conflicts:
	video/qt_decoder.cpp

31 files changed, 747 insertions, 61 deletions

diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index e540e4e8b9..e7778fdf61 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -2,10 +2,11 @@
 <!-- NB: android:versionCode needs to be bumped for formal releases -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.inodes.gus.scummvm"
+		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
-		android:versionName="1.4.0git"
-		android:installLocation="preferExternal">
+		android:versionName="1.5.0git"
+		android:installLocation="preferExternal"
+		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
 			want Android 2.2 (SDK 8) defaults and features. -->
@@ -30,8 +31,8 @@
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden">
-			<meta-data android:name="org.inodes.gus.unpacker.nextActivity"
-				android:value="org.inodes.gus.scummvm/.ScummVMActivity"/>
+			<meta-data android:name="org.scummvm.unpacker.nextActivity"
+				android:value="org.scummvm.scummvm/.ScummVMActivity"/>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -39,7 +40,7 @@
 		</activity>
 	</application>
 
-	<permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
+	<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
 		android:label="@string/scummvm_perm_plugin_label"
 		android:description="@string/scummvm_perm_plugin_desc"
 		android:protectionLevel="signature"/>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index e9ab30a42b..8f7887eaf5 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -2,10 +2,11 @@
 <!-- NB: android:versionCode needs to be bumped for formal releases -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.inodes.gus.scummvm"
+		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
 		android:versionName="@VERSION@"
-		android:installLocation="preferExternal">
+		android:installLocation="preferExternal"
+		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
 			want Android 2.2 (SDK 8) defaults and features. -->
@@ -30,8 +31,8 @@
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden">
-			<meta-data android:name="org.inodes.gus.unpacker.nextActivity"
-				android:value="org.inodes.gus.scummvm/.ScummVMActivity"/>
+			<meta-data android:name="org.scummvm.unpacker.nextActivity"
+				android:value="org.scummvm.scummvm/.ScummVMActivity"/>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -39,7 +40,7 @@
 		</activity>
 	</application>
 
-	<permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
+	<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
 		android:label="@string/scummvm_perm_plugin_label"
 		android:description="@string/scummvm_perm_plugin_desc"
 		android:protectionLevel="signature"/>
diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml
index 2fbd56b367..51b39be3b1 100644
--- a/dists/android/plugin-manifest.xml
+++ b/dists/android/plugin-manifest.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@"
+		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
 		android:versionCode="@PLUGIN_VERSION_CODE@"
-		android:versionName="1.4.0git"
-		android:installLocation="preferExternal">
+		android:versionName="1.5.0git"
+		android:installLocation="preferExternal"
+		android:sharedUserId="org.scummvm.scummvm">
 
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
 
 	<application android:label="@string/app_name"
 			android:description="@string/app_desc"
 			android:icon="@drawable/scummvm">
-		<receiver android:name="org.inodes.gus.scummvm.PluginProvider"
-				android:process="org.inodes.gus.scummvm">
+		<receiver android:name="org.scummvm.scummvm.PluginProvider"
+				android:process="org.scummvm.scummvm">
 			<intent-filter>
-				<action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/>
+				<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
 				<category android:name="android.intent.category.INFO"/>
 			</intent-filter>
-			<meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB"
+			<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
 					android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
 		</receiver>
 	</application>
 
-	<uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/>
+	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
 	<uses-configuration android:reqFiveWayNav="true"
 			android:reqKeyboardType="qwerty"/>
 
diff --git a/dists/android/plugin-manifest.xml.in b/dists/android/plugin-manifest.xml.in
index 47db078c93..4b429097ae 100644
--- a/dists/android/plugin-manifest.xml.in
+++ b/dists/android/plugin-manifest.xml.in
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@"
+		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
 		android:versionCode="@PLUGIN_VERSION_CODE@"
 		android:versionName="@VERSION@"
-		android:installLocation="preferExternal">
+		android:installLocation="preferExternal"
+		android:sharedUserId="org.scummvm.scummvm">
 
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
 
 	<application android:label="@string/app_name"
 			android:description="@string/app_desc"
 			android:icon="@drawable/scummvm">
-		<receiver android:name="org.inodes.gus.scummvm.PluginProvider"
-				android:process="org.inodes.gus.scummvm">
+		<receiver android:name="org.scummvm.scummvm.PluginProvider"
+				android:process="org.scummvm.scummvm">
 			<intent-filter>
-				<action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/>
+				<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
 				<category android:name="android.intent.category.INFO"/>
 			</intent-filter>
-			<meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB"
+			<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
 					android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
 		</receiver>
 	</application>
 
-	<uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/>
+	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
 	<uses-configuration android:reqFiveWayNav="true"
 			android:reqKeyboardType="qwerty"/>
 
diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml
index 7b633c416d..8b0d515d62 100644
--- a/dists/android/res/layout/main.xml
+++ b/dists/android/res/layout/main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.inodes.gus.scummvm.EditableSurfaceView
+<org.scummvm.scummvm.EditableSurfaceView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/main_surface"
 	android:layout_width="fill_parent"
diff --git a/dists/debian/changelog b/dists/debian/changelog
new file mode 100644
index 0000000000..902aa89c9a
--- /dev/null
+++ b/dists/debian/changelog
@@ -0,0 +1,544 @@
+scummvm (1.4.0-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixes script bug in "Beneath a Steel Sky" (Closes: #462595)
+  * Remove Build-Conflicts on liboss-salsa-dev and disable ALSA on
+    kfreebsd (Closes: #647124)
+  * Bump debhelper level to 9, which enables default build flags
+    and thus hardened compiler flags	
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sat, 05 Nov 2011 10:29:43 +0100
+
+scummvm (1.3.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Mon, 04 Jul 2011 19:07:04 +0200
+
+scummvm (1.3.0-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixes FTBFS with ld --as-needed (Closes: #607182)
+  * Version debhelper build dep for debhelper override support
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Wed, 25 May 2011 19:02:23 +0200
+
+scummvm (1.2.1-2) unstable; urgency=low
+
+  * Pass "--enable-release" to the configure script. This prevents
+    the build of a few "work in progress" engines, which upstream
+    doesn't see fit for general use yet.
+  * Add a build conflict on liboss-salsa-dev to prevent the libsalsa
+    emulation library being present in the buildd chroots. ScummVM
+    itself builds fine with OSS support (Closes: #600655)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sun, 19 Dec 2010 19:51:42 +0100
+
+scummvm (1.2.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sat, 11 Dec 2010 12:17:22 +0100
+
+scummvm (1.2.0-2) unstable; urgency=low
+
+  * Add python to the build dependencies, since it's needed for the
+    test suite (Closes: #600173)
+  * Change data dir to /usr/share/scummvm (Closes: #600157)
+  * 1.2.0 also introduced official support for SCI games (Closes: #576268)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sun, 17 Oct 2010 15:58:36 +0200
+
+scummvm (1.2.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #593945)
+  * Drop obsolete build deps on texlive-base, texlive-extra-utils,
+    ghostscript (Thanks, Max Horn)
+  * Update description to point out that ScummVM supports much
+    more than SCUMM these days (Thanks, Max Horn)
+  * Update to standards version 3.9.1:
+    - Modify asound build dep to linux-any
+  * Unversion several build deps even supported in oldstable
+	
+ -- Moritz Muehlenhoff <jmm@debian.org>  Tue, 12 Oct 2010 21:49:29 +0200
+
+scummvm (1.1.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Switch to bz2 upstream tarball
+  * Disable SCI engine as requested by upstream, it's not yet ready to
+    replace FreeSCI	
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Fri, 07 May 2010 18:57:09 +0200
+
+scummvm (1.1.0-2) unstable; urgency=low
+
+  * Do not build-depend on libasound on KFreeBSD and the Hurd
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sun, 25 Apr 2010 22:28:48 +0200
+
+scummvm (1.1.0-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixes running ScummVM without a soundcard (Closes: #540166)
+  * Enable SCI engine (Closes: #576268)
+  * Lintian cleanups, bump standards version (no changes necessary)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Wed, 07 Apr 2010 20:49:10 +0200
+
+scummvm (1.0.0-4) unstable; urgency=high
+
+  * Fix Replaces for scummvm.xpm (Closes: #573372)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Mon, 22 Mar 2010 18:46:55 +0100
+
+scummvm (1.0.0-3) unstable; urgency=low
+
+  * Install the architecture-independant data files into a separate
+    binary package to save disk space on the mirrors.
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Tue, 26 Jan 2010 21:01:25 +0100
+
+scummvm (1.0.0-2) unstable; urgency=low
+
+  * Switch to a minimal dh Makefile
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Wed, 06 Jan 2010 22:03:22 +0100
+
+scummvm (1.0.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Switch to source format 3 (quilt)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Mon, 16 Nov 2009 19:48:57 +0100
+
+scummvm (1.0.0~rc1-1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #544570)
+    - Adds support for Discworld (Closes: #513950)
+  * Remove dh_desktop
+  * Version the dependency on debhelper
+  * Bump Standards-Version to 3.8.1, no changes needed
+  * Update copyright file	
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Tue, 01 Sep 2009 22:11:17 +0200
+
+scummvm (0.13.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #530863)
+  * Bump Standards-Version to 3.8.1, add Homepage field	
+  * Bump debhelper level to 7
+  * Build-depend on ghostscript instead of gs-gpl
+  * Build-depend on texlive-base instead of tetex-bin
+  * Build-depend on texlive-extra-utils instead of tetex-extra
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sun, 07 Jun 2009 12:28:30 +0200
+
+scummvm (0.13.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #499849)
+  * Move maintainer to Debian Games Team, add myself and David as
+    uploaders
+  * Fix link to compability matrix in package description
+    (Closes: #508894) 
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sat, 07 Mar 2009 01:18:12 +0100
+
+scummvm (0.11.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Install upstream NEWS file too
+
+ -- David Weinehall <tao@debian.org>  Sat, 01 Mar 2008 10:28:14 +0200
+
+scummvm (0.11.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #465745)
+  * debian/control:
+    - Build-Depend on libflac (>= 1.1.2), not (>= 1.1.2-1) to simplify
+      things for backports
+    - Standards-Version 3.7.3 - no changes required
+  * debian/copyright:
+    - Fixed to contain better copyright information
+
+ -- David Weinehall <tao@debian.org>  Thu, 14 Feb 2008 15:38:44 +0200
+
+scummvm (0.10.0-2) unstable; urgency=low
+
+  * Run configure before clean target (Closes: #445610)
+
+ -- David Weinehall <tao@debian.org>  Sun, 07 Oct 2007 15:56:49 +0300
+
+scummvm (0.10.0-1) unstable; urgency=low
+
+  * The ``Too late for words'' release
+  * New upstream release
+
+ -- David Weinehall <tao@debian.org>  Thu, 04 Oct 2007 00:54:56 +0300
+
+scummvm (0.9.1-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/prepare: refer to me instead
+  * debian/copyright: add the date I adopted the package 
+
+ -- David Weinehall <tao@debian.org>  Mon, 30 Oct 2006 16:44:12 +0200
+
+scummvm (0.9.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #379184)
+    - Buffer overflow fixed (Closes: #292263)
+  * debian/control:
+    - Standards-Version 3.7.2.1 - no changes required
+
+ -- David Weinehall <tao@debian.org>  Sat, 23 Sep 2006 16:01:48 +0300
+
+scummvm (0.8.2-2) unstable; urgency=low
+
+  * Install (updated) .desktop-file + SVG-icon (Closes: #361534)
+    | Thanks to Sven Arvidsson
+
+ -- David Weinehall <tao@debian.org>  Sun,  9 Apr 2006 01:42:30 +0300
+
+scummvm (0.8.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- David Weinehall <tao@debian.org>  Sun,  5 Feb 2006 20:48:31 +0200
+
+scummvm (0.8.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * New maintainer.
+
+ -- David Weinehall <tao@debian.org>  Mon, 30 Jan 2006 10:29:59 +0200
+
+scummvm (0.8.0-1) unstable; urgency=low
+
+  * New upstream release:
+      - Uses British English as the default subtitle language for Beneath a
+        Steel Sky, closes: #329157.
+
+  * debian/control, debian/rules:
+      - Build using the default GCC, as GCC 4 is now supported.
+
+  * debian/control:
+      - Add a dependency on libfluidsynth-dev, as the new upstream release can
+        make use of the fluidsynth library directly.
+
+ -- Tore Anderson <tore@debian.org>  Sat, 29 Oct 2005 21:05:52 +0200
+
+scummvm (0.7.1-3) unstable; urgency=low
+
+  * debian/control:
+      - Narrow build-dependency on libflac-dev to version 1.1.2-1 or above,
+        closes: #325954.  Many thanks to Joshua Kwan for notifying me of FLAC's
+        recent SONAME increase, which necessitates this change.
+
+ -- Tore Anderson <tore@debian.org>  Fri,  2 Sep 2005 07:20:32 +0200
+
+scummvm (0.7.1-2) unstable; urgency=low
+
+  * debian/control, debian/rules:
+      - Compile the package with GCC 3.4.
+
+  * debian/prepare (new):
+      - Added a script that prepares the debian/ tree for building developement
+        snapshots of ScummVM.
+
+  * debian/control:
+      - Up standards-version to 3.6.2.1, no changes required.
+
+ -- Tore Anderson <tore@debian.org>  Sun, 31 Jul 2005 11:38:18 +0200
+
+scummvm (0.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * debian/control:
+      - Remove the nasm [!i386] build conflict, as the configure script now
+        correctly detects if nasm can be used.
+      - Up standards-version to 3.6.1.1 (no changes required).
+
+  * configure:
+      - Reverted to the upstream version, as the GCC 4.0 patch from 0.7.0-3 is
+        now included there.
+
+ -- Tore Anderson <tore@debian.org>  Tue, 29 Mar 2005 21:57:38 +0200
+
+scummvm (0.7.0-3) unstable; urgency=medium
+
+  * debian/control:
+      - Add a version requirement of >= 1.1.1-2 to the libflac-dev build
+        dependency, closes: #289214.
+      - Add fluidsynth as a preferred alternative to the timidity suggestion.
+      - Remove superfluous "the" from the description.
+
+  * configure:
+      - Partly apply patch from Andreas Jochens, closes: #289122.  Thanks!
+        Hopefully, this should make it possible to compile ScummVM on AMD64
+        using GCC 4.0.  GCC 4.0 is not yet supported from upstream, though.
+
+ -- Tore Anderson <tore@debian.org>  Sat,  8 Jan 2005 15:03:34 +0100
+
+scummvm (0.7.0-2) unstable; urgency=low
+
+  * debian/control:
+      - Build-depend on nasm only on i386.
+      - Add a build conflict on nasm for all other archs than i386.
+      - Add an explicit build dependency on libz-dev.
+
+  * debian/copyright:
+      - Change URLs from http://scummvm.sf.net/ to http://www.scummvm.org/.
+
+ -- Tore Anderson <tore@debian.org>  Wed,  5 Jan 2005 23:22:08 +0100
+
+scummvm (0.7.0-1) unstable; urgency=low
+
+  * New upstream release.
+      - Fixes scripting bug that in some cases may render the game unwinnable,
+        closes: #209418.
+
+  * debian/control:
+      - Improve description.  Closes: #266055.  Thanks, Frederic Briere!
+      - Add build dependencies on nasm, tetex-bin, tetex-extra, gs-gpl, and
+        libflac-dev.
+
+  * debian/rules, debian/scummvm.docs, debian/copyright:
+      - Build and include README.pdf (generated from doc/*.tex).
+      - Include AUTHORS, and reference it from debian/copyright instead of
+        maintaining a separate list of authors there.
+
+  * debian/scummvm.dirs, debian/rules, debian/scummvm.sh (removed):
+      - A more sane default save game path has been chosen upstream.  Remove
+        the Debian-specific wrapper script workaround introduced in 0.6.0-2
+        accordingly.
+
+ -- Tore Anderson <tore@debian.org>  Wed,  5 Jan 2005 14:43:08 +0100
+
+scummvm (0.6.1b-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tore Anderson <tore@debian.org>  Fri,  6 Aug 2004 12:45:46 +0200
+
+scummvm (0.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tore Anderson <tore@debian.org>  Mon, 26 Jul 2004 15:11:10 +0200
+
+scummvm (0.6.0-2) unstable; urgency=low
+
+  * debian/scummvm.dirs, debian/rules, debian/scummvm.sh (new):
+      - Make /usr/games/scummvm be a wrapper script which creates the
+        ~/.scummvmrc file if it doesn't already exist, setting the savegame
+        path to ~/.scummvm/.  Closes: #216178.  This is a workaround, though,
+        I really wish this would be fixed in the upstream sources.
+
+  * debian/control:
+      - Correct the compability chart link in the package description.
+      - Update package description so it is clear that Flight of The Amazon
+        Queen and Beneath a Steel Sky is available in Debian, closes: #245356.
+
+  * debian/README.Debian (removed):
+      - Removed from the package, as it only spoke of the ScummVM tools,
+        which was removed in the 0.6.0-1 upload.  Closes: #259259 (sort-of).
+
+  * base/main.cpp, scumm/actor.cpp, scumm/debugger.cpp:
+      - GCC 3.4 fixes from Andreas Jochens.  Thanks!  Closes: #259835.
+
+ -- Tore Anderson <tore@debian.org>  Sun, 18 Jul 2004 12:26:27 +0200
+
+scummvm (0.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * debian/control:
+      - Build-Depend on libmpeg2-4-dev to support Broken Sword cutscenes.
+
+  * debian/rules:
+      - Start using upstream's new configure script.
+      - Remove unneeded call to dh_link.
+
+  * debian/scummvm.docs:
+      - Add upstream's TODO file.
+
+  * debian/scummvm.menu:
+      - Enclose the "needs" and "section" directives in double quotes.
+
+  * debian/patches/* (removed), debian/control, debian/rules:
+      - Stop using dpatch.  All of the previously required patches are now
+        integrated in the upstream sources.
+
+  * debian/tools/* (removed), debian/scummvm.examples, debian/rules:
+      - Remove the various tools as they really don't belong in the ScummVM
+        package.
+
+ -- Tore Anderson <tore@debian.org>  Sun, 14 Mar 2004 16:28:54 +0100
+
+scummvm (0.5.1-4) unstable; urgency=low
+
+  * debian/patches/03alsa_api_fix.dpatch (new), debian/patches/00list:
+      - FTBFS fix;  improve ALSA version detection macro so it works with
+        version 1.0 and above.  Thanks, Jordi Mallach!
+
+ -- Tore Anderson <tore@debian.org>  Sun,  1 Feb 2004 01:36:07 +0100
+
+scummvm (0.5.1-3) unstable; urgency=low
+
+  * debian/patches/02bass_soundreload (new):
+    - Forces BASS to reload music and sound even if the intro was
+      viewed in full, closes: #208901.
+  * debian/control:
+    - Change maintainer email address.
+    - Bump Standards-Version to current policy, no changes required.
+
+ -- Tore Anderson <tore@debian.org>  Mon, 29 Sep 2003 16:13:43 +0200
+
+scummvm (0.5.1-2) unstable; urgency=low
+
+  * Move to main.  (Note to the FTP masters:  This is because the
+    one of the supported games, Beneath A Steel Sky, has recently been
+    released as free software.  It should appear in NEW shortly, if
+    it's not there already.)
+  * Sponsored by David Weinehall.
+
+ -- David Weinehall <tao@debian.org>  Wed, 27 Aug 2003 21:00:42 +0200
+
+scummvm (0.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Sponsored by David Weinehall. (No beer needed...)
+
+ -- Tore Anderson <tore@linpro.no>  Sat,  9 Aug 2003 15:18:18 +0200
+
+scummvm (0.5.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Suggest beneath-a-steel-sky.
+  * Restructure 00buildopts somewhat, to ease future maintenance.
+  * Standards-Version 3.6.0, no changes required.
+  * Revised the description.
+  * Sponsored by Joey Hess. (Tore fed me all the beer I could take .. 
+    and then asked me to do this. ;-)
+
+ -- Tore Anderson <tore@linpro.no>  Fri,  1 Aug 2003 21:45:06 +0200
+
+scummvm (0.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Standards-Version 3.5.10.
+    - Use upstream's icon in the menu system.
+  * Removed debian/patches/01-enable-alsa-and-vorbis.dpatch, this
+    is now done from debian/rules instead.
+  * Added debian/patches/00buildopts, which makes it possible
+    for environment variables to override the compiler flags.
+  * Better handling of $DEB_BUILD_OPTIONS.
+  * Declare the debhelper compability level in debian/compat instead
+    of debian/rules.
+
+ -- Tore Anderson <tore@linpro.no>  Thu, 29 May 2003 15:15:55 +0200
+
+scummvm (0.4.0-1) unstable; urgency=low
+
+  * New upstream release, closes: #193522.
+    - Lots of VM fixes in The DIG, closes: #173550.
+    - Obsoletes debian/patches/02-fix-manpage-savekey.dpatch.
+    - Obsoletes debian/patches/03-fix-talking-to-parrot.dpatch.
+    - Obsoletes debian/patches/04-alsa-seq-tty-output.dpatch.
+  * Add extract.c and simon2mp3.c to the examples directory, closes: #154449.
+
+ -- Tore Anderson <tore@linpro.no>  Wed, 14 May 2003 19:04:53 +0200
+
+scummvm (0.3.0b-3) unstable; urgency=low
+
+  * It appears I reinvented the wheel.  Start using dpatch instead of
+    my own patchsystem.
+  * Update Standards-Version to match current policy.
+  * Tighten build-dependency on libvorbis-dev, to ensure that the binary
+    will be linked against the new libvorbis0a package.  Closes: #185447.
+
+ -- Tore Anderson <tore@linpro.no>  Tue, 18 Mar 2003 22:54:32 +0100
+
+scummvm (0.3.0b-2) unstable; urgency=low
+
+  * Re-upload to build the binary with GCC 3.2.
+  * Use a patch system instead of putting all changes in the .diff.gz.
+  * Correct save-game modifier key in the manpage. Closes: #173153.
+  * Two fixes from upstream:
+    - Fix 'talking to parrot' script deadlock in Fate of Atlantis.
+    - Print correct alsa client and port variables to console.
+
+ -- Tore Anderson <tore@linpro.no>  Fri, 10 Jan 2003 17:28:36 +0100
+
+scummvm (0.3.0b-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update standards-version again.
+  * Convert icon to use only the colours mandated by the menu package.
+
+ -- Tore Anderson <tore@linpro.no>  Sun,  8 Dec 2002 14:56:26 +0100
+
+scummvm (0.2.81cvs20021110-1) unstable; urgency=low
+
+  * New CVS snapshot.
+  * Remove README.Debian - it was incorrect.
+  * Drop build-deps on curses and readline.
+  * Update standards-version to current policy.
+  * Don't install the empty dir /usr/lib/scummvm anymore.
+
+ -- Tore Anderson <tore@linpro.no>  Sun, 10 Nov 2002 17:13:36 +0100
+
+scummvm (0.2.0.1cvs20021028-1) unstable; urgency=low
+
+  * New CVS snapshot.
+  * Kill cruft that sneaked into the .diff.gz.
+  * Add menu entry.
+  * Rewrote description and copyright file.
+  * Suggest timidity (can be used with ALSA for gorgeous in-game music).
+  * Support .SOG (Ogg Vorbis-compressed .SOU-files).
+
+ -- Tore Anderson <tore@linpro.no>  Mon, 28 Oct 2002 14:30:21 +0100
+
+scummvm (0.2.0.1cvs20021012-1) unstable; urgency=low
+
+  * New upstream rele^WCVS snapshot.
+  * New maintainer. Closes: #163105.
+  * Compliant with Policy 3.5.7.0. Or so I hope.
+  * Support ALSA's sequencer. Closes: #154451.
+
+ -- Tore Anderson <tore@linpro.no>  Sat, 12 Oct 2002 15:17:11 +0200
+
+scummvm (0.2.0.1) unstable; urgency=low
+
+  * Fix by James Brown <ender@enderboi.com> for the trailing slash bug
+    (Closes: #150144)
+  * Add libmad-dev to the Buildreqs, compile with compressed audio support
+    (Closes: #150272)
+
+ -- Bastien Nocera <hadess@hadess.net>  Tue, 18 Jun 2002 02:35:50 +0100
+
+scummvm (0.2.0) unstable; urgency=low
+
+  * New upstream version (Closes: #143281)
+  * Killed the wrapper script, see upstream changelog
+
+ -- Bastien Nocera <hadess@hadess.net>  Wed, 15 May 2002 03:27:11 +0100
+
+scummvm (0.1.0b-2) unstable; urgency=low
+
+  * Moved the scummvm main bin under /usr/lib, the wrapper script under
+    /usr/games
+  * Fixed bug in the script that made it not work if the path was relative
+
+ -- Bastien Nocera <hadess@hadess.net>  Wed, 10 Apr 2002 19:27:05 +0100
+
+scummvm (0.1.0b-1) unstable; urgency=low
+
+  * Initial Release.
+  * Packaged made under the influence of beer at GUAD3C in Sevilla ! Arriba !
+    Ole !
+
+ -- Bastien Nocera <hadess@hadess.net>  Fri,  5 Apr 2002 16:37:09 +0100
+
diff --git a/dists/debian/compat b/dists/debian/compat
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/dists/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/dists/debian/control b/dists/debian/control
new file mode 100644
index 0000000000..40c0e53470
--- /dev/null
+++ b/dists/debian/control
@@ -0,0 +1,59 @@
+Source: scummvm
+Section: games
+Priority: optional
+Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Uploaders: David Weinehall <tao@debian.org>, Moritz Muehlenhoff <jmm@debian.org>
+Build-Depends: debhelper (>= 7.0.50~), nasm [i386], libsdl1.2-dev, libmad0-dev, libasound2-dev [linux-any], libvorbis-dev, libmpeg2-4-dev, libflac-dev, libz-dev, libfluidsynth-dev, python
+Standards-Version: 3.9.2
+Homepage: http://www.scummvm.org
+
+Package: scummvm
+Architecture: any
+Depends: ${shlibs:Depends}, scummvm-data, ${misc:Depends}
+Suggests: fluidsynth | timidity, beneath-a-steel-sky, flight-of-the-amazon-queen
+Description: engine for several graphical adventure games
+ ScummVM is a `virtual machine' for several classic graphical
+ point-and-click adventure games.  It is designed to run Adventure Soft's
+ Simon the Sorcerer 1 and 2, Revolution's Beneath A Steel Sky, and games
+ based on LucasArts' SCUMM (Script Creation Utility for Maniac Mansion)
+ system.  SCUMM is used for many games, including Monkey Island,
+ Day of the Tentacle, Sam and Max and more.  See the official compatibility
+ list at <http://www.scummvm.org/compatibility.php> for a full list
+ of supported games.
+ .
+ The game data of two games compatible with ScummVM is included in Debian.
+ These are:
+ .
+  - Beneath a Steel Sky        (package name: beneath-a-steel-sky)
+  - Flight of the Amazon Queen (package name: flight-of-the-amazon-queen)
+ .
+ To actually make use of ScummVM, you'll have to install one of these, or
+ obtain the proprietary game data for another supported game from somewhere
+ else.
+
+Package: scummvm-data
+Architecture: all
+Depends: ${shlibs:Depends},${misc:Depends}
+Replaces: scummvm (<< 1.0.0-3)
+Description: engine for several graphical adventure games (data files)
+ ScummVM is a `virtual machine' for several classic graphical
+ point-and-click adventure games.  It is designed to run Adventure Soft's
+ Simon the Sorcerer 1 and 2, Revolution's Beneath A Steel Sky, and games
+ based on LucasArts' SCUMM (Script Creation Utility for Maniac Mansion)
+ system.  SCUMM is used for many games, including Monkey Island,
+ Day of the Tentacle, Sam and Max and more.  See the official compatibility
+ list at <http://www.scummvm.org/compatibility.php> for a full list
+ of supported games.
+ .
+ The game data of two games compatible with ScummVM is included in Debian.
+ These are:
+ .
+  - Beneath a Steel Sky        (package name: beneath-a-steel-sky)
+  - Flight of the Amazon Queen (package name: flight-of-the-amazon-queen)
+ .
+ To actually make use of ScummVM, you'll have to install one of these, or
+ obtain the proprietary game data for another supported game from somewhere
+ else.
+ .
+ These packages provides data files needed to run some engines supported by
+ ScummVM.
diff --git a/dists/debian/copyright b/dists/debian/copyright
new file mode 100644
index 0000000000..e0885ae9e6
--- /dev/null
+++ b/dists/debian/copyright
@@ -0,0 +1,41 @@
+ScummVM was debianized by Bastien Nocera <hadess@hadess.net> the 5th Apr 2002.
+It was adopted by Tore Anderson <tore@linpro.no> the 4th Oct 2002,
+then adopted by David Weinehall <tao@debian.org> the 30th Jan 2006,
+then adopted by the Debian Games Team by Moritz Muehlenhoff <jmm@debian.org>
+
+It was downloaded from <http://www.scummvm.org/>.
+
+Upstream Authors: see `/usr/share/doc/scummvm/AUTHORS'.
+
+Scummvm is Copyright © 2002-2010 The ScummVM Project
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+
+This copyright also applies to the Debian-related build scripts.
+
+Some parts of ScummVM (the mt32 softsynth code) is covered by a more
+permissive BSD-style license:
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
diff --git a/dists/debian/rules b/dists/debian/rules
new file mode 100755
index 0000000000..bf91ca37aa
--- /dev/null
+++ b/dists/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
+	./configure --prefix=/usr --datadir=/usr/share/scummvm --enable-release --disable-alsa
+else
+	./configure --prefix=/usr --datadir=/usr/share/scummvm --enable-release
+endif
+
+
+
diff --git a/dists/debian/scummvm-data.install b/dists/debian/scummvm-data.install
new file mode 100644
index 0000000000..c77aefbc0a
--- /dev/null
+++ b/dists/debian/scummvm-data.install
@@ -0,0 +1,5 @@
+icons/scummvm.xpm usr/share/icons
+icons/scummvm.svg usr/share/icons
+dists/scummvm.desktop usr/share/applications
+gui/themes/scummmodern.zip usr/share/scummvm
+dists/pred.dic usr/share/scummvm
diff --git a/dists/debian/scummvm.dirs b/dists/debian/scummvm.dirs
new file mode 100644
index 0000000000..6b05c7ace8
--- /dev/null
+++ b/dists/debian/scummvm.dirs
@@ -0,0 +1,5 @@
+usr/games
+usr/share/man/man6
+usr/share/icons
+usr/share/scummvm
+usr/share/applications
diff --git a/dists/debian/scummvm.docs b/dists/debian/scummvm.docs
new file mode 100644
index 0000000000..c73c810363
--- /dev/null
+++ b/dists/debian/scummvm.docs
@@ -0,0 +1,5 @@
+AUTHORS
+COPYRIGHT
+README
+TODO
+NEWS
diff --git a/dists/debian/scummvm.install b/dists/debian/scummvm.install
new file mode 100644
index 0000000000..457a89cfaa
--- /dev/null
+++ b/dists/debian/scummvm.install
@@ -0,0 +1,2 @@
+scummvm usr/games
+
diff --git a/dists/debian/scummvm.manpages b/dists/debian/scummvm.manpages
new file mode 100644
index 0000000000..7b3eb23799
--- /dev/null
+++ b/dists/debian/scummvm.manpages
@@ -0,0 +1 @@
+dists/scummvm.6
diff --git a/dists/debian/scummvm.menu b/dists/debian/scummvm.menu
new file mode 100644
index 0000000000..27d94b0e65
--- /dev/null
+++ b/dists/debian/scummvm.menu
@@ -0,0 +1,3 @@
+?package(scummvm):needs="x11" section="Games/Adventure" \
+  title="ScummVM" command="/usr/games/scummvm" \
+  icon="/usr/share/icons/scummvm.xpm"
diff --git a/dists/engine-data/m4.dat b/dists/engine-data/m4.dat
deleted file mode 100644
index 3181d0182c..0000000000
--- a/dists/engine-data/m4.dat
+++ /dev/null
diff --git a/dists/engine-data/mads.dat b/dists/engine-data/mads.dat
deleted file mode 100644
index b27f9d4471..0000000000
--- a/dists/engine-data/mads.dat
+++ /dev/null
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index e57989a7c3..e25cee51ea 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.0git</string>
+	<string>1.5.0git</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0git</string>
+	<string>1.5.0git</string>
 	<key>CFBundleIconFile</key>
 	<string>icon.png</string>
 	<key>CFBundleIconFiles</key>
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index 73876e6bd1..6a613bbbd5 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -8,7 +8,6 @@ f 0644 root sys usr/ScummVM/share/pixmaps/scummvm.xpm scummvm.xpm scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/drascula.dat drascula.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/kyra.dat kyra.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/lure.dat lure.dat scummvm.sw.eoe
-f 0644 root sys usr/ScummVM/share/scummvm/m4.dat m4.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/pred.dic pred.dic scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/queen.tbl queen.tbl scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/scummmodern.zip scummmodern.zip scummvm.sw.eoe
diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec
index 141d37070f..2e099d94a8 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
 product scummvm
-    id "ScummVM 1.4.0git"
+    id "ScummVM 1.5.0git"
     image sw
         id "software"
         version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 96238e4e23..a355ec1e62 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.0git, Copyright 2001-2011 The ScummVM team</string>
+	<string>1.5.0git, 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.0git</string>
+	<string>1.5.0git</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0git</string>
+	<string>1.5.0git</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 72b1ac701f..99add8ba85 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.0git
+Version		: 1.5.0git
 Release		: 1
 Summary		: ScummVM-related tools
 Group		: Interpreters
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index fc63d11ecd..7457ddd195 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 1.4.0git
+Version		: 1.5.0git
 Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 9fa5489547..d7d2b7f4cb 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -31,9 +31,6 @@ kyra.dat               FILE    "dists/engine-data/kyra.dat"
 #if ENABLE_LURE      == STATIC_PLUGIN
 lure.dat               FILE    "dists/engine-data/lure.dat"
 #endif
-#if ENABLE_M4        == STATIC_PLUGIN
-m4.dat                 FILE    "dists/engine-data/m4.dat"
-#endif
 #if ENABLE_QUEEN     == STATIC_PLUGIN
 queen.tbl              FILE    "dists/engine-data/queen.tbl"
 #endif
@@ -51,8 +48,8 @@ pred.dic               FILE    "dists/pred.dic"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION     1,4,0,0
- PRODUCTVERSION  1,4,0,0
+ FILEVERSION     1,5,0,0
+ PRODUCTVERSION  1,5,0,0
  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS       VS_FF_DEBUG
@@ -69,13 +66,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.0git\0"
+            VALUE "FileVersion", "1.5.0git\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.0git\0"
+            VALUE "ProductVersion", "1.5.0git\0"
         END
     END
 
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index b91e7ebb0c..6ca807c413 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -31,9 +31,6 @@ kyra.dat               FILE    "dists/engine-data/kyra.dat"
 #if ENABLE_LURE      == STATIC_PLUGIN
 lure.dat               FILE    "dists/engine-data/lure.dat"
 #endif
-#if ENABLE_M4        == STATIC_PLUGIN
-m4.dat                 FILE    "dists/engine-data/m4.dat"
-#endif
 #if ENABLE_QUEEN     == STATIC_PLUGIN
 queen.tbl              FILE    "dists/engine-data/queen.tbl"
 #endif
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 71f4818e7e..4ccc2a8995 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.0git
+VERSION=1.5.0git
 ARCH=i486
 BUILD=1
 
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index fd554f231e..e843d36e79 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.0git@REVISION@</version>
+  <version>1.5.0git@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.iss b/dists/win32/ScummVM.iss
index 5a7af8264b..7f3359f530 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -37,6 +37,7 @@ Name: nb; MessagesFile: compiler:Languages\Norwegian.isl
 Name: pl; MessagesFile: compiler:Languages\Polish.isl
 Name: ru; MessagesFile: compiler:Languages\Russian.isl
 Name: es; MessagesFile: compiler:Languages\Spanish.isl
+Name: se; MessagesFile: compiler:Languages\Swedish.isl
 
 [Icons]
 Name: {group}\{cm:UninstallProgram, ScummVM}; Filename: {uninstallexe}
@@ -50,13 +51,18 @@ Name: {group}\Copyright; Filename: {app}\COPYRIGHT.txt; WorkingDir: {app}; Comme
 Name: {group}\News; Filename: {app}\NEWS.txt; WorkingDir: {app}; Comment: NEWS; Flags: createonlyiffileexists; Languages: not de
 Name: {group}\Neues; Filename: {app}\Neues.txt; WorkingDir: {app}; Comment: Neues; Flags: createonlyiffileexists; Languages: de
 ;QUICKSTART
-Name: {group}\QuickStart; Filename: {app}\QUICKSTART.txt; WorkingDir: {app}; Comment: QUICKSTART; Flags: createonlyiffileexists; Languages: not (fr or de or nb)
-Name: {group}\DemarrageRapide; Filename: {app}\DemarrageRapide.txt; WorkingDir: {app}; Comment: DemarrageRapide; Flags: createonlyiffileexists; Languages: fr
+Name: {group}\QuickStart; Filename: {app}\QUICKSTART.txt; WorkingDir: {app}; Comment: QUICKSTART; Flags: createonlyiffileexists; Languages: not (de or es or fr or it or nb or se)
 Name: {group}\Schnellstart; Filename: {app}\Schnellstart.txt; WorkingDir: {app}; Comment: Schnellstart; Flags: createonlyiffileexists; Languages: de
+Name: {group}\InicioRapido; Filename: {app}\InicioRapido.txt; WorkingDir: {app}; Comment: InicioRapido; Flags: createonlyiffileexists; Languages: es
+Name: {group}\DemarrageRapide; Filename: {app}\DemarrageRapide.txt; WorkingDir: {app}; Comment: DemarrageRapide; Flags: createonlyiffileexists; Languages: fr
+Name: {group}\GuidaRapida; Filename: {app}\GuidaRapida.txt; WorkingDir: {app}; Comment: GuidaRapida; Flags: createonlyiffileexists; Languages: it
 Name: {group}\HurtigStart; Filename: {app}\HurtigStart.txt; WorkingDir: {app}; Comment: HurtigStart; Flags: createonlyiffileexists; Languages: nb
+Name: {group}\Snabbstart; Filename: {app}\Snabbstart.txt; WorkingDir: {app}; Comment: Snabbstart; Flags: createonlyiffileexists; Languages: se
 ;README
-Name: {group}\Readme; Filename: {app}\README.txt; WorkingDir: {app}; Comment: README; Flags: createonlyiffileexists; Languages: not de
+Name: {group}\Readme; Filename: {app}\README.txt; WorkingDir: {app}; Comment: README; Flags: createonlyiffileexists; Languages: not (cz or de or se)
+Name: {group}\PrectiMe; Filename: {app}\PrectiMe.txt; WorkingDir: {app}; Comment: PrectiMe; Flags: createonlyiffileexists; Languages: cz
 Name: {group}\Liesmich; Filename: {app}\Liesmich.txt; WorkingDir: {app}; Comment: Liesmich; Flags: createonlyiffileexists; Languages: de
+Name: {group}\LasMig; Filename: {app}\LasMig.txt; WorkingDir: {app}; Comment: LasMig; Flags: createonlyiffileexists; Languages: se
 
 [Run]
 Filename: {app}\ScummVM.exe; Flags: nowait skipifdoesntexist postinstall skipifsilent
@@ -69,14 +75,22 @@ Source: AUTHORS.txt; DestDir: {app}; Flags: ignoreversion
 Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion
 Source: COPYING.LGPL.txt; DestDir: {app}; Flags: ignoreversion
 Source: COPYRIGHT.txt; DestDir: {app}; Flags: ignoreversion
+;NEWS
 Source: NEWS.txt; DestDir: {app}; Flags: ignoreversion; Languages: not de
 Source: doc/de/Neues.txt; DestDir: {app}; Flags: ignoreversion; Languages: de
-Source: doc/QUICKSTART.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: not (fr or de or nb)
-Source: doc/fr/DemarrageRapide.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: fr
+;QUICKSTART
+Source: doc/QUICKSTART.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: not (de or es or fr or it or nb or se)
 Source: doc/de/Schnellstart.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: de
+Source: doc/es/InicioRapido.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: es
+Source: doc/fr/DemarrageRapide.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: fr
+Source: doc/it/GuidaRapida.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: it
 Source: doc/no-nb/HurtigStart.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: nb
-Source: README.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: not de
+Source: doc/se/Snabbstart.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: se
+;README
+Source: README.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: not (cz or de or se)
+Source: doc/cz/PrectiMe.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: cz
 Source: doc/de/Liesmich.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: de
+Source: doc/se/LasMig.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: se
 Source: README-SDL.txt; DestDir: {app}; Flags: ignoreversion
 Source: scummvm.exe; DestDir: {app}; Flags: ignoreversion
 Source: SDL.dll; DestDir: {app}
@@ -86,7 +100,6 @@ Source: drascula.dat; DestDir: {app}; Flags: ignoreversion
 Source: hugo.dat; DestDir: {app}; Flags: ignoreversion
 Source: kyra.dat; DestDir: {app}; Flags: ignoreversion
 Source: lure.dat; DestDir: {app}; Flags: ignoreversion
-Source: m4.dat; DestDir: {app}; Flags: ignoreversion
 Source: pred.dic; DestDir: {app}; Flags: ignoreversion
 Source: queen.tbl; DestDir: {app}; Flags: ignoreversion
 Source: sky.cpt; DestDir: {app}; Flags: ignoreversion
diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi
index 01a7e72afe..d3689f46fc 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.0git"
+!define VERSION     "1.5.0git"
 !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.5.0.0
 VIAddVersionKey  ProductName      $(^Name)
 VIAddVersionKey  ProductVersion  "${VERSION}"
 VIAddVersionKey  CompanyName     "${COMPANY}"
@@ -265,7 +265,6 @@ Section "ScummVM" SecMain
 	File "${engine_data}\hugo.dat"
 	File "${engine_data}\kyra.dat"
 	File "${engine_data}\lure.dat"
-	File "${engine_data}\m4.dat"
 	File "${engine_data}\queen.tbl"
 	File "${engine_data}\sky.cpt"
 	File "${engine_data}\teenagent.dat"
@@ -352,7 +351,6 @@ Section -un.Main SecUninstall
 	Delete /REBOOTOK $INSTDIR\hugo.dat
 	Delete /REBOOTOK $INSTDIR\kyra.dat
 	Delete /REBOOTOK $INSTDIR\lure.dat
-	Delete /REBOOTOK $INSTDIR\m4.dat
 	Delete /REBOOTOK $INSTDIR\queen.tbl
 	Delete /REBOOTOK $INSTDIR\sky.cpt
 	Delete /REBOOTOK $INSTDIR\teenagent.dat
diff --git a/dists/win32/scummvm.nsi.in b/dists/win32/scummvm.nsi.in
index cba1e81e33..dd63a21242 100644
--- a/dists/win32/scummvm.nsi.in
+++ b/dists/win32/scummvm.nsi.in
@@ -265,7 +265,6 @@ Section "ScummVM" SecMain
 	File "${engine_data}\hugo.dat"
 	File "${engine_data}\kyra.dat"
 	File "${engine_data}\lure.dat"
-	File "${engine_data}\m4.dat"
 	File "${engine_data}\queen.tbl"
 	File "${engine_data}\sky.cpt"
 	File "${engine_data}\teenagent.dat"
@@ -352,7 +351,6 @@ Section -un.Main SecUninstall
 	Delete /REBOOTOK $INSTDIR\hugo.dat
 	Delete /REBOOTOK $INSTDIR\kyra.dat
 	Delete /REBOOTOK $INSTDIR\lure.dat
-	Delete /REBOOTOK $INSTDIR\m4.dat
 	Delete /REBOOTOK $INSTDIR\queen.tbl
 	Delete /REBOOTOK $INSTDIR\sky.cpt
 	Delete /REBOOTOK $INSTDIR\teenagent.dat