First batch of root directory cleanup. Now icons are stored in directory

icons/ and all other assorted stuff in dists/ directory. Still I may broke some
packaging/building procedures as no testing was performed.

svn-id: r21859

12 files changed, 304 insertions, 24 deletions

diff --git a/dists/debian/rules b/dists/debian/rules
index 2c907f011a..42c2068239 100755
--- a/dists/debian/rules
+++ b/dists/debian/rules
@@ -28,7 +28,7 @@ install: build
 	dh_clean
 	dh_installdirs
 	install -m0755 scummvm debian/scummvm/usr/games/scummvm
-	install -m0644 scummvm.xpm debian/scummvm/usr/share/icons
+	install -m0644 icons/scummvm.xpm debian/scummvm/usr/share/icons
 
 binary: binary-arch
 
diff --git a/dists/devcpp/scummvm.dev b/dists/devcpp/scummvm.dev
index 236d2325d8..f8cdb45536 100644
--- a/dists/devcpp/scummvm.dev
+++ b/dists/devcpp/scummvm.dev
@@ -14,7 +14,7 @@ Compiler=
 CppCompiler=-Wno-multichar_@@_-DUSE_ZLIB_@@_
 Linker=cine/cine.a_@@_gob/gob.a_@@_kyra/kyra.a_@@_lure/lure.a_@@_queen/queen.a_@@_saga/saga.a_@@_scumm/scumm.a_@@_simon/simon.a_@@_sky/sky.a_@@_sword1/sword1.a_@@_sword2/sword2.a_@@_-lSDL.dll_@@_-lwinmm_@@_-lzdll_@@_
 IsCpp=1
-Icon=scummvm.ico
+Icon=icons/scummvm.ico
 ExeOutput=scummvm
 ObjectOutput=scummvm
 OverrideOutput=0
diff --git a/dists/msevc4/scummvm/scummvm.vcp b/dists/msevc4/scummvm/scummvm.vcp
index 0f6e3371ee..7e51c4d6a7 100644
--- a/dists/msevc4/scummvm/scummvm.vcp
+++ b/dists/msevc4/scummvm/scummvm.vcp
@@ -20124,7 +20124,7 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scummvm.xpm"\
+	"..\..\..\icons\scummvm.xpm"\
 	
 NODEP_CPP_SDL_C=\
 	"..\..\..\common\extend.h"\
@@ -20177,7 +20177,7 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
 	"..\..\..\graphics\surface.h"\
-	"..\..\..\scummvm.xpm"\
+	"..\..\..\icons\scummvm.xpm"\
 	{$(INCLUDE)}"SDL.h"\
 	{$(INCLUDE)}"SDL\begin_code.h"\
 	{$(INCLUDE)}"SDL\close_code.h"\
@@ -20228,7 +20228,7 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scummvm.xpm"\
+	"..\..\..\icons\scummvm.xpm"\
 	
 NODEP_CPP_SDL_C=\
 	"..\..\..\common\extend.h"\
@@ -20277,7 +20277,7 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scummvm.xpm"\
+	"..\..\..\icons\scummvm.xpm"\
 	
 NODEP_CPP_SDL_C=\
 	"..\..\..\common\compile.h"\
@@ -20327,7 +20327,7 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scummvm.xpm"\
+	"..\..\..\icons\scummvm.xpm"\
 	
 NODEP_CPP_SDL_C=\
 	"..\..\..\common\extend.h"\
@@ -20375,7 +20375,7 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scummvm.xpm"\
+	"..\..\..\icons\scummvm.xpm"\
 	
 NODEP_CPP_SDL_C=\
 	"..\..\..\common\extend.h"\
@@ -20422,7 +20422,7 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scummvm.xpm"\
+	"..\..\..\icons\scummvm.xpm"\
 	
 NODEP_CPP_SDL_C=\
 	"..\..\..\common\extend.h"\
