[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8.6-1-1-g00442f1

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit 00442f155b5c824854194935131dbe1762cb80fc
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Fri May 20 11:25:27 2011 +0200

    fix starting location labels in editor

diff --git a/debian/changelog b/debian/changelog
index e4ed3c1..fbdde75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wesnoth-1.8 (1:1.8.6-2) unstable; urgency=low
+
+  * Pull in upstream commit r49530 to fix visibility of starting location in
+    editor. Thanks to Ignacio Riquelme Morelle for mentioning this to me.
+
+ -- 
+
 wesnoth-1.8 (1:1.8.6-1) unstable; urgency=low
 
   * New upstream stable release.
diff --git a/debian/patches/04fix-starting-location-labels b/debian/patches/04fix-starting-location-labels
new file mode 100644
index 0000000..a5ef204
--- /dev/null
+++ b/debian/patches/04fix-starting-location-labels
@@ -0,0 +1,18 @@
+Description: Fix starting location labels being initially invisible in the map editor
+  The problem was that players are always observers when there are no playing
+  teams; so now skip the observer condition in that case.
+Origin: upstream, http://svn.gna.org/viewcvs/wesnoth?view=rev&revision=49530
+Bug: https://gna.org/bugs/?17956
+Author: Ignacio Riquelme Morelle
+
+--- a/src/map_label.cpp
++++ b/src/map_label.cpp
+@@ -478,7 +478,7 @@
+             return false;
+ 	}
+ 
+-	return ((parent_->team_name() == team_name_ && !is_observer())
++	return ((parent_->team_name() == team_name_ && (!is_observer() || !team::nteams()))
+ 			|| (team_name_.empty() && parent_->visible_global_label(loc_)));
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 57b6465..aa02235 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02wesnoth-nolog-desktop-file
 03wesnothd-name
+04fix-starting-location-labels

-- 
Debian packaging of wesnoth