diff -u armagetronad-0.2.8.2.1/debian/changelog armagetronad-0.2.8.2.1/debian/changelog --- armagetronad-0.2.8.2.1/debian/changelog +++ armagetronad-0.2.8.2.1/debian/changelog @@ -1,3 +1,10 @@ +armagetronad (0.2.8.2.1-10ubuntu1) jaunty; urgency=low + + * add patch 10_add_sound_locks.diff resolves crash in sound handling + (LP: #341491) Will be fixed in upstream release 0.2.8.3. + + -- Brian Murray Fri, 20 Mar 2009 15:05:46 -0700 + armagetronad (0.2.8.2.1-10) unstable; urgency=low * Copy over updated config.sub/config.guess during configure diff -u armagetronad-0.2.8.2.1/debian/control armagetronad-0.2.8.2.1/debian/control --- armagetronad-0.2.8.2.1/debian/control +++ armagetronad-0.2.8.2.1/debian/control @@ -1,7 +1,8 @@ Source: armagetronad Section: games Priority: optional -Maintainer: Christine Spang +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Christine Spang Standards-Version: 3.7.3 Build-Depends: quilt (>= 0.40), debhelper (>= 5), imagemagick, pkg-config, libgl1-mesa-dev, libglu1-mesa-dev, libsdl-image1.2-dev (>= 1.2.2), libsdl1.2-dev (>= 1.2.2), libsdl-mixer1.2-dev, autotools-dev, libpng12-dev, zlib1g-dev, libxml2-dev Homepage: http://armagetronad.sourceforge.net/ diff -u armagetronad-0.2.8.2.1/debian/patches/series armagetronad-0.2.8.2.1/debian/patches/series --- armagetronad-0.2.8.2.1/debian/patches/series +++ armagetronad-0.2.8.2.1/debian/patches/series @@ -2,0 +3 @@ +10_add_sound_locks.diff only in patch2: unchanged: --- armagetronad-0.2.8.2.1.orig/debian/patches/10_add_sound_locks.diff +++ armagetronad-0.2.8.2.1/debian/patches/10_add_sound_locks.diff @@ -0,0 +1,21 @@ +Index: armagetronad-0.2.8.2.1/src/tron/gGame.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tron/gGame.cpp 2009-03-20 15:04:37.000000000 -0700 ++++ armagetronad-0.2.8.2.1/src/tron/gGame.cpp 2009-03-20 15:05:19.000000000 -0700 +@@ -1224,7 +1224,16 @@ + grid->Clear(); + } + ++class gSoundLocker ++{ ++public: ++ gSoundLocker(){ se_SoundLock(); } ++ ~gSoundLocker(){ se_SoundUnlock(); } ++}; ++ + void exit_game_objects(eGrid *grid){ ++ gSoundLocker locker; ++ + sr_con.fullscreen=true; + + su_prefetchInput=false;