Merge lp:~racb/gnome-system-tools/underlinking into lp:~ubuntu-desktop/gnome-system-tools/ubuntu

[Robie Basak]

Fix FTBFS

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-16 22:20:48 +0000
+++ debian/changelog	2013-04-05 13:54:42 +0000
@@ -1,3 +1,9 @@
+gnome-system-tools (3.0.0-2ubuntu2) raring; urgency=low
+
+  * d/p/underlinking.patch: add missing -lm to time-admin link to fix FTBFS.
+
+ -- Robie Basak <[e-mail]>  Fri, 05 Apr 2013 13:36:20 +0000
+
 gnome-system-tools (3.0.0-2ubuntu1) precise; urgency=low
 
   * Merge from Debian, remaining changes:

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-12-16 22:20:48 +0000
+++ debian/patches/series	2013-04-05 13:54:42 +0000
@@ -13,3 +13,4 @@
 96_ubuntu_ntp_pool.patch
 fix-missing-header-ftbfs-amd64.patch
 remove_g_thread_init.patch
+underlinking.patch

=== added file 'debian/patches/underlinking.patch'
--- debian/patches/underlinking.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/underlinking.patch	2013-04-05 13:54:42 +0000
@@ -0,0 +1,18 @@
+Author: Robie Basak <[e-mail]>
+Description: link time-admin with -lm to fix FTBFS in Raring
+ I can't find an active upstream VCS (broken link) and the upstream appears
+ dead, so I have not submitted this upstream.
+Forwarded: no
+Last-Update: 2013-04-05
+
+--- a/src/time/Makefile.am
++++ b/src/time/Makefile.am
+@@ -15,7 +15,7 @@
+ CLEANFILES = $(GST_TOOL_CLEANFILES)
+ EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
+ 
+-time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS)
++time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS) -lm
+ time_admin_DEPENDENCIES = ./e-map/libemap.a $(GST_TOOL_DEPENDENCIES)
+ time_admin_SOURCES = \
+ 	time-tool.c	time-tool.h \