DISTS/DEBIAN: Update to current files from downstream, less patches

One patch is eliminated by the previous commit; the other patch,
for ARM, is going to get fixed one way or the other by either
landing gh-1052 or actually having the ARM assembly not be broken
any more (or the first one first, and then the second one later
when someone has enough time to do the work and test it).

Fixes Trac#7105.

1 files changed, 47 insertions, 12 deletions

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