r12044 - in packages/tags/blocks-of-the-undead: . 1.0-4/debian 1.0-4/debian/patches
Evgeni Golov
evgeni at alioth.debian.org
Mon Mar 28 12:47:19 UTC 2011
Author: evgeni
Date: 2011-03-28 12:47:11 +0000 (Mon, 28 Mar 2011)
New Revision: 12044
Added:
packages/tags/blocks-of-the-undead/1.0-4/
packages/tags/blocks-of-the-undead/1.0-4/debian/changelog
packages/tags/blocks-of-the-undead/1.0-4/debian/control
packages/tags/blocks-of-the-undead/1.0-4/debian/patches/03_dont_fail_if_no_sound_available.patch
packages/tags/blocks-of-the-undead/1.0-4/debian/patches/series
packages/tags/blocks-of-the-undead/1.0-4/debian/source/
Removed:
packages/tags/blocks-of-the-undead/1.0-4/debian/changelog
packages/tags/blocks-of-the-undead/1.0-4/debian/control
packages/tags/blocks-of-the-undead/1.0-4/debian/patches/series
Log:
[svn-buildpackage] Tagging blocks-of-the-undead 1.0-4
Deleted: packages/tags/blocks-of-the-undead/1.0-4/debian/changelog
===================================================================
--- packages/trunk/blocks-of-the-undead/debian/changelog 2011-03-18 10:42:55 UTC (rev 11970)
+++ packages/tags/blocks-of-the-undead/1.0-4/debian/changelog 2011-03-28 12:47:11 UTC (rev 12044)
@@ -1,52 +0,0 @@
-blocks-of-the-undead (1.0-4) UNRELEASED; urgency=low
-
- * Team upload.
- * Fix Homepage (Closes: #611121)
-
- -- Paul Wise <pabs at debian.org> Fri, 11 Mar 2011 21:14:27 +0800
-
-blocks-of-the-undead (1.0-3) unstable; urgency=low
-
- * debian/patches/02_accept_mousepress_as_anykey.patch:
- + Update the patch to accept a mousepress during the splashscreen too.
- * debian/control:
- + Update my e-mail address.
- + Standards-Version: 3.8.3
- + Add ${misc:Depends} to -data Depends as suggested by lintian.
- * debian/rules:
- + Update config.{sub,guess} to prevent FTBFS on avr32.
- Closes: #550111
- * debian/README.source:
- + Add README.source for quilt.
- * debian/patches/*:
- + Add descriptions to the patches according to DEP3.
-
- -- Evgeni Golov <evgeni at debian.org> Sun, 25 Oct 2009 10:11:31 +0100
-
-blocks-of-the-undead (1.0-2) unstable; urgency=low
-
- [ Evgeni Golov ]
- * debian/control:
- + Set Maintainer to the Debian Games Team.
- + Add quilt to Build-Dep.
- + Build-Depend on debhelper (>= 7.0.13) or it will FTBFS.
- See #487938.
- * debian/rules:
- + Adjust the targets according to debhelpers rules.simple.
- + Force disable building of the AnimView binary, we don't ship it
- anyways and it leads to a FTBFS on PowerPC.
- * debian/patches/01-sleep_a_bit.patch:
- + Add two usleep()-calls so we don't use 100% CPU.
- * debian/patches/02_accept_mousepress_as_anykey.patch:
- + Accept a mousepress as anykey when game over.
-
- [ Ansgar Burchardt ]
- * debian/control: Add Vcs-Browser, Vcs-Svn fields
-
- -- Evgeni Golov <sargentd at die-welt.net> Sat, 25 Oct 2008 21:10:11 +0200
-
-blocks-of-the-undead (1.0-1) unstable; urgency=low
-
- * Initial release (Closes: #496321)
-
- -- Evgeni Golov <sargentd at die-welt.net> Sun, 24 Aug 2008 19:05:55 +0200
Copied: packages/tags/blocks-of-the-undead/1.0-4/debian/changelog (from rev 12043, packages/trunk/blocks-of-the-undead/debian/changelog)
===================================================================
--- packages/tags/blocks-of-the-undead/1.0-4/debian/changelog (rev 0)
+++ packages/tags/blocks-of-the-undead/1.0-4/debian/changelog 2011-03-28 12:47:11 UTC (rev 12044)
@@ -0,0 +1,60 @@
+blocks-of-the-undead (1.0-4) unstable; urgency=low
+
+ [ Paul Wise ]
+ * Fix Homepage (Closes: #611121)
+
+ [ Evgeni Golov ]
+ * Don't fail if there is no sound available.
+ Closes: #603440
+ * debian/source/format:
+ + Set 1.0 for now.
+ * debian/control:
+ + Standards-Version: 3.9.1
+
+ -- Evgeni Golov <evgeni at debian.org> Mon, 28 Mar 2011 14:43:33 +0200
+
+blocks-of-the-undead (1.0-3) unstable; urgency=low
+
+ * debian/patches/02_accept_mousepress_as_anykey.patch:
+ + Update the patch to accept a mousepress during the splashscreen too.
+ * debian/control:
+ + Update my e-mail address.
+ + Standards-Version: 3.8.3
+ + Add ${misc:Depends} to -data Depends as suggested by lintian.
+ * debian/rules:
+ + Update config.{sub,guess} to prevent FTBFS on avr32.
+ Closes: #550111
+ * debian/README.source:
+ + Add README.source for quilt.
+ * debian/patches/*:
+ + Add descriptions to the patches according to DEP3.
+
+ -- Evgeni Golov <evgeni at debian.org> Sun, 25 Oct 2009 10:11:31 +0100
+
+blocks-of-the-undead (1.0-2) unstable; urgency=low
+
+ [ Evgeni Golov ]
+ * debian/control:
+ + Set Maintainer to the Debian Games Team.
+ + Add quilt to Build-Dep.
+ + Build-Depend on debhelper (>= 7.0.13) or it will FTBFS.
+ See #487938.
+ * debian/rules:
+ + Adjust the targets according to debhelpers rules.simple.
+ + Force disable building of the AnimView binary, we don't ship it
+ anyways and it leads to a FTBFS on PowerPC.
+ * debian/patches/01-sleep_a_bit.patch:
+ + Add two usleep()-calls so we don't use 100% CPU.
+ * debian/patches/02_accept_mousepress_as_anykey.patch:
+ + Accept a mousepress as anykey when game over.
+
+ [ Ansgar Burchardt ]
+ * debian/control: Add Vcs-Browser, Vcs-Svn fields
+
+ -- Evgeni Golov <sargentd at die-welt.net> Sat, 25 Oct 2008 21:10:11 +0200
+
+blocks-of-the-undead (1.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #496321)
+
+ -- Evgeni Golov <sargentd at die-welt.net> Sun, 24 Aug 2008 19:05:55 +0200
Deleted: packages/tags/blocks-of-the-undead/1.0-4/debian/control
===================================================================
--- packages/trunk/blocks-of-the-undead/debian/control 2011-03-18 10:42:55 UTC (rev 11970)
+++ packages/tags/blocks-of-the-undead/1.0-4/debian/control 2011-03-28 12:47:11 UTC (rev 12044)
@@ -1,30 +0,0 @@
-Source: blocks-of-the-undead
-Section: games
-Priority: optional
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 7.0.13), autotools-dev, quilt (>= 0.40),
- libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
-Standards-Version: 3.8.3
-Homepage: http://www.gamecreation.org/game/blocksundead
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/blocks-of-the-undead/?op=log
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/blocks-of-the-undead/
-
-Package: blocks-of-the-undead
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, blocks-of-the-undead-data (= ${source:Version})
-Description: Tetris Attack clone with spooky undertones
- Blocks of the Undead is a puzzle game.
- You have to remove all the blocks on the field by swapping these
- around.
-
-Package: blocks-of-the-undead-data
-Depends: ${misc:Depends}, ttf-dejavu-core
-Architecture: all
-Description: Tetris Attack clone with spooky undertones - data files
- Blocks of the Undead is a puzzle game.
- You have to remove all the blocks on the field by swapping these
- around.
- .
- This package provides the needed data (images, sounds, levels) for
- blocks-of-the-undead.
Copied: packages/tags/blocks-of-the-undead/1.0-4/debian/control (from rev 12042, packages/trunk/blocks-of-the-undead/debian/control)
===================================================================
--- packages/tags/blocks-of-the-undead/1.0-4/debian/control (rev 0)
+++ packages/tags/blocks-of-the-undead/1.0-4/debian/control 2011-03-28 12:47:11 UTC (rev 12044)
@@ -0,0 +1,30 @@
+Source: blocks-of-the-undead
+Section: games
+Priority: optional
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Evgeni Golov <evgeni at debian.org>
+Build-Depends: debhelper (>= 7.0.13), autotools-dev, quilt (>= 0.40),
+ libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
+Standards-Version: 3.9.1
+Homepage: http://www.gamecreation.org/game/blocksundead
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/blocks-of-the-undead/?op=log
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/blocks-of-the-undead/
+
+Package: blocks-of-the-undead
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, blocks-of-the-undead-data (= ${source:Version})
+Description: Tetris Attack clone with spooky undertones
+ Blocks of the Undead is a puzzle game.
+ You have to remove all the blocks on the field by swapping these
+ around.
+
+Package: blocks-of-the-undead-data
+Depends: ${misc:Depends}, ttf-dejavu-core
+Architecture: all
+Description: Tetris Attack clone with spooky undertones - data files
+ Blocks of the Undead is a puzzle game.
+ You have to remove all the blocks on the field by swapping these
+ around.
+ .
+ This package provides the needed data (images, sounds, levels) for
+ blocks-of-the-undead.
Copied: packages/tags/blocks-of-the-undead/1.0-4/debian/patches/03_dont_fail_if_no_sound_available.patch (from rev 12040, packages/trunk/blocks-of-the-undead/debian/patches/03_dont_fail_if_no_sound_available.patch)
===================================================================
--- packages/tags/blocks-of-the-undead/1.0-4/debian/patches/03_dont_fail_if_no_sound_available.patch (rev 0)
+++ packages/tags/blocks-of-the-undead/1.0-4/debian/patches/03_dont_fail_if_no_sound_available.patch 2011-03-28 12:47:11 UTC (rev 12044)
@@ -0,0 +1,88 @@
+From: Evgeni Golov <evgeni at debian.org>
+Subject: Don't fail if there is no sound available
+ This can happen when the user does not have enough rights to use the
+ soundcard or there is no soundcard at all in the machine.
+Bug-Debian: http://bugs.debian.org/603440
+
+diff -Nru blocks-of-the-undead-1.0/Oodle/src/CSound.cpp blocks-of-the-undead-1.0.patched/Oodle/src/CSound.cpp
+--- blocks-of-the-undead-1.0/Oodle/src/CSound.cpp 2005-01-16 21:20:00.000000000 +0100
++++ blocks-of-the-undead-1.0.patched/Oodle/src/CSound.cpp 2011-03-28 14:26:25.009659884 +0200
+@@ -6,13 +6,16 @@
+ const char* f2 = file.c_str();
+ data = Mix_LoadWAV( f2 );
+
+- if (!data)
+- _THROWEX(ex_sdl, "Failed to load sound", "CSound", "CSound", "snd = " << snd);
++ if (!data) {
++ LOG("Failed to load sound " << snd << ".", 1, LOG_INFO);
++ LOG("This is normal if \"CSoundSystem\" failed to load above.", 1, LOG_INFO);
++ }
+ }
+
+ CSound::~CSound()
+ {
+- Mix_FreeChunk(data);
++ if (data)
++ Mix_FreeChunk(data);
+ }
+
+ void CSound::setChannel(int c)
+@@ -28,4 +31,4 @@
+ Mix_Chunk* CSound::getChunk() const
+ {
+ return data;
+-}
+\ No newline at end of file
++}
+diff -Nru blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.cpp blocks-of-the-undead-1.0.patched/Oodle/src/CSoundSystem.cpp
+--- blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.cpp 2005-01-16 21:20:00.000000000 +0100
++++ blocks-of-the-undead-1.0.patched/Oodle/src/CSoundSystem.cpp 2011-03-28 14:24:20.705012382 +0200
+@@ -3,24 +3,28 @@
+ CSoundSystem::CSoundSystem(int chunksize, int frequency, int channels, Uint16 format)
+ {
+ SDL_InitSubSystem(SDL_INIT_AUDIO);
++ soundAvailable = true;
+ if (Mix_OpenAudio(frequency, format, channels, chunksize))
+ {
+- _THROWEX(ex_sdl, "Failed to load sound subsystem", "CSoundSystem", "CSoundSystem",
+- "frequency = " << frequency << ", chunksize = " << chunksize << ", " <<
+- "channels = " << channels << ", format = " << format);
++ soundAvailable = false;
++ LOG("Failed to load sound subsystem \"CSoundSystem\".", 1, LOG_ERROR);
++ LOG("You will not have any sound during the game.", 1, LOG_INFO);
+ }
+ }
+
+ void CSoundSystem::playSound(CSound &snd) const
+ {
+- snd.setChannel( Mix_PlayChannel(-1, snd.getChunk(), 0) );
++ if (soundAvailable)
++ snd.setChannel( Mix_PlayChannel(-1, snd.getChunk(), 0) );
+ }
+ void CSoundSystem::stopSound(const CSound &snd) const
+ {
+- Mix_HaltChannel(snd.getChannel());
++ if (soundAvailable)
++ Mix_HaltChannel(snd.getChannel());
+ }
+
+ CSoundSystem::~CSoundSystem()
+ {
+- Mix_CloseAudio();
+-}
+\ No newline at end of file
++ if (soundAvailable)
++ Mix_CloseAudio();
++}
+diff -Nru blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.h blocks-of-the-undead-1.0.patched/Oodle/src/CSoundSystem.h
+--- blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.h 2005-01-17 05:48:19.000000000 +0100
++++ blocks-of-the-undead-1.0.patched/Oodle/src/CSoundSystem.h 2011-03-28 14:01:00.146914826 +0200
+@@ -13,7 +13,7 @@
+ void playSound(CSound &snd) const;
+ void stopSound(const CSound &snd) const;
+ private:
+-
++ bool soundAvailable;
+ };
+
+ #endif
Deleted: packages/tags/blocks-of-the-undead/1.0-4/debian/patches/series
===================================================================
--- packages/trunk/blocks-of-the-undead/debian/patches/series 2011-03-18 10:42:55 UTC (rev 11970)
+++ packages/tags/blocks-of-the-undead/1.0-4/debian/patches/series 2011-03-28 12:47:11 UTC (rev 12044)
@@ -1,2 +0,0 @@
-01-sleep_a_bit.patch
-02_accept_mousepress_as_anykey.patch
Copied: packages/tags/blocks-of-the-undead/1.0-4/debian/patches/series (from rev 12040, packages/trunk/blocks-of-the-undead/debian/patches/series)
===================================================================
--- packages/tags/blocks-of-the-undead/1.0-4/debian/patches/series (rev 0)
+++ packages/tags/blocks-of-the-undead/1.0-4/debian/patches/series 2011-03-28 12:47:11 UTC (rev 12044)
@@ -0,0 +1,3 @@
+01-sleep_a_bit.patch
+02_accept_mousepress_as_anykey.patch
+03_dont_fail_if_no_sound_available.patch
More information about the Pkg-games-commits
mailing list