Merge lp:~allison/ubuntu/precise/syncmaildir/fix-ftbfs-link-libgthread into lp:ubuntu/precise/syncmaildir

Proposed by Allison Randal
Status: Merged
Merged at revision: 13
Proposed branch: lp:~allison/ubuntu/precise/syncmaildir/fix-ftbfs-link-libgthread
Merge into: lp:ubuntu/precise/syncmaildir
Diff against target: 38 lines (+20/-0)
3 files modified
debian/changelog (+6/-0)
debian/patches/fix-ftbfs-libgthread-link.patch (+13/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~allison/ubuntu/precise/syncmaildir/fix-ftbfs-link-libgthread
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+85435@code.launchpad.net

Description of the change

Fix FTBFS in syncmaildir, failing to link with libgthread.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-12-01 16:17:28 +0000
+++ debian/changelog 2011-12-13 06:32:25 +0000
@@ -1,3 +1,9 @@
1syncmaildir (1.2.2-1ubuntu1) oneiric; urgency=low
2
3 * Fix FTBFS with libgthread linking.
4
5 -- Allison Randal <allison@canonical.com> Mon, 12 Dec 2011 21:33:07 -0800
6
1syncmaildir (1.2.2-1) unstable; urgency=low7syncmaildir (1.2.2-1) unstable; urgency=low
28
3 * New upstream release9 * New upstream release
410
=== added directory 'debian/patches'
=== added file 'debian/patches/fix-ftbfs-libgthread-link.patch'
--- debian/patches/fix-ftbfs-libgthread-link.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ftbfs-libgthread-link.patch 2011-12-13 06:32:25 +0000
@@ -0,0 +1,13 @@
1Index: fix-ftbfs-precise/Makefile
2===================================================================
3--- fix-ftbfs-precise.orig/Makefile 2011-12-13 06:02:56.907864000 +0000
4+++ fix-ftbfs-precise/Makefile 2011-12-13 06:05:00.689731641 +0000
5@@ -23,7 +23,7 @@
6 BENCH_SUITES=benchmarks
7 PKG_GTK=gtk+-3.0
8 SMD_APPLET_C=smd-applet.c
9-PKGS_VALA=glib-2.0 $(PKG_GTK) libnotify gconf-2.0 gee-1.0 gio-2.0
10+PKGS_VALA=glib-2.0 $(PKG_GTK) libnotify gconf-2.0 gee-1.0 gio-2.0 gthread-2.0
11 MIN_GLIB_VERSION=2.19.1
12 PKGCONFIG_CHECK_GLIB_VERSION=--atleast-version=$(MIN_GLIB_VERSION) glib-2.0
13 PKGCONFIG_GLIB_VERSION=--modversion glib-2.0
014
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2011-12-13 06:32:25 +0000
@@ -0,0 +1,1 @@
1fix-ftbfs-libgthread-link.patch

Subscribers

People subscribed via source and target branches