14 files changed, 682 insertions, 69 deletions
diff --git a/dists/debian/changelog b/dists/debian/changelog
index 902aa89c9a..8d27a39da2 100644
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,3 +1,164 @@
+scummvm (1.9.0+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Avoid disabling -Wformat, which causes a build failure with GCC 7.
+    Closes: #871161.
+
+ -- Stephen Kitt <skitt@debian.org>  Thu, 10 Aug 2017 12:05:39 +0200
+
+scummvm (1.9.0+dfsg-1) unstable; urgency=medium
+
+  * New upstream release [October 2016].
+  * Removed obsolete "libsdl2.patch".
+  * Removed traces of -dbg package.
+  * Build reproducibly (Closes: #827145)
+    Thanks, Reiner Herrmann.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Fri, 11 Nov 2016 23:17:07 +1100
+
+scummvm (1.8.1+dfsg-1) unstable; urgency=medium
+
+  * New upstream release [May 2016].
+  * Standards-Version: 3.9.8.
+  * Removed obsolete "format-security.patch".
+  * Build-Depends:
+    + libfreetype6-dev
+    + libpng-dev
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 06 Jun 2016 00:28:50 +1000
+
+scummvm (1.8.0+dfsg-1) unstable; urgency=low
+
+  * New upstream release [March 2016].
+
+  [ Alexandre Detiste ]
+  * Use HTTPS for Vcs URLs.
+  * Standards-Version: 3.9.7.
+  * Watch "http://scummvm.org/downloads/" for releases.
+
+  [ Dmitry Smirnov ]
+  * Corrected icons installation path (Closes: #778687)
+  * Update watch file to v4; use copyright/Files-Exclided;
+    simplified rules/get-orig-source.
+  * watch: check GitHub for releases.
+  * Removed .menu file.
+  * Fixed in new upstream release 1.8.0:
+    + Spelling mistake in Spanish translation of Lure of the Temptress:
+      "obsevar" -> "observar" has been fixed upstream (Closes: #805215).
+  * clean: remove "config.mk".
+  * Removed obsolete "drop1test.patch".
+  * Switch to libsdl2 (Closes: #807710):
+    + New "libsdl2.patch" to find "sdl2-config";
+    + Build-Depends:
+      - libsdl1.2-dev
+      + libsdl2-dev | libsdl1.2-dev
+  * Added "format-security.patch" to fix FTBFS.
+  * Build with full hardening.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 15 Mar 2016 10:07:19 +1100
+
+scummvm (1.7.0+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add disable-arm-asm.patch.
+    Fix a crash and segmentation fault on ARM systems by disabling asm
+    optimizations.
+    Thanks to Konstantinos Margaritis <markos@freevec.org> for the report
+    and patch and Vagrant Cascadian for further testing.
+    (Closes: #779029)
+
+ -- Markus Koschany <apo@gambaru.de>  Sat, 28 Feb 2015 18:50:52 +0100
+
+scummvm (1.7.0+dfsg-1) unstable; urgency=low
+
+  * New upstream release [July 2014].
+    - remove old/obsolete patches.
+    + added new "drop1test.patch" to disable problematic test.
+    + build with "--disable-eventrecorder" to avoid FTBFS in tests.
+    + added "libjpeg-dev" and "libfaad-dev" to Build-Depends.
+  * Install all arch-independent files (themes, game data, etc.).
+  * Build-time re-compression of "classic" theme.
+  * Added "debian/gbp.conf".
+  * Standards-Version to 3.9.5.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 10 Aug 2014 00:50:36 +1000
+
+scummvm (1.6.0+dfsg-3) unstable; urgency=medium
+
+  * Touch "config.mk" before dh_auto_clean to fix FTBFS (Closes: #718164).
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 30 Jul 2013 17:05:40 +1000
+
+scummvm (1.6.0+dfsg-2) unstable; urgency=low
+
+  * New patches to produce working executables on kFreeBSD and Hurd:
+    + [hurd+kfreebsd] to build on Hurd & kFreeBSD (Closes: #711320);
+      thanks to Petr Salinger.
+    + [posix] to fix FTBFS in timidity on GNU Hurd.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Fri, 07 Jun 2013 18:40:21 +1000
+
+scummvm (1.6.0+dfsg-1) unstable; urgency=low
+
+  * New upstream release [May 2013].
+  * Added "libtheora-dev" to Build-Depends.
+  * get-orig-source: minor repacking improvement to produce identical
+    archives.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 02 Jun 2013 19:09:54 +1000
+
+scummvm (1.5.0+dfsg-1) unstable; urgency=low
+
+  [ Dmitry Smirnov ]
+  * New upstream release [July 2012].
+  * xz compression for .deb files and debian source.
+  * debhelper to version 9.
+  * Standards to 3.9.4.
+  * Built-Using field for scummvm-data to document bundled fonts.
+  * Build-Depends:
+    + alphabetising and sorting.
+    + added "fonts-freefont-ttf" and "zip" to facilitate substitution
+      of font files and theme re-compression.
+    + introduced "autotools_dev".
+  * Added Vcs links.
+  * Tightened relationships with "scummvm-data (= ${source:Version})".
+  * lintianisation: removed tabs from package description.
+  * Added commented scummvm-dbg package.
+  * debian/rules:
+    + optimisation.
+    + enabled parallel build.
+    + increased log verbosity with "--enable-verbose-build".
+    + install upstream changelog.
+    + gracefully handle stripping if -dbg package is
+      (un-)commented in debian/control.
+    + re-compress scummmodern.zip and replace bundled fonts from
+      fonts-freefont-ttf.
+    + added "get-orig-source" target for DFSG-repackaging and removing
+      non-free fonts.
+    + fixed FTBFS on GNU Hurd.
+  * debian/copyright:
+    + to copyright-format-1.0.
+    + audit of upstream copyrights/licenses.
+  * Dropped obsolete patch "debian-changes-1.0.0-1".
+  * Dropped empty directories.
+  * Moved .desktop file to the main package, added breaks/replaces
+  * Added README.source with notes regarding DFSG concerns.
+  * Added debian/watch.
+  * Added myself to Uploaders.
+
+  [ Markus Koschany ]
+  * Update package description. Suggest new ScummVM games Drascula and
+    Lure of the Temptress.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 05 May 2013 20:46:54 +1000
+
+scummvm (1.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Install translations.dat into scummvm-data	
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sat, 14 Jan 2012 11:39:15 +0100
+
 scummvm (1.4.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/dists/debian/clean b/dists/debian/clean
new file mode 100644
index 0000000000..add6683a6d
--- /dev/null
+++ b/dists/debian/clean
@@ -0,0 +1,3 @@
+gui/themes/scummclassic.zip
+gui/themes/scummmodern.zip
+config.mk
diff --git a/dists/debian/compat b/dists/debian/compat
index 7f8f011eb7..ec635144f6 100644
--- a/dists/debian/compat
+++ b/dists/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/dists/debian/control b/dists/debian/control
index f101ce3ef8..a1ffa15e82 100644
--- a/dists/debian/control
+++ b/dists/debian/control
@@ -2,15 +2,45 @@ Source: scummvm
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
-Uploaders: David Weinehall <tao@debian.org>, Moritz Muehlenhoff <jmm@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), nasm [i386], libsdl2-dev, libmad0-dev, libasound2-dev [linux-any], libvorbis-dev, libmpeg2-4-dev, libflac-dev, libz-dev, libfluidsynth-dev, python
-Standards-Version: 3.9.2
+Uploaders: David Weinehall <tao@debian.org>
+          ,Moritz Muehlenhoff <jmm@debian.org>
+          ,Dmitry Smirnov <onlyjob@debian.org>
+Build-Depends: debhelper (>= 9), autotools-dev
+              ,fonts-freefont-ttf
+              ,libasound2-dev [linux-any]
+              ,libfaad-dev
+              ,libflac-dev
+              ,libfluidsynth-dev
+              ,libfreetype6-dev
+              ,libjpeg-dev
+              ,libmad0-dev
+              ,libmpeg2-4-dev
+              ,libpng-dev
+              ,libsdl2-dev | libsdl1.2-dev
+              ,libtheora-dev
+              ,libvorbis-dev
+              ,libz-dev
+              ,nasm [i386]
+              ,python
+              ,zip
+# Cloud integration:
+#    ,libsdl2-net-dev
+#    ,libcurl4-gnutls-dev
+Standards-Version: 3.9.8
 Homepage: http://www.scummvm.org
+Vcs-Git: https://anonscm.debian.org/git/pkg-games/scummvm.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/scummvm.git
 
 Package: scummvm
 Architecture: any
-Depends: ${shlibs:Depends}, scummvm-data, ${misc:Depends}
-Suggests: fluidsynth | timidity, beneath-a-steel-sky, flight-of-the-amazon-queen
+Depends: ${misc:Depends}, ${shlibs:Depends}, scummvm-data (= ${source:Version})
+Suggests: fluidsynth | timidity
+         ,beneath-a-steel-sky
+         ,drascula
+         ,flight-of-the-amazon-queen
+         ,lure-of-the-temptress
+Replaces: scummvm-data (<< 1.5.0-1)
+Breaks: scummvm-data (<< 1.5.0-1)
 Description: engine for several graphical adventure games
  ScummVM is a `virtual machine' for several classic graphical
  point-and-click adventure games.  It is designed to run Adventure Soft's
@@ -21,11 +51,13 @@ Description: engine for several graphical adventure games
  list at <http://www.scummvm.org/compatibility.php> for a full list
  of supported games.
  .
- The game data of two games compatible with ScummVM is included in Debian.
+ The game data of four games compatible with ScummVM is included in Debian.
  These are:
  .
-  - Beneath a Steel Sky        (package name: beneath-a-steel-sky)
-  - Flight of the Amazon Queen (package name: flight-of-the-amazon-queen)
+  - Beneath a Steel Sky                 (package: beneath-a-steel-sky)
+  - Drascula: The Vampire Strikes Back  (package: drascula)
+  - Flight of the Amazon Queen          (package: flight-of-the-amazon-queen)
+  - Lure of the Temptress               (package: lure-of-the-temptress)
  .
  To actually make use of ScummVM, you'll have to install one of these, or
  obtain the proprietary game data for another supported game from somewhere
@@ -33,7 +65,8 @@ Description: engine for several graphical adventure games
 
 Package: scummvm-data
 Architecture: all
-Depends: ${shlibs:Depends},${misc:Depends}
+Built-Using: ${my:Built-Using}
+Depends: ${misc:Depends}
 Replaces: scummvm (<< 1.0.0-3)
 Description: engine for several graphical adventure games (data files)
  ScummVM is a `virtual machine' for several classic graphical
@@ -45,11 +78,13 @@ Description: engine for several graphical adventure games (data files)
  list at <http://www.scummvm.org/compatibility.php> for a full list
  of supported games.
  .
- The game data of two games compatible with ScummVM is included in Debian.
+ The game data of four games compatible with ScummVM is included in Debian.
  These are:
  .
-  - Beneath a Steel Sky        (package name: beneath-a-steel-sky)
-  - Flight of the Amazon Queen (package name: flight-of-the-amazon-queen)
+  - Beneath a Steel Sky                 (package: beneath-a-steel-sky)
+  - Drascula: The Vampire Strikes Back  (package: drascula)
+  - Flight of the Amazon Queen          (package: flight-of-the-amazon-queen)
+  - Lure of the Temptress               (package: lure-of-the-temptress)
  .
  To actually make use of ScummVM, you'll have to install one of these, or
  obtain the proprietary game data for another supported game from somewhere
diff --git a/dists/debian/copyright b/dists/debian/copyright
index 0123b2886c..bd2068aa1a 100644
--- a/dists/debian/copyright
+++ b/dists/debian/copyright
@@ -1,41 +1,373 @@
-ScummVM was debianized by Bastien Nocera <hadess@hadess.net> the 5th Apr 2002.
-It was adopted by Tore Anderson <tore@linpro.no> the 4th Oct 2002,
-then adopted by David Weinehall <tao@debian.org> the 30th Jan 2006,
-then adopted by the Debian Games Team by Moritz Muehlenhoff <jmm@debian.org>
-
-It was downloaded from <http://www.scummvm.org/>.
-
-Upstream Authors: see `/usr/share/doc/scummvm/AUTHORS'.
-
-ScummVM is Copyright © 2002-2017 The ScummVM Team
-
- 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; either version 2, or (at your option) any
- later version.
-
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
-
-This copyright also applies to the Debian-related build scripts.
-
-Some parts of ScummVM (the mt32 softsynth code) is covered by a more
-permissive BSD-style license:
-
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ScummVM
+Source: http://www.scummvm.org/
+Comment:
+ ScummVM was debianized by Bastien Nocera <hadess@hadess.net> the 5th Apr 2002.
+ It was adopted by Tore Anderson <tore@linpro.no> the 4th Oct 2002,
+ then adopted by David Weinehall <tao@debian.org> the 30th Jan 2006,
+ then adopted by the Debian Games Team by Moritz Muehlenhoff <jmm@debian.org>
+Files-Excluded:
+    gui/themes/fonts/topaz
+    gui/themes/fonts/Arial*
+    */*/*/*/*.o*
+    */*/*/*.dll
+
+Files: *
+Copyright:
+    2001-2016 The ScummVM Project
+              The ScummVM Team
+    2002-2011 The DOSBox Team
+    1994-1998 Revolution Software Ltd.
+    2001-2004 Andrea Mazzoleni
+    2003-2005 Andreas 'Sprawl' Karlsso
+    2002-2008 Jurgen 'SumthinWicked' Braam
+    2003-2014 Lars 'AnotherGuest' Persso
+    2013-2014 Fedor Strizhniou
+    1990-2012 Neil Dodwell
+    1995-1997 Presto Studios, Inc.
+              and others listed in COPYRIGHT file
+License: GPL-2+
+Comment:
+ See list of copyright holders in "/usr/share/doc/scummvm/COPYRIGHT".
+ See list of upstream authors in "/usr/share/doc/scummvm/AUTHORS".
+
+Files: audio/softsynth/mt32/*
+Copyright: 2003-2006,2008-2009,2011-2014 Dean Beeler
+           2003-2006,2008-2009,2011-2014 Jerome Fisher
+           2011-2014                     Sergey V. Mikayev
+License: LGPL-2.1+
+
+Files: backends/platform/ds/arm9/source/fat/*
+Copyright: Michael Chisholm <chishm@hotmail.com>
+License: MC-custom
+ This software is completely free. No warranty is provided.
+ If you use it, please give me credit and email me about your
+ project at chishm@hotmail.com
+
+Files: backends/platform/ds/arm9/source/fat/io_m3_common.*
+       backends/platform/ds/arm9/source/fat/io_njsd.*
+       backends/platform/ds/arm9/source/fat/io_sd_*
+Copyright: 2006 Michael "Chishm" Chisholm
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation and/or
+     other materials provided with the distribution.
+  3. The name of the author may not be used to endorse or promote products derived
+     from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: backends/platform/ds/arm9/source/interrupt.s
+       backends/platform/ds/arm9/source/keys.cpp
+Copyright: 2005 Dave Murphy (WinterMute)
+License: BSD-3-clause~dm
+ 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.
+
+Files:
+    engines/pegasus/interaction.cpp
+Copyright:
+    2001-2016 The ScummVM Team
+    1995-1997 Presto Studios, Inc.
+License: GPL-2+
+
+Files: engines/sword25/util/lua_*
+Copyright:
+    2001-2016 The ScummVM Team
+    2004 Ben Sunshine-Hill
+License: GPL-2+
+Comment:
+ This code is heavily based on the Pluto code base.
+ Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
+ domain. People making use of this software as part of an application
+ are politely requested to email the author at sneftel@gmail.com
+ with a brief description of the application, primarily to satisfy his
+ curiosity.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Files: engines/sword25/util/lua/*
+Copyright: 1994-2008 Lua.org, PUC-Rio.
+License: Expat
+
+Files: engines/wintermute/utils/convert_utf.*
+Copyright: 2001-2004 Unicode, Inc.
+License: unicode
+ This source code is provided as is by Unicode, Inc. No claims are
+ made as to fitness for any particular purpose. No warranties of any
+ kind are expressed or implied. The recipient agrees to determine
+ applicability of information provided. If this file has been
+ purchased on magnetic or optical media from Unicode, Inc., the
+ sole remedy for any claim will be exchange of defective media
+ within 90 days of receipt.
+ .
+ Limitations on Rights to Redistribute This Code
+ .
+ Unicode, Inc. hereby grants the right to freely use the information
+ supplied in this file in the creation of products supporting the
+ Unicode Standard, and to make copies of this file in any form
+ for internal or external distribution as long as this notice
+ remains attached.
+
+Files: engines/wintermute/utils/crc.*
+Copyright: 2000 Michael Barr
+License: public-domain-crc
+ This software is placed into
+ the public domain and may be used for any purpose. However, this
+ notice must not be changed or removed and no warranty is either
+ expressed or implied by its publication or distribution.
+
+Files:
+    engines/wage/combat.cpp
+    engines/wage/design.cpp
+    engines/wage/design.h
+    engines/wage/dialog.cpp
+    engines/wage/dialog.h
+    engines/wage/entities.cpp
+    engines/wage/entities.h
+    engines/wage/gui-console.cpp
+    engines/wage/gui.cpp
+    engines/wage/gui.h
+    engines/wage/randomhat.cpp
+    engines/wage/randomhat.h
+    engines/wage/saveload.cpp
+    engines/wage/script.cpp
+    engines/wage/script.h
+    engines/wage/sound.cpp
+    engines/wage/sound.h
+    engines/wage/util.cpp
+    engines/wage/wage.cpp
+    engines/wage/wage.h
+    engines/wage/world.cpp
+    engines/wage/world.h
+Copyright:
+    2001-2016 The ScummVM Project
+    2009      Alexei Svitkine, Eugene Sandulenko
+License: GPL-2+ and Expat
+
+Files:
+    graphics/nine_patch.cpp
+    graphics/nine_patch.h
+Copyright:
+    2001-2016 The ScummVM Project
+    2011      Matthew Leverton
+License: GPL-2+ and Expat
+
+Files: gui/themes/fonts/Free*.ttf
+       gui/themes/scummmodern/Free*.ttf
+Copyright: 2002-2009 Free Software Foundation.
+License: GPL-3+
+ 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; either version 3, or (at your option)
+ any later version.
+ .
+ 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.
+ .
+ The complete text of the GNU General Public License can be found
+ in "/usr/share/common-licenses/GPL-3".
+
+Files: gui/themes/fonts/clR6x12*.bdf
+Copyright: 1989 Dale Schumacher <dal@syntel.mn.org>
+License: MIT-like
+ Permission to use, copy, modify, and distribute this software and
+ its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notice appear in all
+ copies and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Dale Schumacher not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior
+ permission.  Dale Schumacher makes no representations about the
+ suitability of this software for any purpose.  It is provided "as
+ is" without express or implied warranty.
+
+Files: gui/themes/fonts/fixed5x8*.bdf
+Copyright: not-applicable
+License: public-domain
+ Public domain font.  Share and enjoy.
+
+Files: gui/themes/fonts/helv*.bdf
+Copyright: 1984-1989,1994 Adobe Systems Incorporated.
+           1988,1994      Digital Equipment Corporation.
+License: MIT-Adobe-DEC
+ Adobe is a trademark of Adobe Systems Incorporated which may be
+ registered in certain jurisdictions.
+ Permission to use these trademarks is hereby granted only in
+ association with the images described in this file.
+ .
+ Permission to use, copy, modify, distribute and sell this software
+ and its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notices appear in all
+ copies and that both those copyright notices and this permission
+ notice appear in supporting documentation, and that the names of
+ Adobe Systems and Digital Equipment Corporation not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  Adobe Systems and
+ Digital Equipment Corporation make no representations about the
+ suitability of this software for any purpose.  It is provided "as
+ is" without express or implied warranty.
+
+Files: graphics/yuv_to_rgb.cpp
+Copyright: 2001-2012 The ScummVM Project
+License: GPL-2+
+Comment: portions copyright as below
+ The YUV to RGB conversion code is derived from SDL's YUV overlay code, which
+ in turn appears to be derived from mpeg_play. The following copyright
+ notices have been included in accordance with the original license. Please
+ note that the term "software" in this context only applies to the
+ buildLookup() and plotYUV*() functions below.
+ .
+ Copyright (c) 1995 The Regents of the University of California.
+ All rights reserved.
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without written agreement is
+ hereby granted, provided that the above copyright notice and the following
+ two paragraphs appear in all copies of this software.
+ .
+ IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ .
+ Copyright (c) 1995 Erik Corry
+ All rights reserved.
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without written agreement is
+ hereby granted, provided that the above copyright notice and the following
+ two paragraphs appear in all copies of this software.
+ .
+ IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+ THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+ BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ .
+ Portions of this software Copyright (c) 1995 Brown University.
+ All rights reserved.
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without written agreement
+ is hereby granted, provided that the above copyright notice and the
+ following two paragraphs appear in all copies of this software.
+ .
+ IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
+ UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+ BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+Files: test/cxxtest/*
+Copyright: 2008 Sandia Corporation
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2002            Bastien Nocera <hadess@hadess.net>
+           2003,2006-2008  David Weinehall <tao@debian.org>
+           2012-2016       Dmitry Smirnov <onlyjob@debian.org>
+           2009-2012       Moritz Muehlenhoff <jmm@debian.org>
+           2002-2005       Tore Anderson <tore@linpro.no>
+License: GPL-2+
+
+License: GPL-2+
+ 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, 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,
+ 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.
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Library General Public License
+ can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+Comment:
+ This license also known as "MIT/X11 (BSD like)" or "MIT" however FSF
+ consider "MIT" labelling ambiguous and copyright-format specification
+ recommend to label such license as "Expat".
diff --git a/dists/debian/gbp.conf b/dists/debian/gbp.conf
new file mode 100644
index 0000000000..964373b02a
--- /dev/null
+++ b/dists/debian/gbp.conf
@@ -0,0 +1,11 @@
+[buildpackage]
+force-create = True
+overlay = True
+export-dir = ../build-area/
+
+[dch]
+id-length    = 0
+
+[import-orig]
+pristine-tar = False
+merge        = False
diff --git a/dists/debian/rules b/dists/debian/rules
index bf91ca37aa..4b91a47e3e 100755
--- a/dists/debian/rules
+++ b/dists/debian/rules
@@ -1,14 +1,69 @@
 #!/usr/bin/make -f
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+# #827145:
+# When building for i386 on an amd64 system/kernel, the host
+# architecture is misdetected as x86_64, which causes USE_NASM to be
+# unset and prevents the object files hq2x_i386.o and hq3x_i386.o from
+# being built.
+# This is fixed by passing the host architecture explicitely to
+# configure.
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
 %:
-	dh $@
+	dh $@ --parallel --max-parallel=4 --with autotools_dev
 
-override_dh_auto_configure:
+ifeq ($(DEB_BUILD_ARCH_OS),hurd)
+OPTARGS:= --disable-alsa
+endif
 ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
-	./configure --prefix=/usr --datadir=/usr/share/scummvm --enable-release --disable-alsa
-else
-	./configure --prefix=/usr --datadir=/usr/share/scummvm --enable-release
+OPTARGS:= --disable-alsa
 endif
 
+override_dh_auto_clean:
+	##718164 "FTBFS: Makefile:87: *** You need to run ./configure before you can run make".
+	[ -f config.mk ] || touch config.mk
+	dh_auto_clean
+
+override_dh_auto_configure:
+	./configure \
+            --host=$(DEB_HOST_GNU_TYPE) \
+            --datadir=/usr/share/scummvm \
+            --disable-eventrecorder \
+            --enable-release \
+            --enable-verbose-build \
+            --prefix=/usr $(OPTARGS)
+
+FPATH=gui/themes/scummmodern
+override_dh_auto_build:
+	## replacing bundled fonts...
+	for F in $(FPATH)/Free*.ttf; do cp -v /usr/share/fonts/truetype/freefont/$$(basename $${F}) $(FPATH)/ ;done
+	## re-compressing "modern" theme...
+	cd $(FPATH) && zip -9 -X ../scummmodern.zip -r .
+	## re-compressing "classic" theme...
+	cd gui/themes/scummclassic && zip -9 -X ../scummclassic.zip -r .
+	## build executable(s)...
+	dh_auto_build
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Vmy:Built-Using="$(foreach pkg,fonts-freefont-ttf,$(word 2,$(shell dpkg --status $(pkg) | grep Source)) (=$(word 2,$(shell dpkg --status $(pkg) | grep Version))),)"
 
+# get-orig-source
+PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
+PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')
+DTYPE := +dfsg
+.PHONY: get-orig-source
+get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz
+	@
 
+$(PKG)_$(VER)$(DTYPE).orig.tar.xz:
+	@echo "# Downloading..."
+	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
diff --git a/dists/debian/scummvm-data.install b/dists/debian/scummvm-data.install
index c77aefbc0a..613913e8a8 100644
--- a/dists/debian/scummvm-data.install
+++ b/dists/debian/scummvm-data.install
@@ -1,5 +1,3 @@
-icons/scummvm.xpm usr/share/icons
-icons/scummvm.svg usr/share/icons
-dists/scummvm.desktop usr/share/applications
-gui/themes/scummmodern.zip usr/share/scummvm
-dists/pred.dic usr/share/scummvm
+usr/share/scummvm/*
+usr/share/pixmaps/*.xpm
+icons/scummvm.svg        /usr/share/icons/hicolor/scalable/apps/
diff --git a/dists/debian/scummvm.dirs b/dists/debian/scummvm.dirs
index 6b05c7ace8..465f3a3d81 100644
--- a/dists/debian/scummvm.dirs
+++ b/dists/debian/scummvm.dirs
@@ -1,5 +1,2 @@
 usr/games
 usr/share/man/man6
-usr/share/icons
-usr/share/scummvm
-usr/share/applications
diff --git a/dists/debian/scummvm.docs b/dists/debian/scummvm.docs
index c73c810363..f34db31d52 100644
--- a/dists/debian/scummvm.docs
+++ b/dists/debian/scummvm.docs
@@ -2,4 +2,3 @@ AUTHORS
 COPYRIGHT
 README
 TODO
-NEWS
diff --git a/dists/debian/scummvm.install b/dists/debian/scummvm.install
index 457a89cfaa..838c30419f 100644
--- a/dists/debian/scummvm.install
+++ b/dists/debian/scummvm.install
@@ -1,2 +1,2 @@
 scummvm usr/games
-
+dists/scummvm.desktop usr/share/applications
diff --git a/dists/debian/source/format b/dists/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/dists/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/dists/debian/source/options b/dists/debian/source/options
new file mode 100644
index 0000000000..628961cb39
--- /dev/null
+++ b/dists/debian/source/options
@@ -0,0 +1,4 @@
+compression = "xz"
+
+# ignore changes on replaced (unbundled) fonts
+extend-diff-ignore = "(^|/)gui/themes/scummmodern/[^/]+\.ttf$"
diff --git a/dists/debian/watch b/dists/debian/watch
new file mode 100644
index 0000000000..13b3749cef
--- /dev/null
+++ b/dists/debian/watch
@@ -0,0 +1,17 @@
+# uscan(1) configuration file.
+version=4
+
+opts="\
+pgpmode=none,\
+repacksuffix=+dfsg,\
+repack,compression=xz,\
+dversionmangle=s/\+dfsg\d*//,\
+"  http://scummvm.org/downloads/ .*/scummvm-([0-9.]+)\.tar\.(?:xz|bz2|gz)
+
+opts="\
+pgpmode=none,\
+repacksuffix=+dfsg,\
+repack,compression=xz,\
+dversionmangle=s/\+dfsg\d*//,\
+" https://github.com/scummvm/scummvm/releases \
+ .*/archive/v?\.?(\d[\d\.]+)\.tar\.gz