(svn r19572) -Change: sync Debian packaging updates from Debian, but keep building a single package

12 files changed, 242 insertions, 149 deletions

diff --git a/os/debian/NEWS b/os/debian/NEWS
new file mode 100644
index 000000000..2a5c81101
--- /dev/null
+++ b/os/debian/NEWS
@@ -0,0 +1,25 @@
+openttd (1.0.0~rc3-2) unstable; urgency=low
+
+    The openttd package has been moved from contrib into main. Since the
+    OpenGFX free graphics set has been packaged for Debian, one can now run
+    OpenTTD without needing any of the resources from the original game
+    (though the original resources are still supported).
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 13:09:35 +0100
+
+openttd (0.7.0-1) unstable; urgency=low
+
+    Handling of AI players has changed in 0.7.0. This package no longer
+    contains any AI players, so playing against the computer is not possible
+    out of the box any longer. However, you can easily download AI players
+    through the new "Content Downloading Service", after which playing with
+    computer players is possible.
+
+    Loading old savegames with computer players is supported (AI players will
+    be converted according to the current AI settings), but at this moment
+    there are no AIs that completely handle any existing infrastructure built
+    by the old AI, so starting a new game might be more fun (especially since
+    most of the new AIs are a lot less erratic).
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 13 Apr 2009 15:11:20 +0200
+
diff --git a/os/debian/README.Debian b/os/debian/README.Debian
index 10eee1f9e..e7b4bdb13 100644
--- a/os/debian/README.Debian
+++ b/os/debian/README.Debian
@@ -2,28 +2,38 @@ OpenTTD for Debian
 ------------------
 
 To properly play this game, you need a base graphics and sound set.
-Currently, the graphics files from the original Transport Tycoon Deluxe
-game (Windows and DOS versions) are supported, as well as the free
-graphics replacement set "OpenGFX".
+Currently, the graphics, sound and music files from the original
+Transport Tycoon Deluxe game (Windows and DOS versions) are supported,
+as well as the free graphics replacement set "OpenGFX", sound
+replacement set "OpenSFX" (which is in non-free due to a restrictive
+license) and the free music replacement set "OpenMSX".
 
-See readme.txt, section 4.1 for instructions on how to install these
-files.
+Normally, installing the openttd package should automatically install
+openttd-opengfx as well, allowing OpenTTD to run out of the box. If you
+want sound, you'll have to enable non-free sources and install the
+openttd-opensfx package manually (or install the original Transport
+Tyccon Deluxe sound files).
 
--Music
-	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).
+The easiest way to install the OpenMSX music files is to use the in-game
+content download system, which should offer the latest version of the
+music files.
 
-	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 alsa
-	software mixing or pulseaudio.
+To find out how to install the original Transport Tycoon Deluxe graphics
+sound files and music files, see readme.txt, section 4.1.
+
+-Playing Music
+	In addition to installing a music set (see above), you'll also need
+	to install the timidity midi player, available in the timidity
+	package.
+
+	Remember that not all audio devices support multiple audiostreams
+	(music and sound), so you might have to use alsa software mixing or
+	pulseaudio.
 
 -Scenarios
 	There are no scenarios included in this release. Scenarios can be
-	downloaded using openttd's content service, which is available from
-	openttd's main menu. If you have obtained a scenario through other
+	downloaded using OpenTTD's content service, which is available from
+	OpenTTD's main menu. If you have obtained a scenario through other
 	means, you can place it either in your ~/.openttd/scenario directory
 	or in the system-wide /usr/share/games/openttd/scenario directory.
 
diff --git a/os/debian/changelog b/os/debian/changelog
index 6d418e5c6..17958873a 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,170 +1,167 @@
-openttd (1.1~svn-1) UNRELEASED; urgency=low
+openttd (1.1~svn-0) UNRELEASED; urgency=low
 
   * Unreleased SVN version. Versioned to allow normal upgrades to released
     versions.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Feb 2010 12:02:03 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 03 Apr 2010 00:00:00 +0000
 
-openttd (1.0.0) unstable; urgency=low
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Apr 2010 00:01:02 +0200
-
-openttd (1.0.0~RC3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 00:01:02 +0100
-
-openttd (1.0.0~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 04 Mar 2010 00:01:02 +0100
-
-openttd (1.0.0~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Feb 2010 00:01:02 +0100
-
-openttd (1.0.0~beta4) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 04 Feb 2010 18:36:02 +0100
-
-openttd (1.0.0~beta3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Jan 2010 00:01:02 +0100
-
-openttd (1.0.0~beta2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 05 Jan 2010 21:36:51 +0100
-
-openttd (1.0.0~beta1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 01:01:01 +0100
-
-openttd (0.7.5) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 23 Dec 2009 20:52:34 +0100
-
-openttd (0.7.5~RC1) unstable; urgency=low
+openttd (1.0.0-1) unstable; urgency=low
 
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 14 Dec 2009 19:28:37 +0100
-
-openttd (0.7.4) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 01 Dec 2009 01:23:45 +0100
-
-openttd (0.7.4~RC1) unstable; urgency=low
-
-  * New upstream release.
+  * [30a2162] New upstream release 1.0.0. (Closes: #570104)
+  * [102698a] Make openttd-wrapper work with older mktemp versions.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Nov 2009 16:30:07 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 02 Apr 2010 23:36:21 +0200
 
-openttd (0.7.3) unstable; urgency=low
+openttd (1.0.0~rc3-2) unstable; urgency=low
 
-  * New upstream release.
+  * [279c5ef] Recommend openttd-opengfx and suggest openttd-opensfx.
+  * [9330ad7] Update README.Debian concerning music files.
+  * [07bde24] Move openttd from contrib to main. (Closes: #560810)
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 12:35:47 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 13:16:32 +0100
 
-openttd (0.7.3~RC2) unstable; urgency=low
+openttd (1.0.0~rc3-1) unstable; urgency=low
 
-  * New upstream release.
+  * [412d153] New upstream release 1.0.0~rc3.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Sep 2009 21:30:43 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 10:09:33 +0100
 
-openttd (0.7.3~RC1) unstable; urgency=low
+openttd (1.0.0~rc2-1) unstable; urgency=low
 
-  * New upstream release.
+  * [9c99af4] New upstream release 1.0.0~rc2.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 13 Sep 2009 10:25:56 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 04 Mar 2010 12:22:28 +0100
 
-openttd (0.7.2) unstable; urgency=low
+openttd (1.0.0~rc1-1) unstable; urgency=low
 
-  * New upstream release.
+  * [fe4eb51] New upstream release 1.0.0~rc1.
+  * [6aa2be0] Note that the embedded md5 implementation has a different
+    license.
+  * [39eb336] Remove lintian override for empty gm directory.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 Aug 2009 00:19:43 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 19 Feb 2010 13:00:53 +0100
 
-openttd (0.7.2~RC2) unstable; urgency=low
+openttd (1.0.0~beta4-1) unstable; urgency=low
 
-  * New upstream release.
+  * [6718224] New upstream release 1.0.0~beta4.
+  * [7b0fa8d] Remove some more docs that we don't want in the package.
+  * [bb9d744] Use liblzo2 instead of an embedded minilzo version.
+  * [949c06b] Explicitly disable iconv support.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 21 Jul 2009 20:25:56 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 19 Feb 2010 12:59:27 +0100
 
-openttd (0.7.2~RC1) unstable; urgency=low
+openttd (0.7.5-4) unstable; urgency=low
 
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 15 Jul 2009 22:25:56 +0200
+  * [174d0b1] Don't use deprecated < in Replaces.
 
-openttd (0.7.1) unstable; urgency=low
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 15 Feb 2010 00:35:33 +0100
 
-  * New upstream release.
+openttd (0.7.5-3) unstable; urgency=low
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 09 Jun 2009 01:34:56 +0200
+  * [d12fc5a] Make openttd-data replace openttd (< 0.7.5-2).
+    (Closes: #569679)
 
-openttd (0.7.1~RC3) unstable; urgency=low
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Feb 2010 16:56:31 +0100
 
-  * New upstream release.
+openttd (0.7.5-2) unstable; urgency=low
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 03 Jun 2009 15:34:56 +0200
+  [ Matthijs Kooijman ]
+  * [fbab21d] Switch to source format 3.0 (quilt).
+  * [85c0c7d] No longer check for (and complain about missing) datafiles
+    on installation and upgrades. (Closes: #524651, 562574)
+  * [827eb61] Split the architecture independent data into openttd-data.
+    (Closes: #492462)
+  * [6fbd9c7] Update README.Debian.
+  * [76a5148] Support cross compilation. (Closes: #550951)
+  * [2005bf8] Simplify the rules file, make debhelper do more stuff.
+  * [fc0500e] Remove some configure arguments.
+  * [8ca38bb] Explicitly enable or disable all of the dependencies.
+  * [e38fb3e] Let the upstream Makefile install documentation.
+  * [5954fcf] Update the watch file to the new upstream url scheme.
+  * [7249594] Fix typo in copyright file.
+  * [660fb61] Bump the Standards-Version to 3.8.4, with no changes
+    required.
+  * [f94ab89] Move the packaging git repository to git.debian.org.
 
-openttd (0.7.1~RC2) unstable; urgency=low
+ -- Jordi Mallach <jordi@debian.org>  Tue, 09 Feb 2010 21:40:24 +0100
 
-  * New upstream release.
+openttd (0.7.5-1) unstable; urgency=high
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Mar 2009 14:34:56 +0200
+  * [cdcb73a] Imported Upstream version 0.7.5. This release fixes
+    CVE-2009-4007.
 
-openttd (0.7.1~RC1) unstable; urgency=low
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 00:55:45 +0100
 
-  * New upstream release.
+openttd (0.7.4-1) unstable; urgency=low
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 11 Mar 2009 17:34:56 +0200
+  * [a2c297b0] Imported Upstream version 0.7.4
+  * [0232a645] Make Debian-specific patches executable.
+  * [76be04b] Switch the Debian packaging to git.
 
-openttd (0.7.0) unstable; urgency=low
-
-  * New upstream release.
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 15 Dec 2009 22:11:52 +0100
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Apr 2009 13:37:42 +0000
+openttd (0.7.3-1) unstable; urgency=low
 
-openttd (0.7.0~RC2) unstable; urgency=low
+  [ Matthijs Kooijman ]
+  * New upstream release
+  * Use printf instead of echo -en in openttd-wrapper to make it POSIX
+    compatible (Closes: #547758).
+  * Remove three patches that are now included in upstream.
 
-  * New upstream release.
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 22:52:59 +0200
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 23 Mar 2009 00:42:00 +0200
+openttd (0.7.2-1) unstable; urgency=low
 
-openttd (0.7.0~RC1) unstable; urgency=low
+  [ Matthijs Kooijman ]
+  * New upstream release
+  * Bump Standards-Version to 3.8.3, with no changes required.
+  * Clean up the rules file a bit and add some lintian overrides.
+  * Explain why openttd is in contrib (Closes: #539381).
+  * Add the DM-Upload-Allowed control field.
+  * Re-add dpatch infrastructure.
+  * Fix the copyright file, since upstream only allows GPLv2, not later
+    versions.
+  * Add a section to the copyright file on the different license used by the
+    "Squirrel" programming language, which is shipped with OpenTTD since
+     0.7.0.
+  * Backport upstream r17226, which removes the deprecated Encoding entry from
+    the .desktop file.
+  * Add a wrapper script for openttd, which captures any stderr output and
+    displays it when openttd returns an error code (Closes: #533557).
+  * Recommend x11-utils, since we use xmessage for displaying errors. Don't
+    depend on it, since openttd will still run fine without it, you just won't
+    see any errors.
+  * Backport upstream r17227 and r17229, which prevents terminal escape codes
+    from ending up in the captured error output.
+  * Backport upstream r17240, which improves stderr output when files are
+    missing or corrupt.
+
+ -- Jordi Mallach <jordi@debian.org>  Fri, 21 Aug 2009 15:27:26 +0200
+
+openttd (0.7.1-1) unstable; urgency=low
 
+  [ Matthijs Kooijman ]
   * New upstream release.
+  * Link against libicu to enable right-to-left language support.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Mar 2009 00:07:00 +0200
+ -- Jordi Mallach <jordi@debian.org>  Tue, 09 Jun 2009 21:46:28 +0200
 
-openttd (0.7.0~beta2) unstable; urgency=low
+openttd (0.7.0-1) unstable; urgency=low
 
+  [ Matthijs Kooijman ]
   * New upstream release.
+  * Remove Debian specific desktop file, upstream provides one now.
+  * Add debian/watch file.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 10 Mar 2009 00:33:05 +0100
-
-openttd (0.7.0~beta1) unstable; urgency=low
-
-  * New upstream release.
+  [ Jordi Mallach ]
+  * Bump Standards-Version to 3.8.1, with no changes required.
+  * Move to debhelper compat 7. Bump Build-Depends accordingly.
+  * Use dh_prep.
+  * Add "set -e" to config script.
+  * Remove a few extra doc files that get installed by upstream Makefile.
+  * Add more complete copyright information.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Feb 2009 23:07:05 +0100
+ -- Jordi Mallach <jordi@debian.org>  Wed, 15 Apr 2009 18:22:10 +0200
 
 openttd (0.6.3-1) unstable; urgency=low
 
@@ -173,7 +170,7 @@ openttd (0.6.3-1) unstable; urgency=low
 
   [ Jordi Mallach ]
   * Add Spanish Debconf template translation, after fixing its corrupted
-    encoding.
+    encoding (thanks, Germana Oliveira, closes: #499214).
 
  -- Jordi Mallach <jordi@debian.org>  Thu, 02 Oct 2008 16:59:03 +0200
 
diff --git a/os/debian/control b/os/debian/control
index 6c5969f7d..5c0801542 100644
--- a/os/debian/control
+++ b/os/debian/control
@@ -1,9 +1,10 @@
 Source: openttd
-Section: contrib/games
+Section: games
 Priority: optional
 Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 Uploaders: Jordi Mallach <jordi@debian.org>
-Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, liblzo2-dev, libicu-dev
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, libicu-dev, liblzo2-dev
 Standards-Version: 3.8.4
 Vcs-Browser: http://git.debian.org/?p=collab-maint/openttd.git
 Vcs-Git: git://git.debian.org/collab-maint/openttd.git
@@ -12,12 +13,15 @@ Homepage: http://www.openttd.org/
 Package: openttd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: openttd-opengfx, x11-utils
 Replaces: openttd-data
 Conflicts: openttd-data
-Suggests: timidity, freepats
+Suggests: openttd-opensfx, timidity, freepats
 Description: reimplementation of Transport Tycoon Deluxe with enhancements
  OpenTTD is a reimplementation of the Microprose game "Transport
- Tycoon Deluxe" with lots of new features and enhancements. The data
- files of the original Transport Tycoon Deluxe for Windows are
- mandatory to play the game. They must be manually copied to the game
- data directory (see README.Debian for details).
+ Tycoon Deluxe" with lots of new features and enhancements.
+ .
+ OpenTTD is playable with the free graphics files from the openttd-opengfx
+ package and optional sound files from the openttd-opensfx package (which is in
+ non-free). Alternatively, OpenTTD can use the graphics files from the original
+ Transport Tycoon Deluxe game (See README.Debian on how to set this up).
diff --git a/os/debian/copyright b/os/debian/copyright
index 5c58d007a..c361d80dd 100644
--- a/os/debian/copyright
+++ b/os/debian/copyright
@@ -1,11 +1,6 @@
 This package was debianized by Matthijs Kooijman <matthijs@stdin.nl>
 on Wed, 15 Sep 2004 00:24:01 +0200.
 
-This package is not part of the main Debian GNU/Linux distribution, but
-uploaded to the contrib section. This is because the openttd program is
-non-functional by itself, it needs (non-free) graphical and sound
-resources from the Transport Tycoon Deluxe game to work.
-
 Upstream author: Ludvig Strigeus (ludde) and many others.
 Upstream homepage: http://www.openttd.org
 
@@ -59,3 +54,24 @@ language, which is shipped under the following license:
 
 		3. This notice may not be removed or
 		altered from any source distribution.
+
+This package contains an implementation of the md5 hash algorithm, which
+is shipped under the following license:
+
+	Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+	This software is provided 'as-is', without any express or implied
+	warranty.  In no event will the authors be held liable for any damages
+	arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any purpose,
+	including commercial applications, and to alter it and redistribute it
+	freely, subject to the following restrictions:
+
+	1. The origin of this software must not be misrepresented; you must not
+	   claim that you wrote the original software. If you use this software
+	   in a product, an acknowledgment in the product documentation would be
+	   appreciated but is not required.
+	2. Altered source versions must be plainly marked as such, and must not be
+	   misrepresented as being the original software.
+	3. This notice may not be removed or altered from any source distribution.
diff --git a/os/debian/gbp.conf b/os/debian/gbp.conf
new file mode 100644
index 000000000..58b68d336
--- /dev/null
+++ b/os/debian/gbp.conf
@@ -0,0 +1,13 @@
+[DEFAULT]
+# Use pristine-tar
+pristine-tar = True
+
+[git-dch]
+# We use metaheaders in commit messages.
+meta = True
+# Put git commit ids in the debian changelog.
+id-length = 7
+
+[git-import-orig]
+# Use a custom commit message for upstream imports.
+import-msg = New upstream release %(version)s.
diff --git a/os/debian/openttd-wrapper b/os/debian/openttd-wrapper
index 3c35f7d36..6f85f00b0 100644
--- a/os/debian/openttd-wrapper
+++ b/os/debian/openttd-wrapper
@@ -2,8 +2,10 @@
 # This is a wrapper script that checks openttd's exit status and
 # displays its stderr output
 
-# Get a file to capture stderr to
-TMPFILE=`mktemp --tmpdir openttd.errout.XXXXXXXXX`
+# Get a file to capture stderr to. Use the deprecated -t option, so this
+# works on the old mktemp from the mktemp package (which has been
+# replaced by the version from the coreutils package).
+TMPFILE=`mktemp -t openttd.errout.XXXXXXXXX`
 
 if [ ! -w "$TMPFILE" ]; then
 	xmessage "Could not create temporary file for error messages. Not starting OpenTTD."
diff --git a/os/debian/patches/run-openttd-wrapper.patch b/os/debian/patches/run-openttd-wrapper.patch
new file mode 100644
index 000000000..1c81c78f4
--- /dev/null
+++ b/os/debian/patches/run-openttd-wrapper.patch
@@ -0,0 +1,19 @@
+From: Matthijs Kooijman <matthijs@stdin.nl>
+Subject: Use a wrapper script for running openttd
+
+The wrapper script captures stderr from openttd and displays this in
+case of an error. This patch makes the the .desktop file call the
+wrapper instead of the openttd binary directly.
+
+Index: media/openttd.desktop.in
+===================================================================
+--- a/media/openttd.desktop.in	(revision 17228)
++++ b/media/openttd.desktop.in	(working copy)
+@@ -6,6 +6,6 @@
+ Name=!!MENU_NAME!!
+ Comment=A clone of Transport Tycoon Deluxe
+ Icon=openttd
+-Exec=!!TTD!!
++Exec=/usr/share/games/openttd/openttd-wrapper
+ Terminal=false
+ Categories=!!MENU_GROUP!!
diff --git a/os/debian/patches/series b/os/debian/patches/series
new file mode 100644
index 000000000..f7cf2d9d5
--- /dev/null
+++ b/os/debian/patches/series
@@ -0,0 +1 @@
+run-openttd-wrapper.patch
diff --git a/os/debian/rules b/os/debian/rules
index a8834ed36..a34d52049 100755
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -17,7 +17,7 @@ endif
 # to be explicit about the dependencies, in case we're not running in a
 # clean build root.
 override_dh_auto_configure:
-	./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-lzo2 --with-sdl --with-png --with-freetype --with-fontconfig --with-icu
+	./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --without-iconv
 
 # Do some extra installation
 override_dh_auto_install:
diff --git a/os/debian/source/format b/os/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/os/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/os/debian/watch b/os/debian/watch
new file mode 100644
index 000000000..776381b9c
--- /dev/null
+++ b/os/debian/watch
@@ -0,0 +1,5 @@
+version=3
+
+options=downloadurlmangle=s/(.*)\/index.html$/\1\/openttd-\1-source.tar.gz/ \
+http://master.binaries.openttd.org/releases/ \
+(\d+(?:\.\d+)*)/index.html