[SCM] Debian packaging of wesnoth branch, experimental, updated. 77d21a849cee88678f0cd782e74d4e38c121160f

[Gerfried Fuchs]

The following commit has been merged in the experimental branch:
commit 77d21a849cee88678f0cd782e74d4e38c121160f
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Wed Apr 14 19:08:15 2010 +0200

    Two patches pulled from upstream

diff --git a/debian/changelog b/debian/changelog
index 22451cc..5369a7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ wesnoth-1.8 (1:1.8-2) experimental; urgency=low
 
   * Support for DEB_BUILD_OPTIONS="parallel=X" added, thanks to prodding by
     Marc Brockschmidt.
+  * Pulled two upstream bugfixes:
+    - 03missing-wml-child-error: one-line fix, upstream bug #15865
+    - 04lobby-crash: fix refreshing with filtered out games, upstream bug #15716
 
  -- 
 
diff --git a/debian/patches/03missing-wml-child-error b/debian/patches/03missing-wml-child-error
new file mode 100644
index 0000000..4dca925
--- /dev/null
+++ b/debian/patches/03missing-wml-child-error
@@ -0,0 +1,20 @@
+Author: Yurii Chernyi <crab>	vim:ft=diff:
+Description: fix for Missing WML Child error
+ an one-liner to fix bug #15865, Missing WML Child error. Wesnoth
+ sometimes tried to add the random seed from SRNG to chat messages
+Origin: upstream, http://svn.gna.org/viewcvs/wesnoth/?rev=42123&view=rev
+Bug: https://gna.org/bugs/?15865
+
+Index: wesnoth-1.8-1.8/src/replay.cpp
+===================================================================
+--- wesnoth-1.8-1.8.orig/src/replay.cpp
++++ wesnoth-1.8-1.8/src/replay.cpp
+@@ -271,7 +271,7 @@ void replay::add_attack(const map_locati
+ void replay::add_seed(const char* child_name, rand_rng::seed_t seed)
+ {
+ 	LOG_REPLAY << "Setting seed for child type " << child_name << ": " << seed << "\n";
+-	current_->child(child_name)["seed"] = lexical_cast<std::string>(seed);
++	random()->child(child_name)["seed"] = lexical_cast<std::string>(seed);
+ }
+ 
+ void replay::add_pos(const std::string& type,
diff --git a/debian/patches/04lobby-crash b/debian/patches/04lobby-crash
new file mode 100644
index 0000000..4a691c8
--- /dev/null
+++ b/debian/patches/04lobby-crash
@@ -0,0 +1,22 @@
+Author: Mark de Wever <mordante>	vim:ft=diff:
+Description: Fixed a MP lobby crash
+ The crash occurs when refreshing with filtered out games (bug #15716).
+ Backport of r41998.
+Origin: upstream, http://svn.gna.org/viewcvs/wesnoth/?rev=42002&view=rev
+Bug: https://gna.org/bugs/?15716
+
+Index: wesnoth-1.8-1.8/src/gui/widgets/listbox.cpp
+===================================================================
+--- wesnoth-1.8-1.8.orig/src/gui/widgets/listbox.cpp
++++ wesnoth-1.8-1.8/src/gui/widgets/listbox.cpp
+@@ -76,7 +76,9 @@ void tlistbox::remove_row(const unsigned
+ 
+ 	unsigned height_reduced = 0;
+ 	for(; count; --count) {
+-		height_reduced += generator_->item(row).get_height();
++		if(generator_->item(row).get_visible() != INVISIBLE) {
++			height_reduced += generator_->item(row).get_height();
++		}
+ 		generator_->delete_item(row);
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a913946..1082514 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 02wesnoth-nolog-desktop-file
+03missing-wml-child-error
+04lobby-crash

-- 
Debian packaging of wesnoth