@@ -20447,7 +20447,7 @@ DEP_CPP_SDL_C=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\scummvm.xpm"\
+	"..\..\..\icons\scummvm.xpm"\
 	
 NODEP_CPP_SDL_C=\
 	"..\..\..\common\extend.h"\
diff --git a/dists/msvc6/scummvm.dsp b/dists/msvc6/scummvm.dsp
index b3bf8ffc1d..b04886b2fa 100644
--- a/dists/msvc6/scummvm.dsp
+++ b/dists/msvc6/scummvm.dsp
@@ -641,7 +641,7 @@ SOURCE=..\..\README
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\scummvm.ico
+SOURCE=..\..\icons\scummvm.ico
 # End Source File
 # Begin Source File
 
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index aed4fdf2f5..c323a3f4f5 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -446,7 +446,7 @@
 			Name="rsc"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="..\..\scummvm.ico">
+				RelativePath="..\..\icons\scummvm.ico">
 			</File>
 			<File
 				RelativePath="..\..\scummvm.rc">
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index e8d39cf853..b48dbee0ec 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -460,7 +460,7 @@
 			Name="rsc"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="..\..\scummvm.ico">
+				RelativePath="..\..\icons\scummvm.ico">
 			</File>
 			<File
 				RelativePath="..\..\scummvm.rc">
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 51ca8f4a3a..504ecd2b7b 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -682,7 +682,7 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="..\..\scummvm.ico"
+				RelativePath="..\..\icons\scummvm.ico"
 				>
 			</File>
 			<File
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 1bd65089a3..aed6013dea 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -54,9 +54,9 @@ make
 
 %install
 install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
-install -m644 -D scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
-install -m644 -D scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
-desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications scummvm.desktop
+install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
+install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
+desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
 rm -Rf ${RPM_BUILD_ROOT}
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index cbe47ec414..7828cb5dcb 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -54,9 +54,9 @@ make
 
 %install
 install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
-install -m644 -D scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
-install -m644 -D scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
-desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications scummvm.desktop
+install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
+install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
+desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
 rm -Rf ${RPM_BUILD_ROOT}
