r12236 - in packages/trunk/kiki-the-nano-bot/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2011-05-08 18:40:52 +0000 (Sun, 08 May 2011)
New Revision: 12236

Added:
   packages/trunk/kiki-the-nano-bot/debian/patches/SWIG-KikiText.patch
Modified:
   packages/trunk/kiki-the-nano-bot/debian/changelog
   packages/trunk/kiki-the-nano-bot/debian/patches/series
Log:
kiki-the-nanobot: fix ftbfs #625047


Modified: packages/trunk/kiki-the-nano-bot/debian/changelog
===================================================================
--- packages/trunk/kiki-the-nano-bot/debian/changelog	2011-05-07 23:44:25 UTC (rev 12235)
+++ packages/trunk/kiki-the-nano-bot/debian/changelog	2011-05-08 18:40:52 UTC (rev 12236)
@@ -1,3 +1,10 @@
+kiki-the-nano-bot (1.0.2+dfsg1-4) unstable; urgency=low
+
+  * Fixed FTBFS with newer gcc. (Closes: #625047)
+    - Added patch: SWIG-KikiText.patch
+
+ -- Peter De Wachter <pdewacht at gmail.com>  Sun, 08 May 2011 19:43:03 +0200
+
 kiki-the-nano-bot (1.0.2+dfsg1-3) unstable; urgency=low
 
   * Fixed typo in package description. (Closes: #503717)

Added: packages/trunk/kiki-the-nano-bot/debian/patches/SWIG-KikiText.patch
===================================================================
--- packages/trunk/kiki-the-nano-bot/debian/patches/SWIG-KikiText.patch	                        (rev 0)
+++ packages/trunk/kiki-the-nano-bot/debian/patches/SWIG-KikiText.patch	2011-05-08 18:40:52 UTC (rev 12236)
@@ -0,0 +1,16 @@
+Description: fix SWIG declaration of KikiText::getText() to match the C++ header
+Author: Peter De Wachter <pdewacht at gmail.com>
+Bug: https://sourceforge.net/support/tracker.php?aid=3299098
+Bug-Debian: http://bugs.debian.org/625047
+
+--- a/SWIG/KikiText.i
++++ b/SWIG/KikiText.i
+@@ -10,7 +10,7 @@
+                         KikiText	( const std::string & = "", bool center = true, int colorIndex = 0 );
+     
+     void		setText		( const std::string & str, int colorIndex = base_color );
+-    const std::string &	getText		() const;
++    std::string		getText		() const;
+     
+     void		clear		();
+     bool		isEmpty		() const;

Modified: packages/trunk/kiki-the-nano-bot/debian/patches/series
===================================================================
--- packages/trunk/kiki-the-nano-bot/debian/patches/series	2011-05-07 23:44:25 UTC (rev 12235)
+++ packages/trunk/kiki-the-nano-bot/debian/patches/series	2011-05-08 18:40:52 UTC (rev 12236)
@@ -8,6 +8,7 @@
 gcc-miscompilation-479086.patch
 dont-use-getwd.patch
 SWIG.patch
+SWIG-KikiText.patch
 kikiaction-delete-hack.patch
 kikievent-empty-check.patch
 dont-leak-python-results.patch