[SCM] Wormux PKG branch, master, updated. e7c2f471c89fe2aef15378d860de0e36d688c7cc

Eddy Petrișor eddy.petrisor at gmail.com
Tue Nov 4 01:47:31 UTC 2008


The following commit has been merged in the master branch:
commit e7c2f471c89fe2aef15378d860de0e36d688c7cc
Author: Eddy Petrișor <eddy.petrisor at gmail.com>
Date:   Tue Nov 4 03:35:26 2008 +0200

    dropped all patches since they originated upstream trunk

diff --git a/debian/changelog b/debian/changelog
index 35048c5..c1ca0c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ wormux (1:0.8.2-1) unstable; urgency=low
   * New Upstream Version
   * replaced the heavy libxml++2.6-dev build-dep with the libxml2-dev,
     since only the later is necessary starting with 0.8
+  * dropped all patches since they originated upstream trunk
 
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Tue, 04 Nov 2008 03:07:45 +0200
+ -- Eddy Petrișor <eddy.petrisor at gmail.com>  Tue, 04 Nov 2008 03:35:05 +0200
 
 wormux (1:0.8-2) unstable; urgency=low
 
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
deleted file mode 100644
index 12c7a65..0000000
--- a/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 50a40b6..0000000
--- a/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index 144d53c..0000000
--- a/debian/patches/0003--BUGFIX-Disconnect-server-from-index-server-as-soon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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