Your message dated Sun, 28 Jun 2015 21:48:50 +0000
with message-id <[email protected]>
and subject line Bug#788053: fixed in doomsday 1.15.0-1
has caused the Debian Bug report #788053,
regarding doomsday-compat still requires full paths for the -file argument
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
788053: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788053
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: doomsday
Version: 1.14.5-2
Severity: normal
Tags: patch

Hi again,

currently, the doomsday-compat script requires a full path as an
argument to the -file parameter. That is, only paths relative to the
current working directory are considered.

However, any other doom engine also looks for the PWAD file name
passed as an argument to the -file parameter in the directory
specified for searching for IWADs. Since the purpose of the
doomsday-compat script is to emulate the command line parsing
behaviour of any other doom engine, this needs to get hacked in. I
changed the script so that if the file passed over to the -file
parameter is not found relative to the current working directory, it
is searched for in the directory specified by the iwaddir variable.

The patch applies on top of the other patch I submitted in #787985.

Thanks,

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 05bda09..6efd3eb 100755
--- a/debian/doomsday-compat
+++ b/debian/doomsday-compat
@@ -28,7 +28,7 @@ DOOMSDAY="doomsday"
 next_is_iwad=0
 next_is_pwad=0
 
-iwaddir=""
+iwaddir="$(awk '/^iwaddir/{print $2}' /etc/doomsday/paths)"
 gamemode="doom2"
 
 for arg in "$@"
@@ -59,6 +59,10 @@ do
 		next_is_pwad=0
 		pwadpath=$arg
 		pwadfile=$(basename $arg)
+		if [ ! -f $pwadpath -a -f $iwaddir/$pwadpath ]
+		then
+			pwadpath=$iwaddir/$pwadpath
+		fi
 		continue
 	fi
 

--- End Message ---
--- Begin Message ---
Source: doomsday
Source-Version: 1.15.0-1

