(svn r291) Minor fix to english.txt

added debian support (blathijs)
improved make install (blathijs)

10 files changed, 264 insertions, 0 deletions

diff --git a/os/debian/README.Debian b/os/debian/README.Debian
new file mode 100644
index 000000000..489c82deb
--- /dev/null
+++ b/os/debian/README.Debian
@@ -0,0 +1,19 @@
+openttd for Debian
+------------------
+
+To properly play this game, original data files are needed.
+You should copy the data files from the original TTD into the data directory
+(/usr/share/games/openttd/data). You should copy all .grf files there.
+
+-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
+	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.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>, Wed, 15 Sep 2004 00:24:01 +0200
diff --git a/os/debian/changelog b/os/debian/changelog
new file mode 100644
index 000000000..9161cf5ad
--- /dev/null
+++ b/os/debian/changelog
@@ -0,0 +1,6 @@
+openttd (0.3.4.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Thu, 16 Sep 2004 00:59:38 +0200
+
diff --git a/os/debian/compat b/os/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/os/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/os/debian/control b/os/debian/control
new file mode 100644
index 000000000..4a819253d
--- /dev/null
+++ b/os/debian/control
@@ -0,0 +1,15 @@
+Source: openttd
+Section: games
+Priority: optional
+Maintainer: Matthijs Kooijman <m.kooijman@student.utwente.nl>
+Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev
+Standards-Version: 3.6.0
+
+Package: openttd
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: An 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
+ game data directory! (see README.Debian for details)
diff --git a/os/debian/copyright b/os/debian/copyright
new file mode 100644
index 000000000..322d1ce27
--- /dev/null
+++ b/os/debian/copyright
@@ -0,0 +1,25 @@
+This package was debianized by Matthijs Kooijman <m.kooijman@student.utwente.nl> on
+Wed, 15 Sep 2004 00:24:01 +0200.
+
+It was downloaded from http://sourceforge.net/projects/openttd
+
+Upstream Author(s): Ludvig Strigeus (ludde) and many others
+
+Copyright:
+
+   This package 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; version 2 dated June, 1991.
+
+   This package 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 package; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/os/debian/docs b/os/debian/docs
new file mode 100644
index 000000000..24a607f07
--- /dev/null
+++ b/os/debian/docs
@@ -0,0 +1,4 @@
+changelog.txt
+readme.txt
+docs/Manual.txt
+docs/multiplayer.txt
diff --git a/os/debian/menu b/os/debian/menu
new file mode 100644
index 000000000..7419bf164
--- /dev/null
+++ b/os/debian/menu
@@ -0,0 +1,2 @@
+?package(openttd):needs=X11 section=Games/Simulation title="Openttd"\
+command="/usr/games/openttd" icon="/usr/share/games/openttd/openttd.64.png"
diff --git a/os/debian/postinst b/os/debian/postinst
new file mode 100644
index 000000000..f3b229a19
--- /dev/null
+++ b/os/debian/postinst
@@ -0,0 +1,45 @@
+#! /bin/sh
+# postinst script for openttd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+    configure)
+	cat <<EOF
+Before running the game, you should copy the data files from the
+original TTD. See README.Debian for more details.
+EOF
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/os/debian/postrm b/os/debian/postrm
new file mode 100644
index 000000000..7a597deef
--- /dev/null
+++ b/os/debian/postrm
@@ -0,0 +1,45 @@
+#! /bin/sh
+# postrm script for openttd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+       purge|remove)
+	cat  <<EOF
+	Don't forget to remove any existing data files from
+	/usr/share/games/openttd!	
+EOF
+       	;;
+       
+       upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/os/debian/rules b/os/debian/rules
new file mode 100644
index 000000000..8c67770b7
--- /dev/null
+++ b/os/debian/rules
@@ -0,0 +1,102 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+#not supported by openttd makefile
+#CFLAGS = -Wall -g
+#
+#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+#	CFLAGS += -O0
+#else
+#	CFLAGS += -O2
+#endif
+#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+#	INSTALL_PROGRAM += -s
+#endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+
+	# Add here commands to compile the package.
+	
+	# we specifiy MANUAL_CONFIG here, so our settings take precedence over
+	# the ones in the existing Makefile.config (actually, the existing
+	# Makefile.config is not used at all, though it is overwritten)
+	rm Makefile.config
+	$(MAKE) PREFIX=/usr MIDI=/usr/bin/timidity INSTALL=1 
+
+	#/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/openttd.
+	$(MAKE) DEST_DIR=debian/openttd install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs changelog.txt
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman docs/openttd.6
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure