[Pkg-telepathy-commits] [folks] 11/15: getting there?

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch telepathy1
in repository folks.

commit ec977e9738bde1356440b8370c625009568a8f60
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Mar 26 18:39:19 2014 +0000

    getting there?
---
 ...lepathy-contains-tp-lowlevel.c-so-it-need.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/0001-libfolks-telepathy-contains-tp-lowlevel.c-so-it-need.patch b/debian/patches/0001-libfolks-telepathy-contains-tp-lowlevel.c-so-it-need.patch
new file mode 100644
index 0000000..be53c65
--- /dev/null
+++ b/debian/patches/0001-libfolks-telepathy-contains-tp-lowlevel.c-so-it-need.patch
@@ -0,0 +1,31 @@
+From 8696bba77f47712bbdbb5123352a9a1fedaeab65 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Wed, 26 Mar 2014 18:38:45 +0000
+Subject: [PATCH] libfolks-telepathy contains tp-lowlevel.c, so it needs -dbus
+ CFLAGS/LIBS
+
+---
+ backends/telepathy/lib/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
+index 183ae30..c931814 100644
+--- a/backends/telepathy/lib/Makefile.am
++++ b/backends/telepathy/lib/Makefile.am
+@@ -190,11 +190,13 @@ libfolks_telepathy_la_CPPFLAGS = \
+ libfolks_telepathy_la_CFLAGS = \
+ 	$(backend_library_cflags) \
+ 	$(TP_GLIB_CFLAGS) \
++	$(TP_GLIB_DBUS_CFLAGS) \
+ 	$(NULL)
+ 
+ libfolks_telepathy_la_LIBADD = \
+ 	$(backend_library_libadd) \
+ 	$(TP_GLIB_LIBS) \
++	$(TP_GLIB_DBUS_LIBS) \
+ 	$(NULL)
+ 
+ if ENABLE_ZEITGEIST
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 0d2b169..c501b77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@ git-files.patch
 master.patch
 next.patch
 0001-Fix-TelepathyGLib-GIR-ABI-version.patch
+0001-libfolks-telepathy-contains-tp-lowlevel.c-so-it-need.patch
 0001-Reduce-libebook-dependency-when-not-compiling-the-Bl.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/folks.git