We believe that the bug you reported is fixed in the latest version of
doomsday, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Michael Gilbert <[email protected]> (supplier of updated doomsday package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 28 Jun 2015 19:51:14 +0000
Source: doomsday
Binary: doomsday doomsday-server doomsday-common doomsday-data
Architecture: source all
Version: 1.15.0-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <[email protected]>
Changed-By: Michael Gilbert <[email protected]>
Description:
 doomsday   - enhanced version of the legendary DOOM game
 doomsday-common - enhanced version of the legendary DOOM game - common files
 doomsday-data - enhanced version of the legendary DOOM game - data files
 doomsday-server - enhanced version of the legendary DOOM game - server
Closes: 787985 788053 788058 789882
Changes:
 doomsday (1.15.0-1) unstable; urgency=medium
 .
   * New upstream release.
   * Update debian/copyright (closes: #789882).
   * Update debian/watch for new tarball naming scheme.
   * Use abort instead of exit for some of the shared library failure modes.
   * More robust doomsday-compat (closes: #787985, #788053, #788058, #789882).
     - Many thanks to Fabian Greffrath.
Checksums-Sha1:
 f358e6fad24c311adaf3c8d94128420ecbe6fd6c 2991 doomsday_1.15.0-1.dsc
 5a90ea35cc31a877dd5e213d0d810f17820f0bb3 11872161 doomsday_1.15.0.orig.tar.gz
 8cd095c672ae74f21f1acda2a74f14c185c2102d 13608 doomsday_1.15.0-1.debian.tar.xz
 a7c07ece138c89ae93f62a0aeb540625cf47f5a5 3529546 doomsday-data_1.15.0-1_all.deb
Checksums-Sha256:
 117664d4525d81a53335481a656e1e03e388c4430056fd94b119358a81c24a39 2991 
doomsday_1.15.0-1.dsc
 41aa933757ae95b62dfcc249522878170229ef038f2319cc3820bbba9ecd8c67 11872161 
doomsday_1.15.0.orig.tar.gz
 c4d5614dfb1459119482fef455ba4224e4966bb513c4aa1bac87523795c292e0 13608 
doomsday_1.15.0-1.debian.tar.xz
 ca2af897a43ba0f3bdf6bcaf8474588c935287103e6390eda18b4af7d17728ca 3529546 
doomsday-data_1.15.0-1_all.deb
Files:
 48a031263c70889c82fff68a91c4cb4e 2991 games optional doomsday_1.15.0-1.dsc
 22415a3fa06cfcd638f1a2afa35cb110 11872161 games optional 
doomsday_1.15.0.orig.tar.gz
 4ec82920d145d356c03e2fd168de7b4a 13608 games optional 
doomsday_1.15.0-1.debian.tar.xz
 f2d92983092ef83c0e92cc637a49125a 3529546 games optional 
doomsday-data_1.15.0-1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQQcBAEBCgAGBQJVkGhiAAoJELjWss0C1vRz5Mgf/3Y9reUapqv4gpZ0dB0c7VAo
FusCiNJGHfD3pUTeJHmU3OyBqejxNMnzkBFgPtFFtW0nrcgckvyk0G9jsCsVjV2p
zQvYAykXJ2iXm20qRXx3Gm7lUj9ZuY9XqkhUxb6sXM7WYNohaZwESltDGDUR2Oap
gWLziSTn1rr4HHpvQftw1PLVLO0MP5EnDiuC5So25Wtek7/dzSHVkN714E7YKld/
VAO/kKjxz93K2dvZ4Chw+1y9grGEyvWrNlk2GIybq8pybi6DjW9/cBgKgmkbG/6f
bfsdaWPFZ7CE0ObkGKyRys0MnebdtwPpoKtckvwHdoNVtmNB5zZFayN0pgtTNCRV
76SrM5TBPlMTaZwrh02Zc1nE9G9ESiwmqEclHDhy71jvaolK2zy9fyETf+kr0wco
3PCYL7g0f4mJgr6jOdNdKnotfJkQMHdvw6iu8rklPnJw2YScadmeiKNgruh6gVdL
k1GOxql8KJkQJKDRTAtScMxrdunvHjZirOxFz+A3U53Bzp/AljRuyWyJwND3KGgM
PIvkoP48kwIHWI98J4J+4SqNPZkaJ0rCtU548lG8p4COk3Op9qgj/utz5N2LJWkh
EMTsQiaEbQAX/Mdmk+fRvRozIK/BYnZtN7wrWvFWoVBEWgwbgMv01xIBrz2Wclq5
U5JQQle8ud6hVLqyxvKqea3jHQjg68N440Lw+hPf4EZhFnpwB+TwTCdEJKLjHtHY
hbCTa24sVbjoaYJWeO6RuBK+3prCBdn82am/8VV4bFm2Tv8C7/cszVq+TallW3zJ
h480M5/ZoKwmZLhZljf0e406P6/2bdJzPqUMVYkJCbgY3hw3fpPyDC2sWLGyHQUs
ds0dm2jD84ZesG/KHLCRvHUOkr3IonI/OGM8UZrSW6oilsSLC13t1jXTCSPx10ZJ
OYs82lkjKnGYXrgurDw0g1E01m40XBzhHoUgBiLSfTIWMKfJ7E7VRDHUcB4u10N/
C0CzrpEMFu5IAdTNXsdGdT60gtxwcq0zXEZ0g78eHIOf3aZHbMOjnFO6R4hjjdAn
hXWSxyWwdkeeTsA4yinpnr1qr8QbZxfJdT7+hUZzwH6nEvPFha9CeSl1tkbPDtJp
5LdZMMy5us7HhD+dr90OhCxsVd9bAELP5cmwBjbUMnnAyR4XefqEXB1cQnnwPhl5
/JXlGQYSbJHS+4bSR3/n41x2FAPUNHDhhqZAUsBVFyj4V/BjWazPtuCHGU1dIkqO
Zhl7kuxFl2Q6OW4Y6dchEpR2u8/74RtLqWbb++z1r5zIzwTD8OPNX5fFnavsLi5J
Xa//TJeh1YHSh801YIhyQZy2WmyuBsjlOsBL0rHGY9VRjPuhG3KixN+2iELNMAY=
=hDED
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to