* Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which

  are the latest stable releases.
* Update vala to the newest stable release 0.18.1, also update a few ports
  in the gtk/gnome stack.
* The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles.
* Remove pkg-config run depends from glib20 and freetype2. This doesn't
  eliminate pkg-config run dependency completely, a second phase is needed
  and is planned.
* Support for .:run. and .:build. for USE_GNOME components was added.
  Currently only libxml2 and libxslt support this mechanism.
* Updates of the telepathy stack and empathy.
* Trim makefile headers, convert ports to new options, trim off library
  versions for some ports.
* Fix other ports so they build with the new glib version.

Thanks to miwi and crees for helping out with some exp-runs.
Approved by:	portmgr (miwi & bapt)
Obtained from:	gnome team repo

5 files changed, 114 insertions, 53 deletions

diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index 7273ab234f2d..be3fcd84aaa1 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -1,42 +1,31 @@
-# New ports collection makefile for:	telepathy-glib
-# Date created:				Apr 19 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-glib/Makefile,v 1.15 2010/10/21 17:35:24 kwm Exp $
+#    $MCom: ports/net-im/telepathy-glib/Makefile,v 1.38 2012/08/07 20:30:33 kwm Exp $
 
 PORTNAME=	telepathy-glib
-PORTVERSION=	0.12.7
-PORTREVISION=	1
+PORTVERSION=	0.18.2
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib utility library for the Telepathy framework
 
-LIB_PC_DEPENDS=	gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
-		dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
-
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		vapigen:${PORTSDIR}/lang/vala-vapigen \
+		vala-vapigen>=0.14.0:${PORTSDIR}/lang/vala-vapigen \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-
-BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \
-		vapigen:${PORTSDIR}/lang/vala-vapigen
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen
 
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
+USE_GNOME=	gnomehack glib20 ltverhack gnomehier
 USE_PYTHON_BUILD=	yes
 MAKE_JOBS_UNSAFE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vala-bindings
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/telepathy-glib/Makefile.in
-	@${REINPLACE_CMD} -e 's|datarootdir)/vala/vapi|datarootdir)/vala-0.12/vapi|g' \
-		${WRKSRC}/vala/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-glib/distinfo b/net-im/telepathy-glib/distinfo
index 89878457b359..83cbaecd20bb 100644
--- a/net-im/telepathy-glib/distinfo
+++ b/net-im/telepathy-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telepathy-glib-0.12.7.tar.gz) = 4c76b78c283620556c253bd9a483f8b6e1bbd014fb8a22de704e117eaa9e3c97
-SIZE (telepathy-glib-0.12.7.tar.gz) = 2572558
+SHA256 (telepathy-glib-0.18.2.tar.gz) = 372375578be8053398f9fb1e12188a8b472d6d897e0ac73b230d31e112c68b3f
+SIZE (telepathy-glib-0.18.2.tar.gz) = 3539165
diff --git a/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in b/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in
index d88266770456..e69de29bb2d1 100644
--- a/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in
+++ b/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in
@@ -1,22 +0,0 @@
---- telepathy-glib/Makefile.in.orig	2011-07-22 13:41:13.000000000 +0200
-+++ telepathy-glib/Makefile.in	2011-07-22 14:00:23.000000000 +0200
-@@ -1649,7 +1649,7 @@
- @HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- @HAVE_INTROSPECTION_TRUE@		--namespace TelepathyGLib \
- @HAVE_INTROSPECTION_TRUE@		--nsversion=0.12 \
--@HAVE_INTROSPECTION_TRUE@		$(gi_identifier_prefix_arg)=Tp \
-+@HAVE_INTROSPECTION_TRUE@		--identifier-prefix=Tp \
- @HAVE_INTROSPECTION_TRUE@		-I$(top_builddir) \
- @HAVE_INTROSPECTION_TRUE@		-I$(top_srcdir) \
- @HAVE_INTROSPECTION_TRUE@		--include=GLib-2.0 \
-@@ -1658,7 +1658,9 @@
- @HAVE_INTROSPECTION_TRUE@		--library=libtelepathy-glib.la \
- @HAVE_INTROSPECTION_TRUE@		--pkg gio-2.0 \
- @HAVE_INTROSPECTION_TRUE@		--pkg dbus-glib-1 \
--@HAVE_INTROSPECTION_TRUE@		$(gi_warn_all_arg) \
-+@HAVE_INTROSPECTION_TRUE@		--pkg-export telepathy-glib \
-+@HAVE_INTROSPECTION_TRUE@		--c-include="telepathy-glib/telepathy-glib.h" \
-+@HAVE_INTROSPECTION_TRUE@		--warn-all \
- @HAVE_INTROSPECTION_TRUE@		--output _gen/$@.tmp \
- @HAVE_INTROSPECTION_TRUE@		$(INTROSPECTION_FILES)
- @HAVE_INTROSPECTION_TRUE@	@xsltproc $(srcdir)/kludge.xsl _gen/$@.tmp > $@
diff --git a/net-im/telepathy-glib/pkg-descr b/net-im/telepathy-glib/pkg-descr
index f2fa32bf5b4d..49f70dbb2703 100644
--- a/net-im/telepathy-glib/pkg-descr
+++ b/net-im/telepathy-glib/pkg-descr
@@ -1,3 +1,6 @@
 GLib utility library for the Telepathy framework.
 
 WWW: http://telepathy.freedesktop.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist
index 457fc925a6f1..afaaa0ac1b4a 100644
--- a/net-im/telepathy-glib/pkg-plist
+++ b/net-im/telepathy-glib/pkg-plist
@@ -5,6 +5,10 @@ include/telepathy-1.0/telepathy-glib/_gen/telepathy-enums.h
 include/telepathy-1.0/telepathy-glib/_gen/telepathy-interfaces.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-cli-account-manager.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-cli-account.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-content-media-description.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-content.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-stream-endpoint.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-stream.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-dispatcher.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-request.h
@@ -19,6 +23,10 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-stream-handler.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-cli-protocol.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account-manager.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-content-media-description.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-content.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-stream-endpoint.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-stream.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatcher.h
 include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-request.h
@@ -36,11 +44,29 @@ include/telepathy-1.0/telepathy-glib/account-channel-request.h
 include/telepathy-1.0/telepathy-glib/account-manager.h
 include/telepathy-1.0/telepathy-glib/account.h
 include/telepathy-1.0/telepathy-glib/add-dispatch-operation-context.h
+include/telepathy-1.0/telepathy-glib/automatic-client-factory.h
+include/telepathy-1.0/telepathy-glib/automatic-proxy-factory.h
+include/telepathy-1.0/telepathy-glib/base-call-channel.h
+include/telepathy-1.0/telepathy-glib/base-call-content.h
+include/telepathy-1.0/telepathy-glib/base-call-stream.h
 include/telepathy-1.0/telepathy-glib/base-channel.h
 include/telepathy-1.0/telepathy-glib/base-client.h
 include/telepathy-1.0/telepathy-glib/base-connection-manager.h
 include/telepathy-1.0/telepathy-glib/base-connection.h
+include/telepathy-1.0/telepathy-glib/base-contact-list.h
+include/telepathy-1.0/telepathy-glib/base-media-call-channel.h
+include/telepathy-1.0/telepathy-glib/base-media-call-content.h
+include/telepathy-1.0/telepathy-glib/base-media-call-stream.h
+include/telepathy-1.0/telepathy-glib/base-password-channel.h
 include/telepathy-1.0/telepathy-glib/base-protocol.h
+include/telepathy-1.0/telepathy-glib/base-room-config.h
+include/telepathy-1.0/telepathy-glib/basic-proxy-factory.h
+include/telepathy-1.0/telepathy-glib/call-channel.h
+include/telepathy-1.0/telepathy-glib/call-content-media-description.h
+include/telepathy-1.0/telepathy-glib/call-content.h
+include/telepathy-1.0/telepathy-glib/call-misc.h
+include/telepathy-1.0/telepathy-glib/call-stream-endpoint.h
+include/telepathy-1.0/telepathy-glib/call-stream.h
 include/telepathy-1.0/telepathy-glib/capabilities.h
 include/telepathy-1.0/telepathy-glib/channel-dispatch-operation.h
 include/telepathy-1.0/telepathy-glib/channel-dispatcher.h
@@ -49,21 +75,31 @@ include/telepathy-1.0/telepathy-glib/channel-iface.h
 include/telepathy-1.0/telepathy-glib/channel-manager.h
 include/telepathy-1.0/telepathy-glib/channel-request.h
 include/telepathy-1.0/telepathy-glib/channel.h
+include/telepathy-1.0/telepathy-glib/client-channel-factory.h
+include/telepathy-1.0/telepathy-glib/client-message.h
 include/telepathy-1.0/telepathy-glib/client.h
+include/telepathy-1.0/telepathy-glib/cm-message.h
+include/telepathy-1.0/telepathy-glib/connection-contact-list.h
 include/telepathy-1.0/telepathy-glib/connection-manager.h
 include/telepathy-1.0/telepathy-glib/connection.h
-include/telepathy-1.0/telepathy-glib/contacts-mixin.h
+include/telepathy-1.0/telepathy-glib/contact-operations.h
+include/telepathy-1.0/telepathy-glib/contact-search-result.h
+include/telepathy-1.0/telepathy-glib/contact-search.h
 include/telepathy-1.0/telepathy-glib/contact.h
