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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-12-01 16:17:28 +0000
3+++ debian/changelog 2011-12-13 06:32:25 +0000
4@@ -1,3 +1,9 @@
5+syncmaildir (1.2.2-1ubuntu1) oneiric; urgency=low
6+
7+ * Fix FTBFS with libgthread linking.
8+
9+ -- Allison Randal <allison@canonical.com> Mon, 12 Dec 2011 21:33:07 -0800
10+
11 syncmaildir (1.2.2-1) unstable; urgency=low
12
13 * New upstream release
14
15=== added directory 'debian/patches'
16=== added file 'debian/patches/fix-ftbfs-libgthread-link.patch'
17--- debian/patches/fix-ftbfs-libgthread-link.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/fix-ftbfs-libgthread-link.patch 2011-12-13 06:32:25 +0000
19@@ -0,0 +1,13 @@
20+Index: fix-ftbfs-precise/Makefile
21+===================================================================
22+--- fix-ftbfs-precise.orig/Makefile 2011-12-13 06:02:56.907864000 +0000
23++++ fix-ftbfs-precise/Makefile 2011-12-13 06:05:00.689731641 +0000
24+@@ -23,7 +23,7 @@
25+ BENCH_SUITES=benchmarks
26+ PKG_GTK=gtk+-3.0
27+ SMD_APPLET_C=smd-applet.c
28+-PKGS_VALA=glib-2.0 $(PKG_GTK) libnotify gconf-2.0 gee-1.0 gio-2.0
29++PKGS_VALA=glib-2.0 $(PKG_GTK) libnotify gconf-2.0 gee-1.0 gio-2.0 gthread-2.0
30+ MIN_GLIB_VERSION=2.19.1
31+ PKGCONFIG_CHECK_GLIB_VERSION=--atleast-version=$(MIN_GLIB_VERSION) glib-2.0
32+ PKGCONFIG_GLIB_VERSION=--modversion glib-2.0
33
34=== added file 'debian/patches/series'
35--- debian/patches/series 1970-01-01 00:00:00 +0000
36+++ debian/patches/series 2011-12-13 06:32:25 +0000
37@@ -0,0 +1,1 @@
38+fix-ftbfs-libgthread-link.patch

Subscribers

People subscribed via source and target branches