Merge lp:~l3on/ubuntu/precise/gnurobots/fix-ftbfs into lp:ubuntu/precise/gnurobots

[Leo Iannacone]

A new patch replacing g_thread_* deprecated functions.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-12 17:45:25 +0000
+++ debian/changelog	2012-02-18 23:57:19 +0000
@@ -1,3 +1,10 @@
+gnurobots (2:1.2.0-4ubuntu4) precise; urgency=low
+
+  * Fix FTBFS: replacing g_thread_* deprecated functions. 
+    (LP: #935136).
+
+ -- Leo Iannacone <[e-mail]>  Sat, 18 Feb 2012 23:52:11 +0100
+
 gnurobots (2:1.2.0-4ubuntu3) oneiric; urgency=low
 
   * Fix link order to list libraries after the objects that require them
 
=== added file 'debian/patches/02_fix_deprecated_declarations.patch'
--- debian/patches/02_fix_deprecated_declarations.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_fix_deprecated_declarations.patch	2012-02-18 23:57:19 +0000
@@ -0,0 +1,24 @@
+Descirption: Fix FTBFS with -Werror=deprecated-declarations.
+ * 'g_thread_init' is deprecated, no longer needed
+ * 'g_thread_create' is deprecated, using 'g_thread_new' instead.
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/+bug/935136
+Forwarded: no
+
+---
+ src/main.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- gnurobots.orig/src/main.c
++++ gnurobots/src/main.c
+@@ -295,9 +295,8 @@ void main_prog(void *closure, gint argc,
+ 		exit_nicely();
+ 	}
+ 
+-	g_thread_init(NULL);
+ 	gdk_threads_init();
+-	g_thread_create(callback, &loading, FALSE, NULL);
++	g_thread_new(NULL, callback, &loading);
+ 
+ 	/* ensure the robot is placed properly */
+ 	MAP_SET_OBJECT(map, G_ROBOT_POSITION_Y(robot),
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-12 17:45:25 +0000
+++ debian/patches/series	2012-02-18 23:57:19 +0000
@@ -1,2 +1,3 @@
 00_fix_mips_FTBFS.patch
 01_link_order.patch
+02_fix_deprecated_declarations.patch