+include/telepathy-1.0/telepathy-glib/contacts-mixin.h
 include/telepathy-1.0/telepathy-glib/dbus-daemon.h
 include/telepathy-1.0/telepathy-glib/dbus-properties-mixin.h
+include/telepathy-1.0/telepathy-glib/dbus-tube-channel.h
 include/telepathy-1.0/telepathy-glib/dbus.h
 include/telepathy-1.0/telepathy-glib/debug-ansi.h
 include/telepathy-1.0/telepathy-glib/debug-sender.h
 include/telepathy-1.0/telepathy-glib/debug.h
 include/telepathy-1.0/telepathy-glib/defs.h
+include/telepathy-1.0/telepathy-glib/dtmf.h
 include/telepathy-1.0/telepathy-glib/enums.h
 include/telepathy-1.0/telepathy-glib/errors.h
 include/telepathy-1.0/telepathy-glib/exportable-channel.h
+include/telepathy-1.0/telepathy-glib/file-transfer-channel.h
 include/telepathy-1.0/telepathy-glib/gnio-util.h
 include/telepathy-1.0/telepathy-glib/group-mixin.h
 include/telepathy-1.0/telepathy-glib/gtypes.h
@@ -77,6 +113,7 @@ include/telepathy-1.0/telepathy-glib/interfaces.h
 include/telepathy-1.0/telepathy-glib/intset.h
 include/telepathy-1.0/telepathy-glib/media-interfaces.h
 include/telepathy-1.0/telepathy-glib/message-mixin.h
+include/telepathy-1.0/telepathy-glib/message.h
 include/telepathy-1.0/telepathy-glib/observe-channels-context.h
 include/telepathy-1.0/telepathy-glib/presence-mixin.h
 include/telepathy-1.0/telepathy-glib/properties-mixin.h
@@ -84,11 +121,17 @@ include/telepathy-1.0/telepathy-glib/protocol.h
 include/telepathy-1.0/telepathy-glib/proxy-subclass.h
 include/telepathy-1.0/telepathy-glib/proxy.h
 include/telepathy-1.0/telepathy-glib/run.h
+include/telepathy-1.0/telepathy-glib/signalled-message.h
 include/telepathy-1.0/telepathy-glib/simple-approver.h
+include/telepathy-1.0/telepathy-glib/simple-client-factory.h
 include/telepathy-1.0/telepathy-glib/simple-handler.h
 include/telepathy-1.0/telepathy-glib/simple-observer.h
+include/telepathy-1.0/telepathy-glib/simple-password-manager.h
+include/telepathy-1.0/telepathy-glib/stream-tube-channel.h
+include/telepathy-1.0/telepathy-glib/stream-tube-connection.h
 include/telepathy-1.0/telepathy-glib/svc-account-manager.h
 include/telepathy-1.0/telepathy-glib/svc-account.h
+include/telepathy-1.0/telepathy-glib/svc-call.h
 include/telepathy-1.0/telepathy-glib/svc-channel-dispatch-operation.h
 include/telepathy-1.0/telepathy-glib/svc-channel-dispatcher.h
 include/telepathy-1.0/telepathy-glib/svc-channel-request.h
@@ -103,6 +146,7 @@ include/telepathy-1.0/telepathy-glib/svc-properties-interface.h
 include/telepathy-1.0/telepathy-glib/svc-protocol.h
 include/telepathy-1.0/telepathy-glib/svc-tls.h
 include/telepathy-1.0/telepathy-glib/telepathy-glib.h
+include/telepathy-1.0/telepathy-glib/text-channel.h
 include/telepathy-1.0/telepathy-glib/text-mixin.h
 include/telepathy-1.0/telepathy-glib/util.h
 include/telepathy-1.0/telepathy-glib/verify.h
@@ -113,18 +157,33 @@ lib/libtelepathy-glib.so
 lib/libtelepathy-glib.so.0
 libdata/pkgconfig/telepathy-glib.pc
 share/gir-1.0/TelepathyGLib-0.12.gir
+share/gtk-doc/html/telepathy-glib/TpBaseCallChannel.html
+share/gtk-doc/html/telepathy-glib/TpBaseCallContent.html
+share/gtk-doc/html/telepathy-glib/TpBaseCallStream.html
 share/gtk-doc/html/telepathy-glib/TpBaseChannel.html
 share/gtk-doc/html/telepathy-glib/TpBaseConnection.html
 share/gtk-doc/html/telepathy-glib/TpBaseConnectionManager.html
+share/gtk-doc/html/telepathy-glib/TpBaseMediaCallChannel.html
+share/gtk-doc/html/telepathy-glib/TpBaseMediaCallContent.html
+share/gtk-doc/html/telepathy-glib/TpBaseMediaCallStream.html
+share/gtk-doc/html/telepathy-glib/TpBaseRoomConfig.html
+share/gtk-doc/html/telepathy-glib/TpCMMessage.html
+share/gtk-doc/html/telepathy-glib/TpCallContentMediaDescription.html
+share/gtk-doc/html/telepathy-glib/TpCallStreamEndpoint.html
 share/gtk-doc/html/telepathy-glib/TpChannelFactoryIface.html
 share/gtk-doc/html/telepathy-glib/TpChannelIface.html
 share/gtk-doc/html/telepathy-glib/TpChannelManager.html
-share/gtk-doc/html/telepathy-glib/TpExportableChannel.html
+share/gtk-doc/html/telepathy-glib/TpClientMessage.html
 share/gtk-doc/html/telepathy-glib/TpDynamicHandleRepo.html
+share/gtk-doc/html/telepathy-glib/TpExportableChannel.html
+share/gtk-doc/html/telepathy-glib/TpIntset.html
+share/gtk-doc/html/telepathy-glib/TpMessage.html
+share/gtk-doc/html/telepathy-glib/TpSignalledMessage.html
 share/gtk-doc/html/telepathy-glib/TpStaticHandleRepo.html
 share/gtk-doc/html/telepathy-glib/annotation-glossary.html
 share/gtk-doc/html/telepathy-glib/ch-client.html
 share/gtk-doc/html/telepathy-glib/ch-dbus.html
+share/gtk-doc/html/telepathy-glib/ch-obsolete.html
 share/gtk-doc/html/telepathy-glib/ch-protocol.html
 share/gtk-doc/html/telepathy-glib/ch-service-base.html
 share/gtk-doc/html/telepathy-glib/ch-service-dbus.html
@@ -139,19 +198,28 @@ share/gtk-doc/html/telepathy-glib/style.css
 share/gtk-doc/html/telepathy-glib/telepathy-glib-TpContactsMixin.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-TpGroupMixin.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-TpHeap.html
-share/gtk-doc/html/telepathy-glib/telepathy-glib-TpIntset.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-TpMessageMixin.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPresenceMixin.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPropertiesMixin.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-TpTextMixin.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-account-channel-request.html
-share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html
-share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-account-manager.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-account.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-automatic-client-factory.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-automatic-proxy-factory.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-base-client.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-base-contact-list.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-base-password-channel.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-base-protocol.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-basic-proxy-factory.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-call-channel.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-call-content.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-call-misc.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-call-stream.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-capabilities.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-auth.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-contactsearch.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatch-operation.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatcher.html
@@ -159,36 +227,52 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-file-transfer.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-group.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-media.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-request.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-room.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-roomlist.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-text.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tube.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tubes.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-anonymity.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-channel.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-content.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-misc.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-stream.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-service-point.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-client-channel-factory.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-client.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-addressing.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-aliasing.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-avatars.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-balance.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-caps.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-cellular.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-client-types.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contact-info.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contact-list.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contacts.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-location.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-mail.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-manager.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-powersaving.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-presence.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-requests.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-simple-presence.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-connection.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-contact-search-result.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-contact-search.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-contact.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus-properties-mixin.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus-tube-channel.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-debug-ansi.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-debug-sender.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-debug.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-defs.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-dtmf.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-errors.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-file-transfer-channel.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-gnio-util.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-gtypes.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-handle-channels-context.html
@@ -204,20 +288,29 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-tp-properties.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-run.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-approver.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-client-factory.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-handler.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-observer.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-password-manager.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-stream-tube-channel.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-stream-tube-connection.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account-manager.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-anonymity.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-auth.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-call.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactlist.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactsearch.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatch-operation.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatcher.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-file-transfer.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-ft-metadata.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-group.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-media.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-request.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-room.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-roomlist.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-securable.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-text.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-tube.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-tubes.html
@@ -228,21 +321,19 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-connection.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-debug.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-generic.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-media-interfaces.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-service-point.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-tls.html
-share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-svc.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-text-channel.html
 share/gtk-doc/html/telepathy-glib/telepathy-glib-util.html
-share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp
 share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp2
 share/gtk-doc/html/telepathy-glib/up.png
-share/vala-0.12/vapi/telepathy-glib.deps
-share/vala-0.12/vapi/telepathy-glib.vapi
+share/vala/vapi/telepathy-glib.deps
+share/vala/vapi/telepathy-glib.vapi
 @dirrm share/gtk-doc/html/telepathy-glib
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
 @dirrm include/telepathy-1.0/telepathy-glib/_gen
 @dirrm include/telepathy-1.0/telepathy-glib
 @dirrmtry include/telepathy-1.0
-@dirrmtry lib/girepository-1.0
-@dirrmtry share/gir-1.0