[SCM] advanced 3D real time strategy game engine branch, experimental, updated. debian/83.0+dfsg1-1.exp0-6-g517113f

[Jan Dittberner]

The following commit has been merged in the experimental branch:
commit 0dc0a46ea080ce9d27750466de0af7f672a43b22
Author: Jan Dittberner <jandd at debian.org>
Date:   Tue Nov 22 20:43:46 2011 +0100

    remove debian/patches/0006-fix-spelling-error.patch (applied upstream)

diff --git a/debian/changelog b/debian/changelog
index 1591ecf..a79ee60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ spring (84.0+dfsg1-1~exp0) experimental; urgency=low
 
   * New upstream version.
   * change debian/watch to use sf.net redirector
+  * remove debian/patches/0006-fix-spelling-error.patch (applied
+    upstream)
 
  -- Jan Dittberner <jan at dittberner.info>  Tue, 22 Nov 2011 20:18:29 +0100
 
diff --git a/debian/patches/0006-fix-spelling-error.patch b/debian/patches/0006-fix-spelling-error.patch
deleted file mode 100644
index 83e806d..0000000
--- a/debian/patches/0006-fix-spelling-error.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: Jan Dittberner <jandd at debian.org>
-Subject: fix spelling error (environment instead of enviroment)
-
---- a/rts/Lua/LuaLobby.cpp
-+++ b/rts/Lua/LuaLobby.cpp
-@@ -42,7 +42,7 @@
- LuaLobby::LuaLobby(lua_State* L) : L_Sim(luaUI->L_Sim), L_Draw(luaUI->L_Draw)
- {
- 	if (L != L_Sim && L != L_Draw) {
--		luaL_error(L, "Tried to create a LuaLobby object in a non-LuaUI enviroment!");
-+		luaL_error(L, "Tried to create a LuaLobby object in a non-LuaUI environment!");
- 	}
- }
- 
---- a/doc/manpages/spring-headless.6.txt
-+++ b/doc/manpages/spring-headless.6.txt
-@@ -35,7 +35,7 @@
- This is the engine version without graphics or sound output.
- It still runs the full simulation, while spring-dedicated basically
- only redirects network traffic.
--It is usefull for testing and simulating AI only games at high speeds
-+It is useful for testing and simulating AI only games at high speeds
- on systems without graphics and sound output support.
- For more details, please reffer to:
- 
---- a/tools/ArchiveMover/ArchiveMover.cpp
-+++ b/tools/ArchiveMover/ArchiveMover.cpp
-@@ -454,7 +454,7 @@
- 
- 		if (!quiet) {
- 			message<<_("The ")<<(content == R_MAP? _("map '") : _("game '"))<<source_file.leaf()
--			<<_("' has been saved succesfully to '")<<target_dir.branch_path()<<_("'.")<<endl
-+			<<_("' has been saved successfully to '")<<target_dir.branch_path()<<_("'.")<<endl
- 			<<_("Use the reload games/maps button in the lobby to make Spring find it.")<<endl;
- 		}
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4f71fce..b874995 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0002-use-Debian-java-libs.patch
 0003-fix-cmake-2_8-java-build.patch
 0005-fix-sdl-build.patch
-0006-fix-spelling-error.patch

-- 
advanced 3D real time strategy game engine