[telepathy-glib/master] Depend on GLib 2.20 (Debian #550406)
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Oct 12 10:19:01 PDT 2009
---
NEWS | 1 +
configure.ac | 4 ++--
telepathy-glib/telepathy-glib-uninstalled.pc.in | 2 +-
telepathy-glib/telepathy-glib.pc.in | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 40902ef..9733fe6 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ The "purging all the lies" release.
Dependencies:
+* GLib 2.20 is now required.
* telepathy-glib now links to GIO as well as GLib and GObject (in practice
they're packaged together, and we already depended on a new enough GLib
version that it would come with GIO).
diff --git a/configure.ac b/configure.ac
index bdfa63e..24b0557 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,8 +150,8 @@ dnl (srcdir != builddir)
AM_CONDITIONAL([OUT_OF_TREE_BUILD], [test "z$ac_srcdir" != z.])
dnl Check for Glib
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gio-2.0])
-
+PKG_CHECK_MODULES(GLIB,
+ [glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20])
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
diff --git a/telepathy-glib/telepathy-glib-uninstalled.pc.in b/telepathy-glib/telepathy-glib-uninstalled.pc.in
index dd55149..6d62d0e 100644
--- a/telepathy-glib/telepathy-glib-uninstalled.pc.in
+++ b/telepathy-glib/telepathy-glib-uninstalled.pc.in
@@ -7,6 +7,6 @@ Name: Telepathy-GLib (uninstalled copy)
Description: GLib utility library for the Telepathy framework
Version: @VERSION@
Requires: pkg-config >= 0.21
-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
+Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la
Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
diff --git a/telepathy-glib/telepathy-glib.pc.in b/telepathy-glib/telepathy-glib.pc.in
index d30fee9..b52f0c4 100644
--- a/telepathy-glib/telepathy-glib.pc.in
+++ b/telepathy-glib/telepathy-glib.pc.in
@@ -7,6 +7,6 @@ Name: Telepathy-GLib
Description: GLib utility library for the Telepathy framework
Version: @VERSION@
Requires: pkg-config >= 0.21
-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
+Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
Libs: -L${libdir} -ltelepathy-glib
Cflags: -I${includedir}/telepathy-1.0
--
1.5.6.5
More information about the telepathy-commits
mailing list