(svn r2371) - Fix: [ 1144510 ] make install tries to install scenarios in the (non-existing) personal dir when USE_HOMEDIR is specified.

	This fix solves the issue for now by installing scenarios in the system-wide data dir.
- Add: 32x32 xpm format icon, used for debian packaging.
- Some minor updates to the os/debian directory.

6 files changed, 51 insertions, 9 deletions

diff --git a/os/debian/README.Debian b/os/debian/README.Debian
index 489c82deb..f26d1b920 100644
--- a/os/debian/README.Debian
+++ b/os/debian/README.Debian
@@ -7,13 +7,22 @@ You should copy the data files from the original TTD into the data directory
 
 -Music
 	For in game music (optional), you should copy all files in the data/gm
-	folder of you ttd installation to /usr/share/games/openttd/gm.  You
+	folder of your ttd installation to /usr/share/games/openttd/gm.  You
 	should also install timdity and a soundfont (freepats is packaged in
 	debian and works out of the box).
 
 	Don't forget to use -m extmidi if you want music, and if you have
 	problems, remember that not all audio devices support multiple
 	audiostreams (music and sound), so you might have to use software
-	mixing. AC97 codec cannot do hardware mixing, for example.
+	mixing. My VIA AC97 device cannot do hardware mixing, for example.
 
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>, Wed, 15 Sep 2004 00:24:01 +0200
+-Scenarios
+	There are a few scenarios included in this release. When you start openttd
+	it will look for scenarios in ~/.openttd/scenario, while the premade
+	scenarios are in /usr/share/games/openttd/data/scenario. You have two
+	options to use the scenarios.
+	* Navigate to /usr/share/games/openttd/data/scenario within openttd.
+	* Copy scenarios from /usr/share/games/openttd/data/scenario to
+	  ~/.openttd/scenario. We are looking into a better solution for this.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>, Tue, 25 Jan 2004 14:11:01 +0200
diff --git a/os/debian/changelog b/os/debian/changelog
index 9161cf5ad..1d2474ed9 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,6 +1,39 @@
-openttd (0.3.4.1-1) unstable; urgency=low
+openttd (0.4.0.1-2) unstable; urgency=low
+
+  * Added Suggests: timidity, freepats
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 27 May 2005 02:19:24 +0200
+
+openttd (0.4.0.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 23 May 2005 13:04:24 +0200
+
+openttd (0.4.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 16 May 2005 00:16:17 +0200
+
+openttd (0.3.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Modifed Makefile to install xpm icon and scenarios in /usr/share/games/openttd/
+  * Added openttd.32.xpm, openttd.64.xpm was too big
+
+ -- root <root@katherina.student.utwente.nl>  Tue, 25 Jan 2005 19:21:08 +0100
+
+openttd (0.3.5-2) unstable; urgency=low
+
+  * Fixed some lintian warnings.
+  * Added openttd.64.xpm (icon for menu).
+
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 27 Dec 2004 01:51:36 +0100
+
+openttd (0.3.5-1) unstable; urgency=low
 
   * Initial Release.
 
- -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Thu, 16 Sep 2004 00:59:38 +0200
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Fri, 24 Dec 2004 02:58:47 +0100
 
diff --git a/os/debian/control b/os/debian/control
index 4a819253d..18e46f38e 100644
--- a/os/debian/control
+++ b/os/debian/control
@@ -8,7 +8,8 @@ Standards-Version: 3.6.0
 Package: openttd
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: An open source clone of the Microprose game "Transport Tycoon Deluxe"
+Suggests: timidity, freepats
+Description: open source clone of the Microprose game "Transport Tycoon Deluxe"
  An enhanced open source clone of the Microprose game "Transport Tycoon Deluxe".
  You require the data files of the original Transport Tycoon Deluxe
  for Windows to play the game. You have to MANUALLY copy them to the
diff --git a/os/debian/docs b/os/debian/docs
index 84e254122..24a607f07 100644
--- a/os/debian/docs
+++ b/os/debian/docs
@@ -2,4 +2,3 @@ changelog.txt
 readme.txt
 docs/Manual.txt
 docs/multiplayer.txt
-known-bugs.txt
diff --git a/os/debian/menu b/os/debian/menu
index a3da87e28..d15a0fd53 100644
--- a/os/debian/menu
+++ b/os/debian/menu
@@ -1,2 +1,2 @@
 ?package(openttd):needs="X11" section="Games/Simulation" title="Openttd"\
-command="/usr/games/openttd" icon="/usr/share/games/openttd/openttd.64.xpm"
+command="/usr/games/openttd" icon="/usr/share/games/openttd/openttd.32.xpm"
diff --git a/os/debian/rules b/os/debian/rules
index c7be3f31a..cc4ea34cc 100644
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -34,7 +34,7 @@ build-stamp: configure-stamp
 
 	# Add here commands to compile the package.
 	
-	rm Makefile.config
+	rm Makefile.config || true
 	$(MAKE) PREFIX=/usr MIDI=/usr/bin/timidity INSTALL=1 BINARY_DIR=games DATA_DIR=share/games/openttd PERSONAL_DIR=.openttd USE_HOMEDIR=1
 
 	#/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1