[Pkg-telepathy-commits] [folks] 10/15: ... and another patch

[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 3171fbce34dee00b5da6e64f8d3d447fc65f15d2
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Mar 26 18:26:06 2014 +0000

    ... and another patch
---
 .../0001-Fix-TelepathyGLib-GIR-ABI-version.patch   | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/0001-Fix-TelepathyGLib-GIR-ABI-version.patch b/debian/patches/0001-Fix-TelepathyGLib-GIR-ABI-version.patch
new file mode 100644
index 0000000..89e80e7
--- /dev/null
+++ b/debian/patches/0001-Fix-TelepathyGLib-GIR-ABI-version.patch
@@ -0,0 +1,39 @@
+From a94e04c60ae12bb3f9828abd9466c7335040c855 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Wed, 26 Mar 2014 18:25:00 +0000
+Subject: [PATCH] Fix TelepathyGLib GIR ABI version
+
+---
+ backends/telepathy/lib/Makefile.am          | 2 +-
+ tests/lib/telepathy/contactlist/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
+index d476506..183ae30 100644
+--- a/backends/telepathy/lib/Makefile.am
++++ b/backends/telepathy/lib/Makefile.am
+@@ -234,7 +234,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
+ #------------------------------------
+ # TpLowlevel
+ #------------------------------------
+-TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12
++TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_INCLUDES = GObject-2.0 TelepathyGLib-1
+ TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_CFLAGS = $(TP_GLIB_CFLAGS)
+ TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_LIBS = libtp-lowlevel.la
+ TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_FILES = $(libtp_lowlevel_la_SOURCES) $(tp_lowlevel_headers)
+diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
+index 14459f0..566fb38 100644
+--- a/tests/lib/telepathy/contactlist/Makefile.am
++++ b/tests/lib/telepathy/contactlist/Makefile.am
+@@ -75,7 +75,7 @@ INTROSPECTION_SCANNER_ENV = \
+ 
+ tp-test-contactlist.gir: $(libtp_test_contactlist_la_SOURCES) \
+ 	libtp-test-contactlist.la
+-tp_test_contactlist_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12
++tp_test_contactlist_gir_INCLUDES = GObject-2.0 TelepathyGLib-1
+ tp_test_contactlist_gir_CFLAGS = $(TP_GLIB_CFLAGS) $(TP_GLIB_DBUS_CFLAGS)
+ tp_test_contactlist_gir_LIBS = libtp-test-contactlist.la
+ tp_test_contactlist_gir_FILES = $(libtp_test_contactlist_la_SOURCES)
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 2b290d3..0d2b169 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 git-files.patch
 master.patch
 next.patch
+0001-Fix-TelepathyGLib-GIR-ABI-version.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