(svn r3801) * Update debian packaging files to the ones used for releasing 0.4.5 (see os/debian/changelog for details).

 * Fix a small debconf issue which was in the 0.4.5 release.

10 files changed, 74 insertions, 45 deletions

diff --git a/os/debian/README.Debian b/os/debian/README.Debian
index f26d1b920..f7225a22a 100644
--- a/os/debian/README.Debian
+++ b/os/debian/README.Debian
@@ -3,12 +3,18 @@ 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.
+(/usr/share/games/openttd/data). You should copy these files:
+* trg1r.grf
+* trgcr.grf
+* trghr.grf
+* trgir.grf
+* trgtr.grf
+* sample.cat
 
 -Music
-	For in game music (optional), you should copy all files in the data/gm
-	folder of your ttd installation to /usr/share/games/openttd/gm.  You
-	should also install timdity and a soundfont (freepats is packaged in
+	For in game music (optional), you should copy all files in the gm/
+	subdir of your ttd installation to /usr/share/games/openttd/gm.  You
+	should also install timidity 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
diff --git a/os/debian/changelog b/os/debian/changelog
index 1d2474ed9..03bc324a4 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,8 +1,46 @@
+openttd (0.4.5+custom) unstable; urgency=low
+
+  * Custom user build.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu,  9 Mar 2006 00:04:33 +0100
+
+openttd (0.4.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump Standards-Version to 3.6.2
+  * s/timdity/timidity/ in README.Debian.
+  * Use debconf for prompting instead of terminal.
+  * Fix makefile to create icon dir if necessary.
+  * Fix syntax error in manpage.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed,  1 Feb 2006 01:56:39 +0100
+
+openttd (0.4.0.1-5) unstable; urgency=low
+
+  * Fixed capitalization of menu item.
+  * Install xpm icon to /usr/share/pixmaps and don't install png icon, since
+    it is not used.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 22 Sep 2005 10:35:09 +0200
+
+openttd (0.4.0.1-4) unstable; urgency=low
+
+  * Changelog was distributed twice.
+  * Put openttd in contrib.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 19 Sep 2005 23:49:18 +0200
+
+openttd (0.4.0.1-3) unstable; urgency=low
+
+  * Clarified installing instructions in README.Debian
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 16 Jun 2005 03:51:13 +0200
+
 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
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 16 Jun 2005 03:34:03 +0200
 
 openttd (0.4.0.1-1) unstable; urgency=low
 
diff --git a/os/debian/control b/os/debian/control
index 18e46f38e..f68d2b5f3 100644
--- a/os/debian/control
+++ b/os/debian/control
@@ -1,16 +1,19 @@
 Source: openttd
-Section: games
+Section: contrib/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
+Standards-Version: 3.6.2
 
 Package: openttd
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, debconf
 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".
+Description: reimplementation of Transport Tycoon Deluxe with enhancements
+ A reimplementation of the Microprose game "Transport Tycoon Deluxe" with lots
+ of new features and enhancements.
  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)
+ .
+ Homepage: http://www.openttd.org/
diff --git a/os/debian/copyright b/os/debian/copyright
index a79113378..077b0f586 100644
--- a/os/debian/copyright
+++ b/os/debian/copyright
@@ -5,21 +5,21 @@ It was downloaded from http://sourceforge.net/projects/openttd
 
 Upstream Author: Ludvig Strigeus (ludde) and many others
 
-Copyright:
+License:
 
-   This package is free software; you can redistribute it and/or modify
+   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; version 2 dated June, 1991.
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-   This package is distributed in the hope that it will be useful,
+   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 package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+	 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 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
index 24a607f07..53fb4057b 100644
--- a/os/debian/docs
+++ b/os/debian/docs
@@ -1,4 +1,3 @@
-changelog.txt
 readme.txt
 docs/Manual.txt
 docs/multiplayer.txt
diff --git a/os/debian/menu b/os/debian/menu
index d15a0fd53..3afa6e08e 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.32.xpm"
+?package(openttd):needs="X11" section="Games/Simulation" title="OpenTTD"\
+command="/usr/games/openttd" icon="/usr/share/pixmaps/openttd.32.xpm"
diff --git a/os/debian/patches/00list b/os/debian/patches/00list
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/os/debian/patches/00list
diff --git a/os/debian/postinst b/os/debian/postinst
index f3b229a19..58eb04ac0 100644
--- a/os/debian/postinst
+++ b/os/debian/postinst
@@ -5,6 +5,7 @@
 
 set -e
 
+
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
 #        * <old-postinst> `abort-upgrade' <new version>
@@ -17,12 +18,10 @@ set -e
 # the debian-policy package
 #
 
+. /usr/share/debconf/confmodule
+
 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)
diff --git a/os/debian/postrm b/os/debian/postrm
index 7a597deef..08e86a760 100644
--- a/os/debian/postrm
+++ b/os/debian/postrm
@@ -20,10 +20,6 @@ set -e
 
 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)
diff --git a/os/debian/rules b/os/debian/rules
index cc4ea34cc..06902342f 100755
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -6,20 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
 
-#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: patch configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
@@ -28,20 +17,19 @@ configure-stamp:
 
 
 build: build-stamp
-
-build-stamp: configure-stamp 
+build-stamp: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
 	
 	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
+	$(MAKE) PREFIX=/usr MIDI=/usr/bin/timidity INSTALL=1 BINARY_DIR=games DATA_DIR=share/games/openttd ICON_DIR=share/pixmaps PERSONAL_DIR=.openttd USE_HOMEDIR=1
 
 	#/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -74,7 +62,7 @@ binary-arch: build install
 	dh_installexamples
 #	dh_install
 	dh_installmenu
-#	dh_installdebconf	
+	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam