Hi, I'm attaching the diff for my NMU.
Regards, Ansgar -- PGP: 1024D/595FAD19 739E 2D09 0969 BEA9 9797 B055 DDB0 2FF7 595F AD19
reverted: --- viruskiller-1.0-1.dfsg.1/src/CAudio.cpp +++ viruskiller-1.0-1.dfsg.1.orig/src/CAudio.cpp @@ -72,7 +72,7 @@ } #if USEPAK + engine->unpack(filename, PAK_SOUND); - if (engine->unpack(filename, PAK_SOUND)) sound[i] = Mix_LoadWAV_RW(engine->sdlrw, 1); #else sound[i] = Mix_LoadWAV(filename); diff -u viruskiller-1.0-1.dfsg.1/debian/viruskiller.pod viruskiller-1.0-1.dfsg.1/debian/viruskiller.pod --- viruskiller-1.0-1.dfsg.1/debian/viruskiller.pod +++ viruskiller-1.0-1.dfsg.1/debian/viruskiller.pod @@ -36,7 +36,7 @@ Display help information -=item C<--safemode> +=item C<-safemode> Build file information from safe directory (/tmp) diff -u viruskiller-1.0-1.dfsg.1/debian/changelog viruskiller-1.0-1.dfsg.1/debian/changelog --- viruskiller-1.0-1.dfsg.1/debian/changelog +++ viruskiller-1.0-1.dfsg.1/debian/changelog @@ -1,3 +1,14 @@ +viruskiller (1.0-1.dfsg.1-0.2) unstable; urgency=medium + + * Non-maintainer upload. + * Urgency set to medium for RC bug + * Do not crash if there are no sound files in viruskiller.pak + (Closes: #500415) + * Fix call of `make clean', remove some left-over files + * Fix typo in man page (the option is `-safemode', not `--safemode') + + -- Ansgar Burchardt <[EMAIL PROTECTED]> Wed, 01 Oct 2008 18:38:08 +0200 + viruskiller (1.0-1.dfsg.1-0.1) unstable; urgency=medium * Non-maintainer upload. diff -u viruskiller-1.0-1.dfsg.1/debian/rules viruskiller-1.0-1.dfsg.1/debian/rules --- viruskiller-1.0-1.dfsg.1/debian/rules +++ viruskiller-1.0-1.dfsg.1/debian/rules @@ -22,7 +22,8 @@ dh_testdir dh_testroot rm -f build-stamp debian/viruskiller.1 - [ ! -f Makefile ] || $(MAKE) clean + rm -f pak pak.o viruskiller viruskiller.pak + [ ! -f makefile ] || $(MAKE) clean dh_clean install: build diff -u viruskiller-1.0-1.dfsg.1/debian/patches/00list viruskiller-1.0-1.dfsg.1/debian/patches/00list --- viruskiller-1.0-1.dfsg.1/debian/patches/00list +++ viruskiller-1.0-1.dfsg.1/debian/patches/00list @@ -1,0 +2 @@ +30_dont_crash_if_no_sound_files only in patch2: unchanged: --- viruskiller-1.0-1.dfsg.1.orig/debian/patches/30_dont_crash_if_no_sound_files.dpatch +++ viruskiller-1.0-1.dfsg.1/debian/patches/30_dont_crash_if_no_sound_files.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_dont_crash_if_no_sound_files.dpatch by Ansgar Burchardt <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not crash if there are no sound files in viruskiller.pak + [EMAIL PROTECTED]@ + +diff --git a/src/CAudio.cpp b/src/CAudio.cpp +index 6adc59b..4d38015 100644 +--- a/src/CAudio.cpp ++++ b/src/CAudio.cpp +@@ -72,7 +72,7 @@ bool Audio::loadSound(int i, char *filename) + } + + #if USEPAK +- engine->unpack(filename, PAK_SOUND); ++ if (engine->unpack(filename, PAK_SOUND)) + sound[i] = Mix_LoadWAV_RW(engine->sdlrw, 1); + #else + sound[i] = Mix_LoadWAV(filename); +@@ -111,7 +111,7 @@ bool Audio::loadMusic(char *filename) + } + + #if USEPAK +- engine->unpack(filename, PAK_MUSIC); ++ if (engine->unpack(filename, PAK_MUSIC)) + music = Mix_LoadMUS(tempPath); + #else + music = Mix_LoadMUS(filename);
signature.asc
Description: Digital signature
