[SCM] Wormux PKG branch, master, updated. 8eeddd9b8ebd59d6b32784f1404c30745edfd220
Eddy Petrișor
eddy.petrisor at gmail.com
Tue Aug 26 08:42:41 UTC 2008
The following commit has been merged in the master branch:
commit fc92e141c335a522f7e28649bbd8423523df6d3b
Author: Eddy Petrișor <eddy.petrisor at gmail.com>
Date: Sun Aug 24 12:30:02 2008 +0300
added some patches from upstream trunk
* added simplepatchsys for patch management
- re-ran a debian/rules update_control
* imported some patches from upstream that fix important or RC bugs:
- fix for a crash in the chat code when clearing the text
(some whitespace changes were pruned)
- fix a segfault when the sound device wasn't available
- do not load the index server needlessly with unaccessible games
diff --git a/debian/changelog b/debian/changelog
index 5978fe1..48524f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,10 +13,16 @@ wormux (1:0.8-2) UNRELEASED; urgency=low
* moved to git for maintainance and changed Vcs-* fields accordingly
* imported the refresh-patches mechanism from tokyocabinet's package;
thanks MadCoder
+ * added simplepatchsys for patch management
* Updated copyright information:
- Added more of the upstream authors
+ - cleared up debian/* license, thanks to all co-maintainers
+ * imported some patches from upstream that fix important or RC bugs:
+ - fix for a crash in the chat code when clearing the text
+ - fix a segfault when the sound device wasn't available
+ - do not load the index server needlessly with unaccessible games
- -- Eddy Petrișor <eddy.petrisor at gmail.com> Sat, 23 Aug 2008 12:48:38 +0300
+ -- Eddy Petrișor <eddy.petrisor at gmail.com> Sun, 24 Aug 2008 12:04:02 +0300
wormux (1:0.8-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5ff2cb8..b07364e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Jean Parpaillon (artefact) <artefact at altern.org>, Eddy Petrișor <eddy.petrisor at gmail.com>, Cyril Brulebois <kibi at debian.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Gerfried Fuchs <rhonda at debian.at>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, gnulib (>= 0.0.20041014-2), debhelper (>= 5), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl-gfx1.2-dev (>= 2.0.13), libxml++2.6-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev (>= 1.13.19)
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, gnulib (>= 0.0.20041014-2), debhelper (>= 5), patchutils (>= 0.2.25), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl-gfx1.2-dev (>= 2.0.13), libxml++2.6-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.3
Homepage: http://wormux.org/
Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
diff --git a/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch b/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch
new file mode 100644
index 0000000..12c7a65
--- /dev/null
+++ b/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch
@@ -0,0 +1,27 @@
+From c0448e6fb84e5549e19dcbd69159c99119c0f7ee Mon Sep 17 00:00:00 2001
+From: gentildemon <gentildemon at 30ef787d-52ff-0310-b286-e08351bb7647>
+Date: Thu, 29 May 2008 20:27:49 +0000
+Subject: [PATCH] [bug #11741] Chat: s and backspace pressed quickly crash the game
+
+The cursor position was not reseted when clearing the text
+
+git-svn-id: svn+ssh://svn.gna.org/svn/wormux/trunk@4544 30ef787d-52ff-0310-b286-e08351bb7647
+---
+ src/network/chat.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/network/chat.cpp b/src/network/chat.cpp
+index 1edee07..e65c3ac 100644
+--- a/src/network/chat.cpp
++++ b/src/network/chat.cpp
+@@ -123,6 +123,7 @@ void Chat::HandleKey(const SDL_Event& event)
+ if (txt != "" )
+ Network::GetInstance()->SendChatMessage(txt); //Send 'txt' to other players
+ input->Set("");
++ cursor_pos = 0;
+ break;
+
+ default:
+--
+1.5.6.3
+
diff --git a/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch b/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch
new file mode 100644
index 0000000..50a40b6
--- /dev/null
+++ b/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch
@@ -0,0 +1,63 @@
+From 600d0ef3a326733acba8197c9868b5e4681a72bd Mon Sep 17 00:00:00 2001
+From: gentildemon <gentildemon at 30ef787d-52ff-0310-b286-e08351bb7647>
+Date: Thu, 29 May 2008 21:00:36 +0000
+Subject: [PATCH] [bug #11754] Fix segfault if sound device is not available
+
+git-svn-id: svn+ssh://svn.gna.org/svn/wormux/trunk@4546 30ef787d-52ff-0310-b286-e08351bb7647
+---
+ src/sound/jukebox.cpp | 12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/sound/jukebox.cpp b/src/sound/jukebox.cpp
+index 0f63ced..d76b171 100644
+--- a/src/sound/jukebox.cpp
++++ b/src/sound/jukebox.cpp
+@@ -154,6 +154,9 @@ void JukeBox::ActiveMusic (bool on)
+
+ void JukeBox::LoadMusicXML()
+ {
++ if (!m_init) // the sound device has not be initialized (was busy?)
++ return;
++
+ // is xml_file already loaded ?
+ std::set<std::string>::iterator it_profile = m_profiles_loaded.find("music") ;
+ if (it_profile != m_profiles_loaded.end())
+@@ -327,6 +330,9 @@ bool JukeBox::PlayMusicSample(const std::vector<std::string>::const_iterator& fi
+
+ void JukeBox::LoadXML(const std::string& profile)
+ {
++ if (!m_init) // the sound device has not be initialized (was busy?)
++ return;
++
+ // is xml_file already loaded ?
+ std::set<std::string>::iterator it_profile = m_profiles_loaded.find(profile);
+ if (it_profile != m_profiles_loaded.end())
+@@ -390,7 +396,7 @@ void JukeBox::LoadXML(const std::string& profile)
+ int JukeBox::Play (const std::string& category, const std::string& sample,
+ const int loop)
+ {
+- if (!UseEffects()) return -1;
++ if (!UseEffects() || !m_init) return -1;
+
+ uint nb_sons= m_soundsamples.count(category+"/"+sample);
+ if (nb_sons)
+@@ -429,13 +435,15 @@ int JukeBox::Play (const std::string& category, const std::string& sample,
+
+ int JukeBox::Stop (int channel) const
+ {
+- if(!m_config.music && !m_config.effects) return 0;
++ if (!m_init) return 0;
++ if (!m_config.music && !m_config.effects) return 0;
+ if (channel == -1) return 0;
+ return Mix_HaltChannel(channel);
+ }
+
+ int JukeBox::StopAll() const
+ {
++ if (!m_init) return 0;
+ if (!m_config.music && !m_config.effects) return 0;
+
+ // halt playback on all channels
+--
+1.5.6.3
+
diff --git a/debian/patches/0003--BUGFIX-Disconnect-server-from-index-server-as-soon.patch b/debian/patches/0003--BUGFIX-Disconnect-server-from-index-server-as-soon.patch
new file mode 100644
index 0000000..144d53c
--- /dev/null
+++ b/debian/patches/0003--BUGFIX-Disconnect-server-from-index-server-as-soon.patch
@@ -0,0 +1,28 @@
+From 49b0e19c7ce4cb9693b01b4ced172981756deced Mon Sep 17 00:00:00 2001
+From: gentildemon <gentildemon at 30ef787d-52ff-0310-b286-e08351bb7647>
+Date: Fri, 11 Jul 2008 09:18:32 +0000
+Subject: [PATCH] [BUGFIX] Disconnect server from index server as soon as we start the game (players can't join a running game)
+
+git-svn-id: svn+ssh://svn.gna.org/svn/wormux/trunk@4704 30ef787d-52ff-0310-b286-e08351bb7647
+---
+ src/menu/network_menu.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/menu/network_menu.cpp b/src/menu/network_menu.cpp
+index d95da61..0a43807 100644
+--- a/src/menu/network_menu.cpp
++++ b/src/menu/network_menu.cpp
+@@ -266,6 +266,10 @@ bool NetworkMenu::signal_ok()
+ // Starting the game :-)
+ SaveOptions();
+ play_ok_sound();
++
++ if (Network::GetInstance()->IsServer())
++ IndexServer::GetInstance()->Disconnect();
++
+ Game::GetInstance()->Start();
+ Network::GetInstance()->network_menu = NULL;
+ }
+--
+1.5.6.3
+
--
Wormux PKG
More information about the Pkg-games-commits
mailing list