diff --git a/dists/scummvm.6 b/dists/scummvm.6
new file mode 100644
index 0000000000..859b9e2711
--- /dev/null
+++ b/dists/scummvm.6
@@ -0,0 +1,268 @@
+.\"	$Id$
+.Dd December 15, 2004
+.Dt SCUMMVM 6
+.Os
+.Sh NAME
+.Nm scummvm
+.Nd graphic adventure game interpreter
+.Sh SYNOPSIS
+.Nm scummvm
+.Op Ar options 
+.Op Ar game
+.Sh DESCRIPTION
+.Nm
+is an interpreter that will play graphic adventure games
+based an a variety of game engines.
+.Bl -tag -width Ds
+.It Fl F
+Force windowed mode.
+.It Fl b Ar param 
+Pass number to the boot script (boot param).
+.It Fl c Ar config
+Use
+.Ar config
+as alternate configuration file.
+.It Fl d Ar level
+Set debug verbosity to
+.Ar level .
+.It Fl e Ar driver
+Music
+.Ar driver
+to use:
+.Bl -tag -width Ds
+.It Em adlib
+Adlib emulation (default)
+.It Em alsa
+Output using ALSA sequencer device
+.It Em amidi
+Use the MorphOS MIDI system, for MorphOS users
+.It Em core
+CoreAudio sound, for MacOS X users
+.It Em mt32
+MT-32 emulation
+.It Em null
+Null output.
+Don't play any music.
+.It Em pcjr
+PCjr emulation
+.It Em pcspk
+PC Speaker emulation
+.It Em qt
+Quicktime sound, for Macintosh users
+.It Em seq
+Use /dev/sequencer for MIDI output
+.It Em towns
+FM-TOWNS YM2612 emulation
+.It Em windows
+Windows built in MIDI sequencer for Windows users
+.El
+.It Fl f
+Force full-screen mode.
+.It Fl g Ar scaler
+Select graphics 
+.Ar scaler :
+.Bl -tag -width Ds
+.It Em 2x
+No filtering, factor 2x (default for non 640x480 games).
+.It Em 3x
+No filtering, factor 3x.
+.It Em 2xsai
+2xsai filter, factor 2x.
+.It Em advmame2x
+Doesn't rely on blurring like 2xSAI, fast.
+Factor 2x.
+.It Em advmame3x
+Doesn't rely on blurring like 2xSAI, fast.
+Factor 3x.
+.It Em dotmatrix
+Dot matrix effect.
+Factor 2x.
+.It Em hq2x
+Very nice high quality filter but slow.
+Factor 2x.
+.It Em hq3x
+Very nice high quality filter but slow.
+Factor 3x.
+.It Em normal
+No filtering, no scaling.
+Fastest.
+.It Em super2xsai
+Enhanced 2xsai filtering, factor 2x.
+.It Em supereagle
+Less blurry than 2xsai, but slower.
+Factor 2x.
+.It Em tv2x
+Interlace filter, tries to emulate a TV.
+Factor 2x.
+.El
+.It Fl h
+Display a brief help text and exit.
+.It Fl m Ar vol
+Set the music volume to
+.Ar vol
+range 0-255 (default: 192).
+.It Fl n
+Enable subtitles (use with games that have voice).
+.It Fl p Ar path
+Path to where the game is installed.
+.It Fl q Ar language
+Select game language:
+.Bl -tag -width Ds
+.It Em cz
+Czech
+.It Em en
+English (USA) (default)
+.It Em de
+German
+.It Em es
+Spanish
+.It Em fr
+French
+.It Em gb
+English (Great Britain) (default for BASS)
+.It Em hb
+Hebrew
+.It Em it
+Italian
+.It Em jp
+Japanese
+.It Em kr
+Korean
+.It Em pt
+Portuguese
+.It Em ru
+Russian
+.It Em se
+Swedish
+.It Em zh
+Chinese
+.El
+.It Fl r Ar vol
+Set the speech volume to
+.Ar vol
+range 0-255 (default: 192).
+.It Fl s Ar vol
+Set the sfx volume to
+.Ar vol
+range 0-255 (default: 192).
+.It Fl t
+Display list of configured targets and exit.
+.It Fl u
+Enable script dumping if a directory called
+.Ql dumps
+exists in the current directory.
+.It Fl v
+Display ScummVM version information and exit.
+.It Fl x Ar slot
+Save game
+.Ar slot
+number to load (default: autosave).
+.It Fl z
+Display list of supported games and exit.
+.\" FIXME better way to do long options?
+.It Fl -alt-intro
+Use alternative intro for CD versions of Beneath a Steel Sky and
+Flight of the Amazon Queen.
+.It Fl -aspect-ratio
+Enable aspect ratio correction.
+.It Fl -cdrom= Ns Ar num
+CD drive to play CD audio from (default: 0 = first drive).
+.It Fl -copy-protection
+Enable copy protection in SCUMM games, when ScummVM disables it
+by default.
+.It Fl -demo-mode
+Start demo mode of Maniac Mansion.
+.It Fl -joystick= Ns Ar num
+Enable input with joystick (default: 0 = first joystick).
+.It Fl -multi-midi
+Enable combination Adlib and native MIDI.
+.It Fl -native-mt32
+True Roland MT-32 MIDI (disable GM emulation).
+.It Fl -output-rate= Ns Ar rate
+Set output sample rate in Hz to
+.Ar rate
+(e.g. 22050).
+.It Fl -platform= Ns Ar plat
+Specify original platform of game.
+.It Fl -savepath= Ns Ar path
+Look for savegames in
+.Ar path .
+.It Fl -talkspeed= Ns Ar speed
+Set talk speed to
+.Ar speed
+for SCUMM games (default: 60).
+.It Fl -tempo= Ns Ar tempo
+Set music tempo to
+.Ar tempo
+(in percent, 50-200) for SCUMM games (default: 100).
+.El
+.Sh INGAME KEYS
+.Bl -tag -width Ds
+.It Cmd-q
+Quit (Mac OS X)
+.It Ctrl-q
+Quit (Most platforms) 
+.It Ctrl-f
+Toggle fast mode
+.It Ctrl-m
+Toggle mouse capture
+.It Ctrl-Alt 1-8
+Switch between graphics filters
+.It Ctrl-Alt +
+Increase scale factor
+.It Ctrl-Alt -
+Decrease scale factor
+.It Ctrl-Alt a
+Toggle aspect-ratio correction
+.It Alt-Enter
+Toggle full screen/windowed
+.El
+.Sh ENVIRONMENT
+.Bl -tag -width SCUMMVM
+.It Ev SCUMMVM_SAVEPATH
+A writeable directory to read and write save games to and from.
+.It Ev SCUMMVM_MIDI
+The sequencer device to use with the
+.Ql seq
+MIDI driver.
+.It Ev SCUMMVM_MIDIPORT
+The number of the sequencer to use when using the
+.Ql seq
+MIDI driver.
+.It Ev SCUMMVM_PORT
+The ALSA port to open for output when using the
+.Ql alsa
+MIDI driver.
+.El
+.Sh FILES
+.Bl -tag -width Ds
+.It Pa $HOME/.scummvmrc
+Configuration file on UNIX.
+.It Pa "$HOME/Library/Preferences/ScummVM Preferences"
+Configuration file on Mac OS X.
+.El
+.Sh EXAMPLES
+Running the builtin game launcher:
+.Pp
+.Dl $ scummvm
+.Pp
+Running Day of the Tentacle specifying the path:
+.Pp
+.Dl $ scummvm -p /usr/local/share/games/tentacle tentacle
+.Pp
+Running The Dig with advmame2x filter with subtitles:
+.Pp
+.Dl $ scummvm -g advmame2x -n dig
+.Pp
+Running the Italian version of Maniac Mansion fullscreen:
+.Pp
+.Dl $ scummvm -q it -f maniac
+.Sh SEE ALSO
+More information can be found in the README and on the website
+.Pa http://www.scummvm.org .
+.Sh AUTHORS
+This manual page written by Jonathan Gray <khalek at scummvm.org>.
+ScummVM was written by the ScummVM team.
+See 
+.Pa http://www.scummvm.org
+for more information.
diff --git a/dists/scummvm.desktop b/dists/scummvm.desktop
new file mode 100644
index 0000000000..5a0f88b355
--- /dev/null
+++ b/dists/scummvm.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ScummVM
+Name[pl]=ScummVM
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Exec=scummvm
+Icon=scummvm.xpm
+Terminal=false
+Type=Application
+Categories=Application;Game;AdventureGame;
+StartupNotify=false
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 866f89ba0d..579bb36e43 100755
--- a/dists/slackware/scummvm.SlackBuild
+++ b/dists/slackware/scummvm.SlackBuild
@@ -34,9 +34,9 @@ chmod 755 scummvm
 mkdir -p $PKG/usr/bin
 cp scummvm $PKG/usr/bin
 chown -R root:bin $PKG/usr/bin
-gzip -9 scummvm.6
+gzip -9 dists/scummvm.6
 mkdir -p $PKG/usr/man/man6
-cp scummvm.6.gz $PKG/usr/man/man6
+cp dists/scummvm.6.gz $PKG/usr/man/man6
 mkdir -p $PKG/usr/doc/scummvm-$VERSION
 cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
   $PKG/usr/doc/scummvm-$VERSION
@@ -44,10 +44,10 @@ chmod 644 $PKG/usr/doc/scummvm-$VERSION
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 mkdir -p $PKG/usr/share/pixmaps
-cp -a scummvm.ico scummvm.xpm \
+cp -a icons/scummvm.ico icons/scummvm.xpm \
   $PKG/usr/share/pixmaps
 mkdir -p $PKG/usr/share/applications
-cp -a scummvm.desktop \
+cp -a dists/scummvm.desktop \
   $PKG/usr/share/applications
 
 cd $PKG