Package: doomsday
Version: 1.14.5-2
Severity: normal
Tags: patch

Hi there,

in its current form, the doosday-compat script does not set a gamemode
by default. This means, if started without an additional "-iwad" or
"-game" argument (but even with an additional "-file" argument) the
game falls back into its Ring-0 mode instead of starting an actual
game. In contrast, every other doom engine falls back to starting Doom
2 when no other argument is given. Since the very purpose of the
doomsday-compat script is to emulate the command line behaviour of
"every other doom engine", I had to modify it accordingly.

That is, I have set the gamemode variable from an empty string to
"doom2". Since this will not set the iwadpath variable, I had to add
some more logic to the final part of the script.

Please note that this will also significantly facilitate creating
packages for PWADs with game-data-packager, since this calls "doom
-file /path/to/pwad" in the desktop files.

Thank you,

Fabian


-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'experimental'), (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages doomsday depends on:
ii  libc6                     2.19-18
ii  libfluidsynth1            1.1.6-2
ii  libgcc1                   1:5.1.1-7
ii  libgl1-mesa-glx [libgl1]  10.5.5-1
ii  libqt4-network            4:4.8.6+git155-g716fbae+dfsg-2
ii  libqt4-opengl             4:4.8.6+git155-g716fbae+dfsg-2
ii  libqtcore4                4:4.8.6+git155-g716fbae+dfsg-2
ii  libqtgui4                 4:4.8.6+git155-g716fbae+dfsg-2
ii  libsdl-mixer1.2           1.2.12-11+b1
ii  libsdl1.2debian           1.2.15-11
ii  libstdc++6                5.1.1-7
ii  libx11-6                  2:1.6.3-1
ii  libxrandr2                2:1.4.2-1+b1
ii  libxxf86vm1               1:1.1.4-1
ii  zlib1g                    1:1.2.8.dfsg-2+b1

Versions of packages doomsday recommends:
ii  doom-wad-shareware [doom-wad]  1.9.fixed-2
pn  fluid-soundfont-gm             <none>
ii  freedm [doom-wad]              0.9-1
ii  freedoom [boom-wad]            0.9-1
ii  game-data-packager             41

doomsday suggests no packages.

-- no debconf information
diff --git a/debian/doomsday-compat b/debian/doomsday-compat
index a0fb1f4..05bda09 100755
--- a/debian/doomsday-compat
+++ b/debian/doomsday-compat
@@ -6,7 +6,7 @@
 # - Doomsday expects the -iwad parameter to give a directory containing
 #   IWAD files and loads one depending on the additional -game parameter.
 
-# Copyright © 2013 Fabian Greffrath <fabian+deb...@greffrath.com>
+# Copyright © 2013-2015 Fabian Greffrath <fab...@debian.org>
 # 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; either version 2 of the License, or
@@ -29,7 +29,7 @@ next_is_iwad=0
 next_is_pwad=0
 
 iwaddir=""
-gamemode=""
+gamemode="doom2"
 
 for arg in "$@"
 do
@@ -142,6 +142,9 @@ fi
 if [ -n "$iwaddir" -a -n "$gamemode" ]
 then
 	eval $DOOMSDAY -iwad $iwaddir -game $gamemode $cmdline
+elif [ -n "$gamemode" ]
+then
+	eval $DOOMSDAY -game $gamemode $cmdline
 else
 	eval $DOOMSDAY "$@"
 fi

Reply via email to