[Pkg-telepathy-commits] [telepathy-mission-control-6] 49/280: require telepathy-glib-1

Simon McVittie smcv at debian.org
Thu Mar 27 20:07:04 UTC 2014


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

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 6f7aad7fc5794fb3ff1a694b367f9bc415b15cca
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep 25 19:48:33 2013 +0100

    require telepathy-glib-1
    
    Drop TP_DISABLE_SINGLE_INCLUDE: it no longer does anything (the
    equivalent functionality is on by default).
    
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54879
    Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
---
 configure.ac | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index c5b945c..d6ceca6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,13 +224,13 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95, dbus-glib-1 >= 0.82])
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.21.1])
-AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_0_22],
-  [Ignore post-0.22 deprecations])
-AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_0_22],
-  [Prevent post-0.22 APIs])
+PKG_CHECK_MODULES([TELEPATHY],
+  [telepathy-glib-1 >= 0.99.1, telepathy-glib-1-dbus >= 0.99.1])
+AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_1_0],
+  [Ignore post-1.0 deprecations])
+AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_1_0],
+  [Prevent post-1.0 APIs])
 AC_DEFINE([TP_SEAL_ENABLE], [], [Define to hide deprecated struct fields])
-AC_DEFINE([TP_DISABLE_SINGLE_INCLUDE], [], [Avoid individual headers])
 
 PKG_CHECK_MODULES([GLIB],
 	[glib-2.0 >= 2.32, gobject-2.0, gmodule-no-export-2.0, gio-2.0])

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



More information about the Pkg-telepathy-commits mailing list