[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8-2-95-g1f0bd23

Gerfried Fuchs rhonda at deb.at
Sun May 2 22:16:44 UTC 2010


The following commit has been merged in the master branch:
commit 1f0bd23f76cf702cfbb6605405562a79d4c287f0
Author: Gerfried Fuchs <rhonda at deb.at>
Date:   Mon May 3 00:08:00 2010 +0200

    Obsolete removed patches

diff --git a/debian/changelog b/debian/changelog
index 6ab47a1..7e2f8af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 wesnoth-1.8 (1:1.8.1-1) unstable; urgency=low
 
   * New upstream stable release.
+  * Obsolete removed patches: missing-wml-child-error, lobby-crash
   * Fix icon names in desktop files (LP: #566115)
   * Add branch version to menu file.
   * Actually add stop links for all runlevels (LP: #109434)
diff --git a/debian/patches/03missing-wml-child-error b/debian/patches/03missing-wml-child-error
deleted file mode 100644
index 4dca925..0000000
--- a/debian/patches/03missing-wml-child-error
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 4a691c8..0000000
--- a/debian/patches/04lobby-crash
+++ /dev/null
@@ -1,22 +0,0 @@
-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 1082514..a913946 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 02wesnoth-nolog-desktop-file
-03missing-wml-child-error
-04lobby-crash

-- 
Debian packaging of wesnoth



More information about the Pkg-games-commits mailing list