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

Proposed by Robie Basak on 2013-04-05
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~racb/gnome-system-tools/underlinking
Merge into: lp:~ubuntu-desktop/gnome-system-tools/ubuntu
Diff against target: 45 lines (+25/-0)
3 files modified
debian/changelog (+6/-0)
debian/patches/series (+1/-0)
debian/patches/underlinking.patch (+18/-0)
To merge this branch: bzr merge lp:~racb/gnome-system-tools/underlinking
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2013-04-05 Pending
Review via email: mp+157361@code.launchpad.net

Description of the change

Fix FTBFS

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-12-16 22:20:48 +0000
3+++ debian/changelog 2013-04-05 13:54:42 +0000
4@@ -1,3 +1,9 @@
5+gnome-system-tools (3.0.0-2ubuntu2) raring; urgency=low
6+
7+ * d/p/underlinking.patch: add missing -lm to time-admin link to fix FTBFS.
8+
9+ -- Robie Basak <robie.basak@canonical.com> Fri, 05 Apr 2013 13:36:20 +0000
10+
11 gnome-system-tools (3.0.0-2ubuntu1) precise; urgency=low
12
13 * Merge from Debian, remaining changes:
14
15=== modified file 'debian/patches/series'
16--- debian/patches/series 2011-12-16 22:20:48 +0000
17+++ debian/patches/series 2013-04-05 13:54:42 +0000
18@@ -13,3 +13,4 @@
19 96_ubuntu_ntp_pool.patch
20 fix-missing-header-ftbfs-amd64.patch
21 remove_g_thread_init.patch
22+underlinking.patch
23
24=== added file 'debian/patches/underlinking.patch'
25--- debian/patches/underlinking.patch 1970-01-01 00:00:00 +0000
26+++ debian/patches/underlinking.patch 2013-04-05 13:54:42 +0000
27@@ -0,0 +1,18 @@
28+Author: Robie Basak <robie.basak@canonical.com>
29+Description: link time-admin with -lm to fix FTBFS in Raring
30+ I can't find an active upstream VCS (broken link) and the upstream appears
31+ dead, so I have not submitted this upstream.
32+Forwarded: no
33+Last-Update: 2013-04-05
34+
35+--- a/src/time/Makefile.am
36++++ b/src/time/Makefile.am
37+@@ -15,7 +15,7 @@
38+ CLEANFILES = $(GST_TOOL_CLEANFILES)
39+ EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
40+
41+-time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS)
42++time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS) -lm
43+ time_admin_DEPENDENCIES = ./e-map/libemap.a $(GST_TOOL_DEPENDENCIES)
44+ time_admin_SOURCES = \
45+ time-tool.c time-tool.h \

Subscribers

People subscribed via source and target branches