diff options
Diffstat (limited to 'dists')
63 files changed, 2265 insertions, 57 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index a25048fe28..e7778fdf61 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -2,11 +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.5.0git" android:installLocation="preferExternal" - android:sharedUserId="org.inodes.gus.scummvm"> + 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. --> @@ -31,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"/> @@ -40,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 32444a03f0..8f7887eaf5 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -2,11 +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:sharedUserId="org.inodes.gus.scummvm"> + 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. --> @@ -31,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"/> @@ -40,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/mkplugin.sh b/dists/android/mkplugin.sh index 1811fc0475..30a7ef66d6 100755 --- a/dists/android/mkplugin.sh +++ b/dists/android/mkplugin.sh @@ -11,6 +11,6 @@ TEMPLATE=$3 PLUGIN_VERSION_CODE=$4 TARGET=$5 -PLUGIN_DESC=`sed -n s/add_engine\s$PLUGIN_NAME\s\"\(.\+\)\"\s.*/\1/p` < $CONFIGURE +PLUGIN_DESC=`sed -n "s/add_engine\s$PLUGIN_NAME\s\"\(.\+\)\"\s.*/\1/p" < $CONFIGURE` sed "s|@PLUGIN_NAME@|$PLUGIN_NAME|;s|@PLUGIN_VERSION_CODE@|$PLUGIN_VERSION_CODE|;s|@PLUGIN_DESC@|$PLUGIN_DESC|" < $TEMPLATE > $TARGET diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml index 728beb1de3..51b39be3b1 100644 --- a/dists/android/plugin-manifest.xml +++ b/dists/android/plugin-manifest.xml @@ -1,29 +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.5.0git" android:installLocation="preferExternal" - android:sharedUserId="org.inodes.gus.scummvm"> + 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 ab0a63a0cf..4b429097ae 100644 --- a/dists/android/plugin-manifest.xml.in +++ b/dists/android/plugin-manifest.xml.in @@ -1,29 +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:sharedUserId="org.inodes.gus.scummvm"> + 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..318c06f62b --- /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-2012 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/kyra.dat b/dists/engine-data/kyra.dat Binary files differindex 902d55c457..c89b21cbca 100644 --- a/dists/engine-data/kyra.dat +++ b/dists/engine-data/kyra.dat diff --git a/dists/engine-data/m4.dat b/dists/engine-data/m4.dat Binary files differdeleted 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 Binary files differdeleted file mode 100644 index b27f9d4471..0000000000 --- a/dists/engine-data/mads.dat +++ /dev/null diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH new file mode 100644 index 0000000000..29f0175306 --- /dev/null +++ b/dists/gph/README-GPH @@ -0,0 +1,61 @@ +ScummVM 1.5.0git - GPH DEVICE SPECIFIC README + +------------------------------------------------------------------------ + +Contents: + + * About the backend/port <#About_the_backendport> + * Supported audio options <#Supported_audio_options> + * Credits <#Credits> + +------------------------------------------------------------------------ + +Please refer to the: + +GPH ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14> + +WiKi: (Select your device) + +<http://wiki.scummvm.org/index.php/GP2X> +<http://wiki.scummvm.org/index.php/GP2XWiz> +<http://wiki.scummvm.org/index.php/Caanoo> + +for the most current information on the port and any updates to this +documentation. + +The wiki includes detailed instructions on how to use the port and +control information. + +------------------------------------------------------------------------ +About the backend/port + +This is the readme for the official GPH ScummVM backend (also known as +the GP2X port/GP2XWiz port or Caanoo port). + +This is an SVN test release of ScummVM for GPH devices, it would be +appreciated if this SVN test distribution was not mirrored and that +people be directed to http://scummvm.distant-earth.com/ instead for +updated SVN builds. + +Fully supported official releases of the GPH ScummVM backend are made in +line with main official releases and are avalalble from the ScummVM +downloads page <http://www.scummvm.org/downloads.php> for the GP2X, +GP2XWiz and Caanoo. + +------------------------------------------------------------------------ +Supported audio options + +Raw audio. +MP3 audio. +OGG Vorbis audio. + +FLAC audio is currently unsupported. + +For best results use uncompressed audio in games. + +------------------------------------------------------------------------ +Credits + +Core ScummVM code (c) The ScummVM Team +Portions of the GPH backend (c) John Willis +Detailed (c) information can be found within the source code diff --git a/dists/gph/README-GPH.in b/dists/gph/README-GPH.in new file mode 100644 index 0000000000..31ec3e4041 --- /dev/null +++ b/dists/gph/README-GPH.in @@ -0,0 +1,61 @@ +ScummVM @VERSION@ - GPH DEVICE SPECIFIC README + +------------------------------------------------------------------------ + +Contents: + + * About the backend/port <#About_the_backendport> + * Supported audio options <#Supported_audio_options> + * Credits <#Credits> + +------------------------------------------------------------------------ + +Please refer to the: + +GPH ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14> + +WiKi: (Select your device) + +<http://wiki.scummvm.org/index.php/GP2X> +<http://wiki.scummvm.org/index.php/GP2XWiz> +<http://wiki.scummvm.org/index.php/Caanoo> + +for the most current information on the port and any updates to this +documentation. + +The wiki includes detailed instructions on how to use the port and +control information. + +------------------------------------------------------------------------ +About the backend/port + +This is the readme for the official GPH ScummVM backend (also known as +the GP2X port/GP2XWiz port or Caanoo port). + +This is an SVN test release of ScummVM for GPH devices, it would be +appreciated if this SVN test distribution was not mirrored and that +people be directed to http://scummvm.distant-earth.com/ instead for +updated SVN builds. + +Fully supported official releases of the GPH ScummVM backend are made in +line with main official releases and are avalalble from the ScummVM +downloads page <http://www.scummvm.org/downloads.php> for the GP2X, +GP2XWiz and Caanoo. + +------------------------------------------------------------------------ +Supported audio options + +Raw audio. +MP3 audio. +OGG Vorbis audio. + +FLAC audio is currently unsupported. + +For best results use uncompressed audio in games. + +------------------------------------------------------------------------ +Credits + +Core ScummVM code (c) The ScummVM Team +Portions of the GPH backend (c) John Willis +Detailed (c) information can be found within the source code diff --git a/dists/gph/caanoo/scummvm-gdb.gpe b/dists/gph/caanoo/scummvm-gdb.gpe new file mode 100644 index 0000000000..63ce193ca8 --- /dev/null +++ b/dists/gph/caanoo/scummvm-gdb.gpe @@ -0,0 +1,16 @@ +#!/bin/sh + +# Export the location of any libs ScummVM depends on +# (to avoid installing to the NAND and overwriting the broken ones there). +export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH + +# Run ScummVM via GDB (so make sure you have a terminal open or serial). +# Oh, and GDB installed of course ;) +gdb --args ./scummvm.gph --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc + +# Sync the SD card to check that everything is written. +sync + +# Return to the GPH menu screen +cd /usr/gp2x +exec /usr/gp2x/gp2xmenu diff --git a/dists/gph/caanoo/scummvm.gpe b/dists/gph/caanoo/scummvm.gpe new file mode 100644 index 0000000000..37d0f65d18 --- /dev/null +++ b/dists/gph/caanoo/scummvm.gpe @@ -0,0 +1,15 @@ +#!/bin/sh + +# Export the location of any libs ScummVM depends on +# (to avoid installing to the NAND and overwriting the broken ones there). +export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH + +# Run ScummVM, important this bit. +./scummvm.gph --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc + +# Sync the SD card to check that everything is written. +sync + +# Return to the GPH menu screen +cd /usr/gp2x +exec /usr/gp2x/gp2xmenu diff --git a/dists/gph/gp2x/mmuhack/Makefile b/dists/gph/gp2x/mmuhack/Makefile new file mode 100644 index 0000000000..a35d5c2a98 --- /dev/null +++ b/dists/gph/gp2x/mmuhack/Makefile @@ -0,0 +1,11 @@ +TARGET = mmuhack +INCLUDE = -I/opt/gcc-3.4.4-glibc-2.3.6/arm-open2x-linux/sys-include +CFLAGS = -O2 -DMODULE -D__KERNEL__ ${INCLUDE} +CC = arm-open2x-linux-gcc + +all: ${TARGET}.o + +${TARGET}.o: ${TARGET}.c + +clean: + rm -rf ${TARGET}.o diff --git a/dists/gph/gp2x/mmuhack/README b/dists/gph/gp2x/mmuhack/README new file mode 100644 index 0000000000..6db7d81845 --- /dev/null +++ b/dists/gph/gp2x/mmuhack/README @@ -0,0 +1,116 @@ +PLEASE NOTE: + +The binary object 'mmuhack.o' is stored in the source tree as it is very awkward to +build it manually each time and would require the use of 2 toolchains to do so. + +Notes on how to rebuild from the included source can be found below. + +About +----- + +This is a module for GP2X 2.4 based Linux kernel, created for developers to use in their +programs. + +Normally the upper 32MB is uncached. This means that reads/writes on the memory +are always done via the physical memory modules rather than the much faster +memory built into the processor (called 'cache'). Access to the upper 32MB can +be sped up by Squidge's MMU hack. The easiest way to use the MMU hack is to add +and load the MMU hack kernel module into your program. + +Note: Building this module requries a GP2X 'kernel' toolchain (i.e. GCC 2.95.* +for the GP2X stock, 3.* for Open2X). + +You can't build this module with the GCC 4 based application toolchains. + +Operation +--------- + +When loaded into kernel, this module creates /dev/mmuhack device. Whenever +a program opens that device using open() call, the module traverses all +memory, which was allocated in 0x02000000-0x03ffffff range by the program via +using mmap() system call. While doing that, it marks all encountered memory +as bufferable and cacheable. + +The most common use of this is to remove the framebuffer access bottleneck. +Note that, however, by making the framebuffer cacheable you can cause display +artifacts. This can happen because parts of your framebuffer may stay in CPU +cache and not to be written back to the physical memory. The display +controller only fetches data from the physical memory, so you get incomplete +image (the memory will most likely contain data from previous frame, so these +artifacts are better visible during fade effects). The easy way to fix this +is by using a special ARM Linux system call, which flushes the cache (forces +the CPU to write data in cache to the physical memory (see section "Flushing +the cache")). + +Using this module affects the whole upper memory area. But in some situations +this may be not desirable, for example when using ARM940 core in your program +(ether using 940 libraries like ogg940 and gpu940, or using your custom code, +which needs uncacheable memory for communication and such). If you need part +of your upper memory to be cached, and other part not, you should mmap() that +memory (which you want to be uncached) _after_ doing open("/dev/mmuhack"). +Another way is to modify mmuhack.c to suit your needs and rebuild the module. + + +Usage +----- + +The very first thing to do is to load the kernel module (mmuhack.o) into the +running kernel. But before that you should try to unload mmuhack module, +because other program might have left a different version loaded with +different memory configuration, which may not suit your program. + +system("/sbin/rmmod mmuhack"); +system("/sbin/insmod mmuhack.o"); + +Now you can assume the module is loaded into kernel and open /dev/mmuhack +device. You don't need to worry about previous calls failing, because in that +case open() will simply fail and nothing bad will happen. + +IMPORTANT: you _must_ do the open() call _after_ you initialize your graphics +library or allocate your memory, because it can only work with memory which is +already allocated, it won't affect memory you or your lib allocates after the +open() call. + +int mmufd = open("/dev/mmuhack", O_RDWR); +if(mmufd < 0) +{ + printf("MMU hack failed"); +} +else +{ + printf("MMU hack loaded"); + close(mmufd); +} + +If the above call succeeded, you are all done. +I recommend to unload the module when your program exits, because the other +program may want to load a different mmuhack.o and may fail, because you left +your mmuhack.o loaded (it does not get unloaded automatically on exit). + +system("/sbin/rmmod mmuhack"); + + +Flushing the cache +------------------ + +If using mmuhack.o causes your program to display artifacts (see "Operation" +section for explanation), you will need to flush the CPU cache. This should +be done after finishing every frame and just before flipping your display +buffer/surface. You will need to add flush_uppermem_cache.s file to your +Makefile/project and add a call to flush_uppermem_cache() just before final +framebuffer flip or blit. + +flush_uppermem_cache() has 3 parameters. First param is the start address, +second param is the end address, third one should always be 0. The addresses +should be virtual ones (most often pointers to the start/end of your +framebuffer). Example: + +flush_uppermem_cache(screen_surface->pixels, screen_surface->pixels + 320*240, 0); + + +Credits +------- + +Original idea/implementation: Squidge (this whole thing is also known as squidgehack) +Kernel module: NK +Documentation: notaz diff --git a/dists/gph/gp2x/mmuhack/flush_uppermem_cache.h b/dists/gph/gp2x/mmuhack/flush_uppermem_cache.h new file mode 100644 index 0000000000..d01548e474 --- /dev/null +++ b/dists/gph/gp2x/mmuhack/flush_uppermem_cache.h @@ -0,0 +1,10 @@ +#ifdef __cplusplus +extern "C" +{ +#endif + +void flush_uppermem_cache(void *start_address, void *end_address, int flags); + +#ifdef __cplusplus +} +#endif diff --git a/dists/gph/gp2x/mmuhack/flush_uppermem_cache.s b/dists/gph/gp2x/mmuhack/flush_uppermem_cache.s new file mode 100644 index 0000000000..265908e1fd --- /dev/null +++ b/dists/gph/gp2x/mmuhack/flush_uppermem_cache.s @@ -0,0 +1,5 @@ +.global flush_uppermem_cache @ void *start_address, void *end_address, int flags + +flush_uppermem_cache: + swi #0x9f0002 + bx lr diff --git a/dists/gph/gp2x/mmuhack/mmuhack.c b/dists/gph/gp2x/mmuhack/mmuhack.c new file mode 100644 index 0000000000..2e38bdb284 --- /dev/null +++ b/dists/gph/gp2x/mmuhack/mmuhack.c @@ -0,0 +1,126 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include <linux/config.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/miscdevice.h> +#include <asm/memory.h> + +#define MMUHACK_MINOR 225 +#define DEVICE_NAME "mmuhack" + +#if __GNUC__ == 3 +#include <linux/version.h> +static const char __module_kernel_version_gcc3[] __attribute__((__used__)) __attribute__((section(".modinfo"))) = +"kernel_version=" UTS_RELEASE; +#endif + +static ssize_t mmuhack_open(struct inode *inode, struct file *filp) +{ + unsigned int *pgtable; + unsigned int *cpt; + int i, j; + int ttb; + int ret = -EFAULT; + + // get the pointer to the translation table base... + asm volatile( + "stmdb sp!, {r0}\n\t" + "mrc p15, 0, r0, c2, c0, 0\n\t" + "mov %0, r0\n\t" + "ldmia sp!, {r0}\n\t": "=r"(ttb) + ); + + pgtable = __va(ttb); + + for (i = 0; i < 4096; i ++) if ( (pgtable[i] & 3) == 1 ) { + cpt = __va(pgtable[i] & 0xfffffc00); + + for (j = 0; j < 256; j ++) {/* + if ( (cpt[j] & 0xfe00000f) == 0x02000002 ) { + // set C and B bits in upper 32MB memory area... + printk("Set C&B bits %08x\n",cpt[j]); + cpt[j] |= 0xFFC; + ret = 0; + } + */ + if (((cpt[j] & 0xff000000) == 0x02000000) && ((cpt[j] & 12)==0) ) + { + //printk("Set C&B bits %08x\n",cpt[j]); + cpt[j] |= 0xFFC; + } + //if ((a>=0x31 && a<=0x36) && ((cpt[i] & 12)==0)) + if (((cpt[j] & 0xff000000) == 0x03000000) && ((cpt[j] & 12)==0)) + { + //printk("Set C&B bits %08x\n",cpt[j]); + //printf("SDL c and b bits not set, overwriting\n"); + cpt[j] |= 0xFFC; + } + } + } + + // drain the write buffer and flush the tlb caches... + asm volatile( + "stmdb sp!, {r0}\n\t" + "mov r0, #0\n\t" + "mcr 15, 0, r0, cr7, cr10, 4\n\t" + "mcr 15, 0, r0, cr8, cr7, 0\n\t" + "ldmia sp!, {r0}\n\t" + ); + + if (ret == 0) + printk("MMU hack applied.\n"); + + return 0; +} + +static struct file_operations mmuhack_fops = { + owner: THIS_MODULE, + open: mmuhack_open, +}; + + +static struct miscdevice mmuhack = { + MMUHACK_MINOR, DEVICE_NAME, &mmuhack_fops +}; + +static int __init mmuhack_init(void) +{ + misc_register(&mmuhack); +/* + printk("MMSP2 MMU Hack module.\n"); +*/ + return 0; +} + +static void __exit mmuhack_exit(void) +{ + misc_deregister(&mmuhack); +/* + printk(KERN_ALERT "MMU Hack module removed.\n"); +*/ +} + +module_init(mmuhack_init); +module_exit(mmuhack_exit); diff --git a/dists/gph/gp2x/mmuhack/mmuhack.o b/dists/gph/gp2x/mmuhack/mmuhack.o Binary files differnew file mode 100644 index 0000000000..475f4a54ae --- /dev/null +++ b/dists/gph/gp2x/mmuhack/mmuhack.o diff --git a/dists/gph/gp2x/scummvm.gpe b/dists/gph/gp2x/scummvm.gpe new file mode 100644 index 0000000000..51a49f7560 --- /dev/null +++ b/dists/gph/gp2x/scummvm.gpe @@ -0,0 +1,18 @@ +#!/bin/sh + +# Remount SD with forced Sync, does this really work? +mount -o sync,remount /dev/mmcsd/disc0/part1 /mnt/sd/ + +# Export the location of any libs ScummVM depends on +# (to avoid installing to the NAND and overwriting the broken ones there). +export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH + +# Run ScummVM, important this bit. +./scummvm.gph --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc + +# Sync the SD card to check that everything is written. +sync + +# Return to the GPH menu screen +cd /usr/gp2x +exec /usr/gp2x/gp2xmenu diff --git a/dists/gph/gp2xwiz/scummvm-gdb.gpe b/dists/gph/gp2xwiz/scummvm-gdb.gpe new file mode 100644 index 0000000000..63ce193ca8 --- /dev/null +++ b/dists/gph/gp2xwiz/scummvm-gdb.gpe @@ -0,0 +1,16 @@ +#!/bin/sh + +# Export the location of any libs ScummVM depends on +# (to avoid installing to the NAND and overwriting the broken ones there). +export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH + +# Run ScummVM via GDB (so make sure you have a terminal open or serial). +# Oh, and GDB installed of course ;) +gdb --args ./scummvm.gph --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc + +# Sync the SD card to check that everything is written. +sync + +# Return to the GPH menu screen +cd /usr/gp2x +exec /usr/gp2x/gp2xmenu diff --git a/dists/gph/gp2xwiz/scummvm.gpe b/dists/gph/gp2xwiz/scummvm.gpe new file mode 100644 index 0000000000..59ff562aeb --- /dev/null +++ b/dists/gph/gp2xwiz/scummvm.gpe @@ -0,0 +1,15 @@ +#!/bin/sh + +# Export the location of any libs ScummVM depends on +# (to avoid installing to the NAND and overwriting the broken ones there). +export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH + +# Run ScummVM, important this bit. +./scummvm.gph --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc + +# Sync the SD card to check that everything is written. +sync + +# Return to the GPH menu screen +cd /usr/gp2x +exec /usr/gp2x/gp2xmenu diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini new file mode 100644 index 0000000000..952cd0de24 --- /dev/null +++ b/dists/gph/scummvm.ini @@ -0,0 +1,5 @@ +[info] +name="ScummVM 1.5.0git" +path="/scummvm/scummvm.gpe" +icon="/scummvm/scummvm.png" +title="/scummvm/scummvmb.png" diff --git a/dists/gph/scummvm.ini.in b/dists/gph/scummvm.ini.in new file mode 100644 index 0000000000..1c80d97d8b --- /dev/null +++ b/dists/gph/scummvm.ini.in @@ -0,0 +1,5 @@ +[info] +name="ScummVM @VERSION@" +path="/scummvm/scummvm.gpe" +icon="/scummvm/scummvm.png" +title="/scummvm/scummvmb.png" diff --git a/dists/gph/scummvm.png b/dists/gph/scummvm.png Binary files differnew file mode 100644 index 0000000000..128e59efc4 --- /dev/null +++ b/dists/gph/scummvm.png diff --git a/dists/gph/scummvmb.png b/dists/gph/scummvmb.png Binary files differnew file mode 100644 index 0000000000..24a27bc0e1 --- /dev/null +++ b/dists/gph/scummvmb.png 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/macosx/DS_Store b/dists/macosx/DS_Store Binary files differindex 2d4193a6af..7ad5a19d61 100644 --- a/dists/macosx/DS_Store +++ b/dists/macosx/DS_Store diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist index a355ec1e62..94adc00a9b 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.5.0git, Copyright 2001-2011 The ScummVM team</string> + <string>1.5.0git, Copyright 2001-2012 The ScummVM team</string> <key>CFBundleIconFile</key> <string>scummvm.icns</string> <key>CFBundleIdentifier</key> @@ -46,7 +46,7 @@ <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 2001-2011 The ScummVM team</string> + <string>Copyright 2001-2012 The ScummVM team</string> <key>SUFeedURL</key> <string>http://www.scummvm.org/appcasts/macosx/release.xml</string> <key>SUPublicDSAKeyFile</key> diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in index b251f32509..ff010bee07 100644 --- a/dists/macosx/Info.plist.in +++ b/dists/macosx/Info.plist.in @@ -28,7 +28,7 @@ <key>CFBundleExecutable</key> <string>scummvm</string> <key>CFBundleGetInfoString</key> - <string>@VERSION@, Copyright 2001-2011 The ScummVM team</string> + <string>@VERSION@, Copyright 2001-2012 The ScummVM team</string> <key>CFBundleIconFile</key> <string>scummvm.icns</string> <key>CFBundleIdentifier</key> @@ -46,7 +46,7 @@ <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 2001-2011 The ScummVM team</string> + <string>Copyright 2001-2012 The ScummVM team</string> <key>SUFeedURL</key> <string>http://www.scummvm.org/appcasts/macosx/release.xml</string> <key>SUPublicDSAKeyFile</key> diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml new file mode 100644 index 0000000000..896210bf01 --- /dev/null +++ b/dists/openpandora/PXML.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PXML xmlns="http://openpandora.org/namespaces/PXML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PXML_schema.xsd"> + <!-- This is the package, in our case ScummVM --> + <package id="scummvm.djwillis.0001"> + <author name="DJWillis" website="http://www.scummvm.org/"/> + <!-- version type can be alpha, beta or release, set to release in branch --> + <version major="1" minor="5" release="0" build="1" type="release"/> + <!-- Both title and titles are needed --> + <title lang="en_US">ScummVM 1.5.0git</title> + <titles> + <title lang="en_US">ScummVM 1.5.0git</title> + </titles> + <descriptions> + <description lang="en_US"> + 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! + + ScummVM supports many adventure games, including LucasArts SCUMM games (such as Monkey Island 1-3, Day of the Tentacle, Sam & Max, ...), many of Sierra's AGI and SCI games (such as King's Quest 1-6, Space Quest 1-5, ...), Discworld 1 and 2, Simon the Sorcerer 1 and 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword 1 and 2, Flight of the Amazon Queen, Gobliiins 1-3, The Legend of Kyrandia 1-3, many of Humongous Entertainment's children's SCUMM games (including Freddi Fish and Putt Putt games) and many more. + </description> + </descriptions> + <icon src="icon/scummvm.png"/> + </package> + + <!-- This is the application, the ScummVM binary --> + <application id="scummvm.djwillis.0001" appdata="scummvm"> + <exec command="./runscummvm.sh"/> + <author name="DJWillis" website="http://www.scummvm.org/"/> + <!-- version type can be alpha, beta or release, set to release in branch --> + <version major="1" minor="5" release="0" build="1" type="release"/> + <!-- Both title and titles are needed --> + <title lang="en_US">ScummVM</title> + <titles> + <title lang="en_US">ScummVM</title> + </titles> + <descriptions> + <description lang="en_US"> + 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! + + ScummVM supports many adventure games, including LucasArts SCUMM games (such as Monkey Island 1-3, Day of the Tentacle, Sam & Max, ...), many of Sierra's AGI and SCI games (such as King's Quest 1-6, Space Quest 1-5, ...), Discworld 1 and 2, Simon the Sorcerer 1 and 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword 1 and 2, Flight of the Amazon Queen, Gobliiins 1-3, The Legend of Kyrandia 1-3, many of Humongous Entertainment's children's SCUMM games (including Freddi Fish and Putt Putt games) and many more. + </description> + </descriptions> + <licenses> + <license name="GPLv2" url="http://www.gnu.org/licenses/gpl-2.0.html" sourcecodeurl="http://www.scummvm.org"/> + </licenses> + <icon src="icon/scummvm.png"/> + <previewpics> + <pic src="icon/preview-pic.png"/> + </previewpics> + <info name="ScummVM Documentation" type="text/html" src="docs/index.html"/> + <categories> + <category name="Game"> + <subcategory name="AdventureGame"/> + </category> + </categories> + </application> +</PXML> diff --git a/dists/openpandora/PXML.xml.in b/dists/openpandora/PXML.xml.in new file mode 100644 index 0000000000..938e9cb24a --- /dev/null +++ b/dists/openpandora/PXML.xml.in @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PXML xmlns="http://openpandora.org/namespaces/PXML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PXML_schema.xsd"> + <!-- This is the package, in our case ScummVM --> + <package id="scummvm.djwillis.0001"> + <author name="DJWillis" website="http://www.scummvm.org/"/> + <!-- version type can be alpha, beta or release, set to release in branch --> + <version major="@VER_MAJOR@" minor="@VER_MINOR@" release="@VER_PATCH@" build="1" type="release"/> + <!-- Both title and titles are needed --> + <title lang="en_US">ScummVM @VERSION@</title> + <titles> + <title lang="en_US">ScummVM @VERSION@</title> + </titles> + <descriptions> + <description lang="en_US"> + 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! + + ScummVM supports many adventure games, including LucasArts SCUMM games (such as Monkey Island 1-3, Day of the Tentacle, Sam & Max, ...), many of Sierra's AGI and SCI games (such as King's Quest 1-6, Space Quest 1-5, ...), Discworld 1 and 2, Simon the Sorcerer 1 and 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword 1 and 2, Flight of the Amazon Queen, Gobliiins 1-3, The Legend of Kyrandia 1-3, many of Humongous Entertainment's children's SCUMM games (including Freddi Fish and Putt Putt games) and many more. + </description> + </descriptions> + <icon src="icon/scummvm.png"/> + </package> + + <!-- This is the application, the ScummVM binary --> + <application id="scummvm.djwillis.0001" appdata="scummvm"> + <exec command="./runscummvm.sh"/> + <author name="DJWillis" website="http://www.scummvm.org/"/> + <!-- version type can be alpha, beta or release, set to release in branch --> + <version major="@VER_MAJOR@" minor="@VER_MINOR@" release="@VER_PATCH@" build="1" type="release"/> + <!-- Both title and titles are needed --> + <title lang="en_US">ScummVM</title> + <titles> + <title lang="en_US">ScummVM</title> + </titles> + <descriptions> + <description lang="en_US"> + 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! + + ScummVM supports many adventure games, including LucasArts SCUMM games (such as Monkey Island 1-3, Day of the Tentacle, Sam & Max, ...), many of Sierra's AGI and SCI games (such as King's Quest 1-6, Space Quest 1-5, ...), Discworld 1 and 2, Simon the Sorcerer 1 and 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword 1 and 2, Flight of the Amazon Queen, Gobliiins 1-3, The Legend of Kyrandia 1-3, many of Humongous Entertainment's children's SCUMM games (including Freddi Fish and Putt Putt games) and many more. + </description> + </descriptions> + <licenses> + <license name="GPLv2" url="http://www.gnu.org/licenses/gpl-2.0.html" sourcecodeurl="http://www.scummvm.org"/> + </licenses> + <icon src="icon/scummvm.png"/> + <previewpics> + <pic src="icon/preview-pic.png"/> + </previewpics> + <info name="ScummVM Documentation" type="text/html" src="docs/index.html"/> + <categories> + <category name="Game"> + <subcategory name="AdventureGame"/> + </category> + </categories> + </application> +</PXML> diff --git a/dists/openpandora/PXML_schema.xsd b/dists/openpandora/PXML_schema.xsd new file mode 100644 index 0000000000..7c0d635016 --- /dev/null +++ b/dists/openpandora/PXML_schema.xsd @@ -0,0 +1,341 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema targetNamespace="http://openpandora.org/namespaces/PXML" xmlns="http://openpandora.org/namespaces/PXML" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified"> + + + <!-- declare some simpleTypes for later usage --> + + <!-- Specify params allows with the 'x11' entry in exec --> + <xs:simpleType name="x11Param"> + <xs:restriction base="xs:string"> + <xs:enumeration value="req" /> + <xs:enumeration value="stop" /> + <xs:enumeration value="ignore" /> + </xs:restriction> + </xs:simpleType> + + <!-- Specify the valid documentation formats in the <info> block --> + <xs:simpleType name="docType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="text/html" /> + <xs:enumeration value="text/plain" /> + </xs:restriction> + </xs:simpleType> + + <!-- Make sure that version numbers only consist of letters, numbers and + as well as - --> + <xs:simpleType name="versionNumber"> + <xs:restriction base="xs:string"> + <xs:minLength value="1"/> + <xs:pattern value="[a-zA-Z0-9+-]*" /> + </xs:restriction> + </xs:simpleType> + + <!-- Specify what is valid as release type --> + <xs:simpleType name="releaseType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="alpha" /> + <xs:enumeration value="beta" /> + <xs:enumeration value="release" /> + </xs:restriction> + </xs:simpleType> + + <!-- Specify what makes an email address "valid" --> + <xs:simpleType name="emailAddress"> + <xs:restriction base="xs:string"> + <xs:pattern value="[^@]+@[^\.]+\..+"/> + </xs:restriction> + </xs:simpleType> + + <!-- some restrictions regarding file names that are eg not allowed/possible when using sd cards formated as fat32 --> + <xs:simpleType name="dumbPath"> + <xs:restriction base="xs:normalizedString"> + <xs:pattern value="[^?>:]+" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="dumbFolderName"> + <xs:restriction base="xs:normalizedString"> + <xs:pattern value="[^?>:/]+" /> + </xs:restriction> + </xs:simpleType> + + <!-- Specify lang codes --> + <xs:simpleType name="isoLangcode"> + <xs:restriction base="xs:string"> + <xs:minLength value="2"/> + <xs:pattern value="[a-zA-Z]{2,3}(_[a-zA-Z0-9]{2,3})*" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="isoLangcode_en_US"> + <xs:restriction base="xs:string"> + <xs:enumeration value="en_US" /> + </xs:restriction> + </xs:simpleType> + + <!-- Definition of all allowed categories following the FDO specs --> + <xs:simpleType name="fdoCategory"> + <xs:restriction base="xs:string"> + <xs:pattern value="AudioVideo|Audio|Video|Development|Education|Game|Graphics|Network|Office|Settings|System|Utility"/> + </xs:restriction> + </xs:simpleType> + <!-- Definition of all allowed subcategories following the FDO specs (should be based upon the given main categories, but would significantly increase complexity of the schema) --> + <xs:simpleType name="fdoSubCategory"> + <xs:restriction base="xs:string"> + <xs:pattern value="Building|Debugger|IDE|GUIDesigner|Profiling|RevisionControl|Translation|Calendar|ContactManagement|Database|Dictionary|Chart|Email|Finance|FlowChart|PDA|ProjectManagement|Presentation|Spreadsheet|WordProcessor|2DGraphics|VectorGraphics|RasterGraphics|3DGraphics|Scanning|OCR|Photography|Publishing|Viewer|TextTools|DesktopSettings|HardwareSettings|Printing|PackageManager|Dialup|InstantMessaging|Chat|IRCClient|FileTransfer|HamRadio|News|P2P|RemoteAccess|Telephony|TelephonyTools|VideoConference|WebBrowser|WebDevelopment|Midi|Mixer|Sequencer|Tuner|TV|AudioVideoEditing|Player|Recorder|DiscBurning|ActionGame|AdventureGame|ArcadeGame|BoardGame|BlocksGame|CardGame|KidsGame|LogicGame|RolePlaying|Simulation|SportsGame|StrategyGame|Art|Construction|Music|Languages|Science|ArtificialIntelligence|Astronomy|Biology|Chemistry|ComputerScience|DataVisualization|Economy|Electricity|Geography|Geology|Geoscience|History|ImageProcessing|Literature|Math|NumericalAnalysis|MedicalSoftware|Physics|Robotics|Sports|ParallelComputing|Amusement|Archiving|Compression|Electronics|Emulator|Engineering|FileTools|FileManager|TerminalEmulator|Filesystem|Monitor|Security|Accessibility|Calculator|Clock|TextEditor|Documentation|Core|KDE|GNOME|GTK|Qt|Motif|Java|ConsoleOnly"/> + </xs:restriction> + </xs:simpleType> + + <!-- Create some way to enforce entries to be nonempty --> + <xs:simpleType name="nonempty_token"> + <xs:restriction base="xs:token"> + <xs:minLength value="1"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="nonempty_string"> + <xs:restriction base="xs:string"> + <xs:minLength value="1"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="nonempty_normalizedString"> + <xs:restriction base="xs:string"> + <xs:minLength value="1"/> + </xs:restriction> + </xs:simpleType> + + + + <!-- declare some complexTypes for later usage --> + + <!-- type used for file associations --> + <xs:complexType name="association_data"> + <xs:attribute name="name" use="required" type="nonempty_normalizedString" /> + <xs:attribute name="filetype" use="required" type="nonempty_token" /> + <xs:attribute name="exec" use="required" type="nonempty_token" /> + </xs:complexType> + + <!-- type used for author info --> + <xs:complexType name="author_data"> + <xs:attribute name="name" use="required" type="nonempty_normalizedString" /> + <xs:attribute name="website" use="optional" type="xs:anyURI" /> + <xs:attribute name="email" use="optional" type="emailAddress" /> + </xs:complexType> + + <!-- type used for version informations (full entry as well as os version) --> + <xs:complexType name="app_version_info"> + <xs:attribute name="major" use="required" type="versionNumber" /> + <xs:attribute name="minor" use="required" type="versionNumber" /> + <xs:attribute name="release" use="required" type="versionNumber" /> + <xs:attribute name="build" use="required" type="versionNumber" /> + <xs:attribute name="type" use="optional" type="releaseType" /> + </xs:complexType> + <xs:complexType name="os_version_info"> + <xs:attribute name="major" use="required" type="versionNumber" /> + <xs:attribute name="minor" use="required" type="versionNumber" /> + <xs:attribute name="release" use="required" type="versionNumber" /> + <xs:attribute name="build" use="required" type="versionNumber" /> + </xs:complexType> + + <!-- type used for exec entries --> + <xs:complexType name="exec_params"> + <xs:attribute name="command" use="required" type="nonempty_token" /> + <xs:attribute name="arguments" use="optional" type="nonempty_token" /> + <xs:attribute name="background" use="optional" type="xs:boolean" /> + <xs:attribute name="startdir" use="optional" type="dumbPath" /> + <xs:attribute name="standalone" use="optional" type="xs:boolean" /> + <xs:attribute name="x11" use="optional" type="x11Param" /> + </xs:complexType> + + <!-- type used for tiles or descriptions, once in 'normal' version, once enforcing usage of en_US --> + <xs:complexType name="title_or_description"> + <xs:simpleContent> + <xs:extension base="nonempty_string"> + <xs:attribute name="lang" use="required" type="isoLangcode" /> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + <xs:complexType name="title_or_description_enUS"> + <xs:simpleContent> + <xs:extension base="nonempty_string"> + <xs:attribute name="lang" use="required" type="isoLangcode_en_US" /> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <!-- type used for referencing images --> + <xs:complexType name="image_entry"> + <xs:attribute name="src" use="required" type="dumbPath" /> + </xs:complexType> + + <!-- type for referencing manuals/readme docs --> + <xs:complexType name="information_entry"> + <xs:attribute name="name" use="required" type="nonempty_normalizedString" /> + <xs:attribute name="type" use="required" type="docType" /> + <xs:attribute name="src" use="required" type="dumbPath" /> + </xs:complexType> + + <!-- type used for the license information --> + <xs:complexType name="license_info"> + <xs:attribute name="name" use="required" type="nonempty_normalizedString" /> + <xs:attribute name="url" use="optional" type="xs:anyURI" /> + <xs:attribute name="sourcecodeurl" use="optional" type="xs:anyURI" /> + </xs:complexType> + + + + <!-- Combine the symple and complex types into the "real" PXML specification --> + + <xs:element name="PXML"> + <xs:complexType> + <xs:sequence> + <!-- specify the <package> tag with info about the complete package, information providable: + author + version + title(s) + description(s) + icon + --> + <xs:element name="package" minOccurs="1" maxOccurs="1"> + <xs:complexType> + <xs:all> + <!--Author info--> + <xs:element name="author" type="author_data" minOccurs="1" /> + <!--App version info--> + <xs:element name="version" type="app_version_info" minOccurs="1" /> + <!--Title--> + <xs:element name="titles" minOccurs="1"> + <xs:complexType> + <xs:sequence> + <xs:element name="title" type="title_or_description_enUS" minOccurs="1" maxOccurs="1" /> + <xs:element name="title" type="title_or_description" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <!--Description--> + <xs:element name="descriptions" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="title" type="title_or_description_enUS" minOccurs="0" maxOccurs="1" /> + <xs:element name="description" type="title_or_description" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <!--Icon--> + <xs:element name="icon" type="image_entry" minOccurs="0" /> + </xs:all> + <!--Package ID--> + <xs:attribute name="id" use="required" type="dumbFolderName" /> + </xs:complexType> + </xs:element> + <!-- specify the <application> tag with info about a single program + executable call + author + version (of the application) + osversion (min OS version supported) + title(s) (allowing compatibility to <HF6, too!) + description(s) (allowing compatibility to <HF6, too!) + icon + license + preview pictures + info/manual/readme entry + categories + associations to file types + clockspeed + --> + <xs:element name="application" minOccurs="1" maxOccurs="unbounded"> + <xs:complexType> + <xs:all> + <!--Execution params --> + <xs:element name="exec" type="exec_params" minOccurs="1" /> + <!--Author info--> + <xs:element name="author" type="author_data" minOccurs="1" /> + <!--App version info--> + <xs:element name="version" type="app_version_info" minOccurs="1" /> + <!--OS Version info--> + <xs:element name="osversion" type="os_version_info" minOccurs="0" /> + <!--Title--> + <!-- via <titles> element, used for HF6+ --> + <xs:element name="titles" minOccurs="1"> + <xs:complexType> + <xs:sequence> + <xs:element name="title" type="title_or_description_enUS" minOccurs="1" maxOccurs="1" /> + <xs:element name="title" type="title_or_description" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <!--Title--> + <!-- via <title> element, only one for en_US allowed, meant for backwards compatibility with libpnd from <HF6 --> + <xs:element name="title" type="title_or_description_enUS" minOccurs="0" /> + <!--Description--> + <!-- via <descriptions> element, used for HF6+ --> + <xs:element name="descriptions" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="description" type="title_or_description_enUS" minOccurs="1" maxOccurs="1" /> + <xs:element name="description" type="title_or_description" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <!--Description--> + <!-- via <description> element, only one for en_US allowed, meant for backwards compatibility with libpnd from <HF6 --> + <xs:element name="description" type="title_or_description_enUS" minOccurs="0" /> + <!--Icon--> + <xs:element name="icon" type="image_entry" minOccurs="0" /> + <!--License--> + <xs:element name="licenses" minOccurs="1"> + <xs:complexType> + <xs:sequence> + <xs:element name="license" type="license_info" minOccurs="1" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <!--Preview pics--> + <xs:element name="previewpics" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="pic" type="image_entry" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <!--Info (aka manual or readme entry)--> + <xs:element name="info" type="information_entry" minOccurs="0" /> + <!--Categories--> + <xs:element name="categories" minOccurs="1"> + <xs:complexType> + <xs:sequence> + <xs:element name="category" minOccurs="1" maxOccurs="unbounded"> + <xs:complexType> + <xs:sequence> + <xs:element name="subcategory" minOccurs="0" maxOccurs="unbounded"> + <xs:complexType> + <xs:attribute name="name" type="fdoSubCategory" /> + </xs:complexType> + </xs:element> + </xs:sequence> + <xs:attribute name="name" use="required" type="fdoCategory" /> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + <!--Associations--> + <xs:element name="associations" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="association" type="association_data" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <!--Clockspeed--> + <xs:element name="clockspeed" minOccurs="0"> + <xs:complexType> + <xs:attribute name="frequency" use="required" type="xs:positiveInteger" /> + </xs:complexType> + </xs:element> + </xs:all> + <!--AppID--> + <xs:attribute name="id" use="required" type="dumbFolderName" /> + <xs:attribute name="appdata" use="optional" type="dumbFolderName" /> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> +</xs:schema> diff --git a/dists/openpandora/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA new file mode 100644 index 0000000000..b3947975c0 --- /dev/null +++ b/dists/openpandora/README-OPENPANDORA @@ -0,0 +1,19 @@ +ScummVM 1.5.0git - OPENPANDORA SPECIFIC README +------------------------------------------------------------------------ +Please refer to the: + +ScummVM Forum: <http://forums.scummvm.org/> +WiKi: <http://wiki.scummvm.org/index.php/OpenPandora> + +for the most current information on the port and any updates to this +documentation. + +The wiki includes detailed instructions on how to use the port and +control information. + +------------------------------------------------------------------------ +Credits + +Core ScummVM code (c) The ScummVM Team +OpenPandora backend (c) John Willis +Detailed (c) information can be found within the source code diff --git a/dists/openpandora/README-OPENPANDORA.in b/dists/openpandora/README-OPENPANDORA.in new file mode 100644 index 0000000000..0a63a5938d --- /dev/null +++ b/dists/openpandora/README-OPENPANDORA.in @@ -0,0 +1,19 @@ +ScummVM @VERSION@ - OPENPANDORA SPECIFIC README +------------------------------------------------------------------------ +Please refer to the: + +ScummVM Forum: <http://forums.scummvm.org/> +WiKi: <http://wiki.scummvm.org/index.php/OpenPandora> + +for the most current information on the port and any updates to this +documentation. + +The wiki includes detailed instructions on how to use the port and +control information. + +------------------------------------------------------------------------ +Credits + +Core ScummVM code (c) The ScummVM Team +OpenPandora backend (c) John Willis +Detailed (c) information can be found within the source code diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt new file mode 100644 index 0000000000..240936f755 --- /dev/null +++ b/dists/openpandora/README-PND.txt @@ -0,0 +1,38 @@ +ScummVM 1.5.0git - OPENPANDORA README - HOW TO INSTALL +------------------------------------------------------------------------ + +Please refer to the: + +ScummVM Forum: <http://forums.scummvm.org/> +WiKi: <http://wiki.scummvm.org/index.php/OpenPandora> + +for the most current information on the port and any updates to this +documentation. + +------------------------------------------------------------------------ +Installing: + +This archive contains ScummVM in a PND format ready to be copied to the +OpenPandora and used. + +To install just copy the .pnd file from this archive to your device. + +You will need to place the .pnd file in a suitable location on your SD +card. + +/pandora/desktop <- place here if you wish the icon to show on the + desktop. Documentation will show in the menu. + +/pandora/menu <- place here if you wish the icon to show on the + Xfce menu. Documentation will show in the menu. + +/pandora/apps <- place here if you wish the icon to show on the + desktop and in the menu. Documentation will show + in the menu. + +------------------------------------------------------------------------ +Credits + +Core ScummVM code (c) The ScummVM Team +OpenPandora backend (c) John Willis +Detailed (c) information can be found within the source code diff --git a/dists/openpandora/README-PND.txt.in b/dists/openpandora/README-PND.txt.in new file mode 100644 index 0000000000..076c0e0a5c --- /dev/null +++ b/dists/openpandora/README-PND.txt.in @@ -0,0 +1,38 @@ +ScummVM @VERSION@ - OPENPANDORA README - HOW TO INSTALL +------------------------------------------------------------------------ + +Please refer to the: + +ScummVM Forum: <http://forums.scummvm.org/> +WiKi: <http://wiki.scummvm.org/index.php/OpenPandora> + +for the most current information on the port and any updates to this +documentation. + +------------------------------------------------------------------------ +Installing: + +This archive contains ScummVM in a PND format ready to be copied to the +OpenPandora and used. + +To install just copy the .pnd file from this archive to your device. + +You will need to place the .pnd file in a suitable location on your SD +card. + +/pandora/desktop <- place here if you wish the icon to show on the + desktop. Documentation will show in the menu. + +/pandora/menu <- place here if you wish the icon to show on the + Xfce menu. Documentation will show in the menu. + +/pandora/apps <- place here if you wish the icon to show on the + desktop and in the menu. Documentation will show + in the menu. + +------------------------------------------------------------------------ +Credits + +Core ScummVM code (c) The ScummVM Team +OpenPandora backend (c) John Willis +Detailed (c) information can be found within the source code diff --git a/dists/openpandora/icon/preview-pic.png b/dists/openpandora/icon/preview-pic.png Binary files differnew file mode 100644 index 0000000000..2f4a536d30 --- /dev/null +++ b/dists/openpandora/icon/preview-pic.png diff --git a/dists/openpandora/icon/scummvm.png b/dists/openpandora/icon/scummvm.png Binary files differnew file mode 100644 index 0000000000..128e59efc4 --- /dev/null +++ b/dists/openpandora/icon/scummvm.png diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html new file mode 100644 index 0000000000..d7238c1889 --- /dev/null +++ b/dists/openpandora/index.html @@ -0,0 +1,26 @@ +<html> + +<h3> + <p>Welcome to the ScummVM!</p> +</h3> + +<h4> + <p>ScummVM 1.5.0git: OpenPandora Specific Documentation</p> +</h4> + +<A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/> +<A href="http://scummvm.distant-earth.com/">ScummVM OpenPandora Website</a><br/> +<A href="http://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/> + +<h4> + <p>ScummVM 1.5.0git: General Documentation</p> +</h4> + +<A href="http://www.scummvm.org/">ScummVM website</a><br/> +<A href="docs/README">ScummVM README</a><br/> +<A href="docs/NEWS">ScummVM NEWS</a><br/> +<A href="docs/AUTHORS">ScummVM Authors</a><br/> +<A href="docs/COPYRIGHT">ScummVM Copyright</a><br/> +<A href="docs/COPYING">GPL Licence</a><br/> + +</html> diff --git a/dists/openpandora/index.html.in b/dists/openpandora/index.html.in new file mode 100644 index 0000000000..42c8e8c147 --- /dev/null +++ b/dists/openpandora/index.html.in @@ -0,0 +1,26 @@ +<html> + +<h3> + <p>Welcome to the ScummVM!</p> +</h3> + +<h4> + <p>ScummVM @VERSION@: OpenPandora Specific Documentation</p> +</h4> + +<A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/> +<A href="http://scummvm.distant-earth.com/">ScummVM OpenPandora Website</a><br/> +<A href="http://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/> + +<h4> + <p>ScummVM @VERSION@: General Documentation</p> +</h4> + +<A href="http://www.scummvm.org/">ScummVM website</a><br/> +<A href="docs/README">ScummVM README</a><br/> +<A href="docs/NEWS">ScummVM NEWS</a><br/> +<A href="docs/AUTHORS">ScummVM Authors</a><br/> +<A href="docs/COPYRIGHT">ScummVM Copyright</a><br/> +<A href="docs/COPYING">GPL Licence</a><br/> + +</html> diff --git a/dists/openpandora/pnd_make.sh b/dists/openpandora/pnd_make.sh new file mode 100755 index 0000000000..0c03e8154d --- /dev/null +++ b/dists/openpandora/pnd_make.sh @@ -0,0 +1,321 @@ +#!/bin/bash +# +# pnd_make.sh +# +# This script is meant to ease generation of a pnd file. Please consult the output +# when running --help for a list of available parameters and an explaination of +# those. +# +# Required tools when running the script: +# bash +# echo, cat, mv, rm +# mkisofs or mksquashfs (the latter when using the -c param!) +# xmllint (optional, only for validation of the PXML against the schema) + + +PXML_schema=$(dirname ${0})/PXML_schema.xsd +GENPXML_PATH=$(dirname ${0})/genpxml.sh + +# useful functions ... +black='\E[30m' +red='\E[31m' +green='\E[32m' +yellow='\E[33m' +blue='\E[34m' +magenta='\E[35m' +cyan='\E[36m' +white='\E[37m' + +check_for_tool() +{ + which $1 &> /dev/null + if [ "$?" -ne "0" ]; + then + cecho "ERROR: Could not find the program '$1'. Please make sure +that it is available in your PATH since it is required to complete your request." $red + exit 1 + fi +} + +cecho () # Color-echo. Argument $1 = message, Argument $2 = color +{ + local default_msg="No message passed." # Doesn't really need to be a local variable. + message=${1:-$default_msg} # Defaults to default message. + color=${2:-$black} # Defaults to black, if not specified. + echo -e "$color$message" + tput sgr0 # Reset to normal. + return +} + + +print_help() +{ + cat << EOSTREAM +pnd_make.sh - A script to package "something" into a PND. + +Usage: + $(basename ${0}) {--directory|-d} <folder> {--pndname|-p} <file> [{--compress-squashfs|-c}] + [{--genpxml} <file>] [{--icon|-i} <file>] [{--pxml|-x} <file>] + [{--schema|-s} <file>] [{--help|-h}] + + +Switches: + --compress-squashfs / -c Define whether or not the pnd should be compressed using + squashfs. If this parameter is selected, a compressed pnd + will be created. + + --directory / -d Sets the folder that is to be used for the resulting pnd + to <folder>. This option is mandatory for the script to + function correctly. + + --genpxml Sets the script used for generating a PXML file (if none + is available already) to <file>. Please make sure to either + provide a full path or prefix a script in the current folder + with './' so that the script can actually be executed. If + this variable is not specified, $GENPXML_PATH + will be used. + + --help / -h Displays this help text. + + --icon / -i Sets the icon that will be appended in the pnd to <file>. + + --pndname / -p Sets the output filename of the resulting pnd to <file>. + This option is mandatory for the script to function + correctly. + + --pxml / -x Sets the PXML file that is to be used to <file>. If you + neither provide a PXML file or set this entry to 'guess', + an existing 'PXML.xml' in your selected '--directory' + will be used, or the script $GENPXML_PATH + will be called to try to generate a basic PXML file for you. + + --schema / -s Sets the schema file, that is to be used for validation, + to <file. If this is not defined, the script will try to + use the file '$PXML_schema'. If this fails, + a warning is issued. + +If you select the option to create a compressed squashfs, a version >=4.0 of squashfs +is required to be available in your PATH. +EOSTREAM +} + + +# Parse command line parameters +while [ "${1}" != "" ]; do + if [ "${1}" = "--compress-squashfs" ] || [ "${1}" = "-c" ]; + then + SQUASH=1 + shift 1 + elif [ "${1}" = "--directory" ] || [ "${1}" = "-d" ]; + then + FOLDER=$2 + shift 2 + elif [ "${1}" = "--genpxml" ]; + then + GENPXML_PATH=$2 + shift 2 + elif [ "${1}" = "--help" ] || [ "${1}" = "-h" ]; + then + print_help + exit 0 + elif [ "${1}" = "--icon" ] || [ "${1}" = "-i" ]; + then + ICON=$2 + shift 2 + elif [ "${1}" = "--pndname" ] || [ "${1}" = "-p" ]; + then + PNDNAME=$2 + shift 2 + elif [ "${1}" = "--pxml" ] || [ "${1}" = "-x" ]; + then + PXML=$2 + shift 2 + elif [ "${1}" = "--schema" ] || [ "${1}" = "-f" ] + then + PXML_schema=$2 + shift 2 + else + cecho "ERROR: '$1' is not a known argument. Printing --help and aborting." $red + print_help + exit 1 + fi +done + + +# Generate a PXML if the param is set to Guess or it is empty. +if [ ! $PXML ] || [ $PXML = "guess" ] && [ $PNDNAME ] && [ $FOLDER ]; +then + if [ -f $FOLDER/PXML.xml ]; # use the already existing PXML.xml file if there is one... + then + PXML=$FOLDER/PXML.xml + PXML_ALREADY_EXISTING="true" + else + if [ -f $GENPXML_PATH ]; + then + $GENPXML_PATH --src $FOLDER --dest $FOLDER --author $USER + if [ -f $FOLDER/PXML.xml ]; + then + PXML_GENERATED="true" + else + cecho "ERROR: Generating a PXML file using '$GENPXML_PATH' failed. +Please generate a PXML file manually." $red + exit 1 + fi + else + cecho "ERROR: Could not find '$GENPXML_PATH' for generating a PXML file." $red + exit 1 + fi + fi +fi + + +# Probe if required variables were set +echo -e +cecho "Checking if all required variables were set." $green +if [ ! $PNDNAME ] || [ ! $FOLDER ] || [ ! $PXML ]; +then + echo -e + cecho "ERROR: Not all required options were set! Please see the --help information below." $red + echo -e + print_help + exit 1 +else + echo "PNDNAME set to '$PNDNAME'." +fi +# Check if the selected folder actually exists +if [ ! -d $FOLDER ]; +then + echo -e + cecho "ERROR: '$FOLDER' doesn't exist or is not a folder." $red + exit 1 +else + echo "FOLDER set to '$FOLDER'." +fi +# Check if the selected PXML file actually exists +if [ ! -f $PXML ]; +then + echo -e + cecho "ERROR: '$PXML' doesn't exist or is not a file." $red + exit 1 +else + if [ $PXML_ALREADY_EXISTING ]; + then + echo "You have not explicitly specified a PXML to use, but an existing file was +found. Will be using this one." + elif [ $PXML_GENERATED ]; + then + echo "A PXML file was generated for you using '$GENPXML_PATH'. This file will +not be removed at the end of this script because you might want to review it, adjust +single entries and rerun the script to generate a pnd with a PXML file with all the +information you want to have listed." + fi + echo "PXML set to '$PXML'." +fi + +# Print the other variables: +if [ $ICON ]; +then + if [ ! -f $ICON ] + then + cecho "WARNING: '$ICON' doesn't exist, will not append the selected icon to the pnd." $red + else + echo "ICON set to '$ICON'." + USE_ICON="true" + fi +fi +if [ $SQUASH ]; +then + echo "Will use a squashfs for '$PNDNAME'." +fi + + +# Validate the PXML file (if xmllint is available) +# Errors and problems in this section will be shown but are not fatal. +echo -e +cecho "Trying to validate '$PXML' now. Will be using '$PXML_schema' to do so." $green +which xmllint &> /dev/null +if [ "$?" -ne "0" ]; +then + VALIDATED=false + cecho "WARNING: Could not find 'xmllint'. Validity check of '$PXML' is not possible!" $red +else + if [ ! -f "$PXML_schema" ]; + then + VALIDATED=false + cecho "WARNING: Could not find '$PXML_schema'. If you want to validate your +PXML file please make sure to provide a schema using the --schema option." $red + else + xmllint --noout --schema $PXML_schema $PXML + if [ "$?" -ne "0" ]; then VALIDATED=false; else VALIDATED=true; fi + fi +fi +# Print some message at the end about the validation in case the user missed the output above +if [ $VALIDATED = "false" ] +then + cecho "WARNING: Could not successfully validate '$PXML'. Please check the output +above. This does not mean that your pnd will be broken. Either you are not following the strict +syntax required for validation or you don't have all files/programs required for validating." $red +else + cecho "Your file '$PXML' was validated successfully. The resulting pnd should +work nicely with libpnd." $green +fi + + +# Make iso from folder +echo -e +cecho "Creating an iso file based on '$FOLDER'." $green +if [ $SQUASH ]; +then + check_for_tool mksquashfs + if [ $(mksquashfs -version | awk 'BEGIN{r=0} $3>=4{r=1} END{print r}') -eq 0 ]; + then + cecho "ERROR: Your squashfs version is older then version 4, please upgrade to 4.0 or later" $red + exit 1 + fi + mksquashfs $FOLDER $PNDNAME.iso -nopad -no-recovery +else + check_for_tool mkisofs + mkisofs -o $PNDNAME.iso -R $FOLDER +fi + +# Check that the iso file was actually created before continuing +if [ ! -f $PNDNAME.iso ]; +then + cecho "ERROR: The temporary file '$PNDNAME.iso' could not be created. +Please check the output above for any errors and retry after fixing them. Aborting." $red + exit 1 +fi + + +# Append pxml to iso +echo -e +cecho "Appending '$PXML' to the created iso file." $green +cat $PNDNAME.iso $PXML > $PNDNAME +rm $PNDNAME.iso #cleanup + + +# Append icon if specified and available +if [ $USE_ICON ]; +then + echo -e + cecho "Appending the icon '$ICON' to the pnd." $green + mv $PNDNAME $PNDNAME.tmp + cat $PNDNAME.tmp $ICON > $PNDNAME # append icon + rm $PNDNAME.tmp #cleanup +fi + + +# Final message +echo -e +if [ -f $PNDNAME ]; +then + cecho "Successfully finished creating the pnd '$PNDNAME'." $green +else + cecho "There seems to have been a problem and '$PNDNAME' was not created. Please check +the output above for any error messages. A possible cause for this is that there was +not enough space available." $red + exit 1 +fi + + +#if [ $PXML = "guess" ];then rm $FOLDER/PXML.xml; fi #cleanup diff --git a/dists/openpandora/runscummvm.sh b/dists/openpandora/runscummvm.sh new file mode 100755 index 0000000000..9c9d8362cb --- /dev/null +++ b/dists/openpandora/runscummvm.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +# Make sure any extra libs not in the firmware are pulled in. +LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:../lib +export LD_LIBRARY_PATH + +# Ensure we have a folder to store save games on the SD card. +mkdir saves + +# make a runtime dir, just incase it creates anything in CWD +mkdir runtime +cd runtime + +../bin/scummvm --fullscreen --gfx-mode=2x --config=../scummvm.config --themepath=../data diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index 7457ddd195..2ccccae79d 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -17,6 +17,7 @@ Url : http://www.scummvm.org Source : %{name}-%{version}.tar.bz2 Source1 : libmad-0.15.1b.tar.bz2 +Source2 : faad2-2.7.tar.bz2 BuildRoot : %{_tmppath}/%{name}-%{version}-root BuildRequires: desktop-file-utils @@ -44,12 +45,13 @@ games) and many more. See http://www.scummvm.org for a full compatibility list. # install scripts #------------------------------------------------------------------------------ %prep -%setup -q -a 1 -n scummvm-%{version} +%setup -q -a 1 -a 2 -n scummvm-%{version} mkdir tmp %build (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release +(cd faad2-2.7; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release make %install @@ -115,6 +117,8 @@ fi # Change Log #------------------------------------------------------------------------------ %changelog +* Thu Dec 29 2011 (1.4.0-2) + - include libfaad2 * Fri Sep 17 2010 (1.2.0) - include png/svg icons - remove libmpeg2 diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in index 56e165c979..3beef2f960 100644 --- a/dists/redhat/scummvm.spec.in +++ b/dists/redhat/scummvm.spec.in @@ -17,6 +17,7 @@ Url : http://www.scummvm.org Source : %{name}-%{version}.tar.bz2 Source1 : libmad-0.15.1b.tar.bz2 +Source2 : faad2-2.7.tar.bz2 BuildRoot : %{_tmppath}/%{name}-%{version}-root BuildRequires: desktop-file-utils @@ -44,12 +45,13 @@ games) and many more. See http://www.scummvm.org for a full compatibility list. # install scripts #------------------------------------------------------------------------------ %prep -%setup -q -a 1 -n scummvm-%{version} +%setup -q -a 1 -a 2 -n scummvm-%{version} mkdir tmp %build (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release +(cd faad2-2.7; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release make %install @@ -115,6 +117,8 @@ fi # Change Log #------------------------------------------------------------------------------ %changelog +* Thu Dec 29 2011 (1.4.0-2) + - include libfaad2 * Fri Sep 17 2010 (1.2.0) - include png/svg icons - remove libmpeg2 diff --git a/dists/scummvm.rc b/dists/scummvm.rc index ce287cdd42..e5d28d089a 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 @@ -71,7 +68,7 @@ BEGIN VALUE "FileDescription", "http://www.scummvm.org/\0" VALUE "FileVersion", "1.5.0git\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2011 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright © 2001-2012 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" diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index b91e7ebb0c..6969e0b2a7 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 @@ -71,7 +68,7 @@ BEGIN VALUE "FileDescription", "http://www.scummvm.org/\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "scummvm\0" - VALUE "LegalCopyright", "Copyright © 2001-2011 The ScummVM Team\0" + VALUE "LegalCopyright", "Copyright © 2001-2012 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" diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss index 852597fb69..d0448c5620 100644 --- a/dists/win32/ScummVM.iss +++ b/dists/win32/ScummVM.iss @@ -1,5 +1,5 @@ [Setup] -AppCopyright=2011 +AppCopyright=2012 AppName=ScummVM AppVerName=ScummVM Git AppPublisher=The ScummVM Team @@ -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} @@ -44,48 +45,64 @@ Name: {group}\ScummVM; Filename: {app}\scummvm.exe; WorkingDir: {app}; Comment: Name: {group}\ScummVM (noconsole); Filename: {app}\scummvm.exe; Parameters: "--no-console"; WorkingDir: {app}; Comment: scummvm; Flags: createonlyiffileexists; IconIndex: 0 Name: {group}\Authors; Filename: {app}\AUTHORS.txt; WorkingDir: {app}; Comment: AUTHORS; Flags: createonlyiffileexists Name: {group}\Copying; Filename: {app}\COPYING.txt; WorkingDir: {app}; Comment: COPYING; Flags: createonlyiffileexists +Name: {group}\Copying.FREEFONT; Filename: {app}\COPYING.FREEFONT.txt; WorkingDir: {app}; Comment: COPYING.FREEFONT; Flags: createonlyiffileexists Name: {group}\Copying.LGPL; Filename: {app}\COPYING.LGPL.txt; WorkingDir: {app}; Comment: COPYING.LGPL; Flags: createonlyiffileexists Name: {group}\Copyright; Filename: {app}\COPYRIGHT.txt; WorkingDir: {app}; Comment: COPYRIGHT; Flags: createonlyiffileexists ;NEWS 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 (de or es or fr or it or nb) +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}\Inicio RĂ¡pido; Filename: {app}\Inicio RĂ¡pido.txt; WorkingDir: {app}; Comment: Inicio RĂ¡pido; Flags: createonlyiffileexists; Languages: es +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 (cz or 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 + +Name: {group}\Saved Games\Migrate Saved Games; Filename: {app}\migration.bat; WorkingDir: {app}; Comment: Migrate Saved Games; IconIndex: 0; MinVersion: 0, 1 +Name: {group}\Saved Games\Saved Games (old default); Filename: {app}; WorkingDir: {app}; Comment: Saved Games (old default); IconIndex: 0; MinVersion: 0, 1 +Name: {group}\Saved Games\Saved Games (new default); Filename: {userappdata}\ScummVM\Saved Games; WorkingDir: {userappdata}\ScummVM\Saved Games; Comment: Saved Games (new default); IconIndex: 0; MinVersion: 0, 1 [Run] Filename: {app}\ScummVM.exe; Flags: nowait skipifdoesntexist postinstall skipifsilent +;Creates a symbolic link for standard save games area, under Windows Vista/7 +Filename: {cmd}; Parameters: "/c ""mklink /d ""%userprofile%\Saved Games\ScummVM"" ""%appdata%\ScummVM\Saved games"" "" "; MinVersion: 0, 6.1 [UninstallDelete] Type: files; Name: {app}\ISTool.url +[Dirs] +Name: "{userappdata}\ScummVM"; MinVersion: 0, 1 +Name: "{userappdata}\ScummVM\Saved Games"; MinVersion: 0, 1 + [Files] Source: AUTHORS.txt; DestDir: {app}; Flags: ignoreversion Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion +Source: COPYING.FREEFONT.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 ;QUICKSTART -Source: doc/QUICKSTART.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: not (de or es or fr or it or nb) +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/Inicio RĂ¡pido.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: es +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: 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) +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} @@ -95,10 +112,14 @@ 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 Source: teenagent.dat; DestDir: {app}; Flags: ignoreversion Source: toon.dat; DestDir: {app}; Flags: ignoreversion Source: translations.dat; DestDir: {app}; Flags: ignoreversion +;Mirgration script for saved games in Windows NT4 onwards +Source: migration.bat; DestDir: {app}; Flags: ignoreversion; MinVersion: 0, 1 +Source: migration.txt; DestDir: {app}; Flags: ignoreversion; MinVersion: 0, 1 + + diff --git a/dists/win32/migration.bat b/dists/win32/migration.bat new file mode 100644 index 0000000000..2bba7baef4 --- /dev/null +++ b/dists/win32/migration.bat @@ -0,0 +1,51 @@ +:: Script for migrating saved games in Windows 2000/XP/Vista/7 +:: +:: Put this batch file into the ScummVM directory +:: This script will copy any saved games located in the +:: old default location, to the new default location. +:: +:: (c) 2012 ScummVM Team +:: + +@echo off +echo ScummVM Saved Games Migration Script +echo The default location for saved games changed +echo in Windows NT4/2000/XP/Vista/7 for ScummVM 1.5.0 +echo This script will copy any saved games stored in +echo the old default location, to the new default location +pause + +if defined APPDATA goto :test2 +echo. +echo Unable to access the Application Data variable! +pause +goto :eof + +:test2 +if exist "%APPDATA%" goto :test3 +echo. +echo Application Data directory doesn't exist! +pause +goto :eof + +:test3 +if exist "%APPDATA%\ScummVM\" goto :test4 +echo. +echo ScummVM Application Data directory doesn't exist! +pause +goto :eof + +:test4 +if exist "%APPDATA%\ScummVM\Saved Games\" goto :copyfiles +echo. +echo ScummVM Saved Games directory doesn't exist! +pause +goto :eof + +:copyfiles +echo Copying ScummVM Saved Games... +xcopy /EXCLUDE:migration.txt /F /-Y * "%APPDATA%\ScummVM\Saved Games" + +echo. +echo All saved games have been copied to the new location of "%APPDATA%\ScummVM\Saved Games" +pause diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt new file mode 100644 index 0000000000..eedd773b32 --- /dev/null +++ b/dists/win32/migration.txt @@ -0,0 +1,27 @@ +AUTHORS.txt +COPYING.LGPL.txt +COPYING.txt +COPYRIGHT.txt +drascula.dat +hugo.dat +kyra.dat +lure.dat +m4.dat +NEWS.txt +pred.dic +queen.tbl +QUICKSTART.txt +README-SDL.txt +README.txt +scummclassic.zip +scummmodern.zip +scummvm.exe +SDL.dll +sky.cpt +teenagent.dat +migration.bat +migration.txt +toon.dat +translations.dat +unins000.dat +unins000.exe diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi index 23a3abcfd4..7ff174befb 100644 --- a/dists/win32/scummvm.nsi +++ b/dists/win32/scummvm.nsi @@ -76,7 +76,7 @@ Name ScummVM !define COMPANY "ScummVM Team" !define URL "http://scummvm.org/" !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!" -!define COPYRIGHT "Copyright © 2001-2011 The ScummVM Team" +!define COPYRIGHT "Copyright © 2001-2012 The ScummVM Team" ######################################################################################### # Installer configuration @@ -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..340024e6a1 100644 --- a/dists/win32/scummvm.nsi.in +++ b/dists/win32/scummvm.nsi.in @@ -76,7 +76,7 @@ Name ScummVM !define COMPANY "ScummVM Team" !define URL "http://scummvm.org/" !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!" -!define COPYRIGHT "Copyright © 2001-2011 The ScummVM Team" +!define COPYRIGHT "Copyright © 2001-2012 The ScummVM Team" ######################################################################################### # Installer configuration @@ -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 |