[SCM] Packaging of kobodeluxe branch, master, updated. debian/0.5.1-2-31-g0e18057

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 58bb944ffb1edac1ec889d4234f917faf722fded
Author: Damyan Ivanov <dmn at debian.org>
Date:   Sat Oct 31 14:46:54 2009 +0200

    add patch by Iain Lane to fix compilation error with GCC-4.4 Closes: #552548; thanks to Ilya Barygin

diff --git a/debian/changelog b/debian/changelog
index 8a370f9..7139449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kobodeluxe (0.5.1-5) UNRELEASED; urgency=low
+
+  * add patch by Iain Lane to fix compilation error with GCC-4.4
+    Closes: #552548; thanks to Ilya Barygin
+
+ -- Damyan Ivanov <dmn at debian.org>  Sat, 31 Oct 2009 14:41:33 +0200
+
 kobodeluxe (0.5.1-4) unstable; urgency=low
 
   * add 04_enemies-pipe-decl.patch renames pipe2 symbol to pipe2_kbdl to
diff --git a/debian/patches/05_const_charp_conversion.patch b/debian/patches/05_const_charp_conversion.patch
new file mode 100644
index 0000000..a14ed4b
--- /dev/null
+++ b/debian/patches/05_const_charp_conversion.patch
@@ -0,0 +1,17 @@
+Description: Avoid compilation error with gcc-4.4.
+ "const char* -> char*" conversion is fatal in that version
+Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/kobodeluxe/+bug/461373
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/kobodeluxe/+bug/461373
+Bug-Debian: http://bugs.debian.org/552548
+Forwarded: http://www.freelists.org/post/olofsonprojects/kobodlpatch-compile-error-in-windowcpp-with-g44
+--- a/graphics/window.cpp
++++ b/graphics/window.cpp
+@@ -398,7 +398,7 @@ void window_t::center_token_fxp(int _x, 
+ 		 */
+ 		if(token)
+ 		{
+-			char *tok = strchr(txt, token);
++			const char *tok = strchr(txt, token);
+ 			if(tok)
+ 				tokpos = tok-txt;
+ 			else
diff --git a/debian/patches/series b/debian/patches/series
index 60c344b..f5649de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01_graphics_window-signed-char.patch
 02_paths.patch
 03_manpage-minus-not-hyphen.patch
+05_const_charp_conversion.patch

-- 
Packaging of kobodeluxe