telepathy-glib: update to 0.15.7.

This commit is contained in:
Juan RP 2011-10-04 18:47:02 +02:00
parent f9b8c8491c
commit 2a8026bbc8
3 changed files with 3 additions and 134 deletions

View File

@ -1,122 +0,0 @@
commit 014135b89d23f15464d8a82f462ed0f9f98344e0
Author: Jan Steffens <jan.steffens@gmail.com>
Date: Fri Sep 30 21:09:25 2011 +0200
Revert "Sort alphabetically introspected files"
This reverts commit 48998822d5e9575af822c1936b35be514dc2401b.
Conflicts:
telepathy-glib/introspection.am
diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
index 2027c5f..0c867cc 100644
--- telepathy-glib/introspection.am
+++ telepathy-glib/introspection.am
@@ -8,63 +8,64 @@ introspection_extra_dist = \
if HAVE_INTROSPECTION
INTROSPECTION_FILES = \
+ $(srcdir)/proxy.c _gen/proxy-introspectable.h \
$(srcdir)/account.c $(srcdir)/account.h \
$(srcdir)/account-channel-request.c $(srcdir)/account-channel-request.h \
$(srcdir)/account-manager.c $(srcdir)/account-manager.h \
- $(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \
$(srcdir)/automatic-client-factory.c $(srcdir)/automatic-client-factory.h \
$(srcdir)/automatic-proxy-factory.c $(srcdir)/automatic-proxy-factory.h \
- $(srcdir)/base-client.c $(srcdir)/base-client.h \
- $(srcdir)/base-connection.c $(srcdir)/base-connection.h \
$(srcdir)/basic-proxy-factory.c $(srcdir)/basic-proxy-factory.h \
- $(srcdir)/capabilities.c $(srcdir)/capabilities.h \
- $(srcdir)/channel.c $(srcdir)/channel.h \
- $(srcdir)/channel-contacts.c \
- $(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \
- $(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \
- $(srcdir)/channel-group.c \
- $(srcdir)/channel-request.c $(srcdir)/channel-request.h \
$(srcdir)/client-channel-factory.c $(srcdir)/client-channel-factory.h \
- $(srcdir)/client-message.c $(srcdir)/client-message.h \
$(srcdir)/connection.c $(srcdir)/connection.h \
- $(srcdir)/connection-avatars.c \
$(srcdir)/connection-contact-list.c $(srcdir)/connection-contact-list.h \
$(srcdir)/connection-handles.c $(srcdir)/connection-contact-info.c \
+ $(srcdir)/connection-avatars.c \
+ $(srcdir)/protocol.c $(srcdir)/protocol.h \
$(srcdir)/connection-manager.c $(srcdir)/connection-manager.h \
+ $(srcdir)/channel.c $(srcdir)/channel.h \
+ $(srcdir)/channel-contacts.c \
+ $(srcdir)/channel-group.c \
+ $(srcdir)/handle.c $(srcdir)/handle.h \
+ $(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \
+ $(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \
+ $(srcdir)/interfaces.c \
+ $(srcdir)/intset.c $(srcdir)/intset.h \
+ $(srcdir)/dbus.c $(srcdir)/dbus.h \
+ $(srcdir)/capabilities.c $(srcdir)/capabilities.h \
$(srcdir)/contact.c $(srcdir)/contact.h \
$(srcdir)/contact-operations.c $(srcdir)/contact-operations.h \
$(srcdir)/contact-search.c $(srcdir)/contact-search.h \
$(srcdir)/contact-search-result.c $(srcdir)/contact-search-result.h \
- $(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \
- $(srcdir)/dbus.c $(srcdir)/dbus.h \
- $(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \
- $(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \
- $(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \
- $(srcdir)/debug.c $(srcdir)/debug.h \
$(srcdir)/defs.h \
- $(srcdir)/errors.c $(srcdir)/errors.h \
- $(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \
- $(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \
- $(srcdir)/handle.c $(srcdir)/handle.h \
- $(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \
- $(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \
- $(srcdir)/interfaces.c \
- $(srcdir)/intset.c $(srcdir)/intset.h \
- $(srcdir)/message.c $(srcdir)/message.h \
- $(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \
- $(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \
- $(srcdir)/protocol.c $(srcdir)/protocol.h \
- $(srcdir)/proxy.c _gen/proxy-introspectable.h \
- $(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \
+ $(srcdir)/debug.c $(srcdir)/debug.h \
+ $(srcdir)/base-client.c $(srcdir)/base-client.h \
$(srcdir)/simple-approver.c $(srcdir)/simple-approver.h \
$(srcdir)/simple-client-factory.c $(srcdir)/simple-client-factory.h \
$(srcdir)/simple-handler.c $(srcdir)/simple-handler.h \
$(srcdir)/simple-observer.c $(srcdir)/simple-observer.h \
+ $(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \
+ $(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \
+ $(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \
+ $(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \
+ $(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \
+ $(srcdir)/channel-request.c $(srcdir)/channel-request.h \
+ $(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \
+ $(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \
+ $(srcdir)/protocol.c $(srcdir)/protocol.h \
+ $(srcdir)/base-connection.c $(srcdir)/base-connection.h \
+ $(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \
$(srcdir)/stream-tube-channel.c $(srcdir)/stream-tube-channel.h \
+ $(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \
$(srcdir)/stream-tube-connection.c $(srcdir)/stream-tube-connection.h \
$(srcdir)/text-channel.c $(srcdir)/text-channel.h \
+ $(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \
+ $(srcdir)/client-message.c $(srcdir)/client-message.h \
+ $(srcdir)/message.c $(srcdir)/message.h \
+ $(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \
+ $(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \
+ $(srcdir)/errors.c $(srcdir)/errors.h \
_gen/telepathy-enums.h _gen/telepathy-enums-gtk-doc.h \
- _gen/telepathy-interfaces.h _gen/telepathy-interfaces-gtk-doc.h\
+ _gen/telepathy-interfaces.h \
$(NULL)
_gen/proxy-introspectable.h: proxy.h introspection.am
@@ -76,7 +77,6 @@ TelepathyGLib-0.12.gir: $(INTROSPECTION_SCANNER) \
$(srcdir)/kludge.xsl \
$(INTROSPECTION_FILES)
$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- --warn-all \
--namespace TelepathyGLib \
--nsversion=0.12 \
--identifier-prefix=Tp \

View File

@ -5,8 +5,6 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
revision=1
Add_dependency run vala-devel Add_dependency run vala-devel
Add_dependency run dbus-glib-devel Add_dependency run dbus-glib-devel
Add_dependency run telepathy-glib Add_dependency run telepathy-glib

View File

@ -1,7 +1,6 @@
# Template file for 'telepathy-glib' # Template file for 'telepathy-glib'
pkgname=telepathy-glib pkgname=telepathy-glib
version=0.15.6 version=0.15.7
revision=2
homepage="http://telepathy.freedesktop.org" homepage="http://telepathy.freedesktop.org"
distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz" distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
build_style=gnu_configure build_style=gnu_configure
@ -9,7 +8,7 @@ configure_args="--enable-vala-bindings --disable-static"
short_desc="Library for GLib-based Telepathy components" short_desc="Library for GLib-based Telepathy components"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1" license="LGPL-2.1"
checksum=e855227f88e3ba73e3428ff1eb85de527e9da449cddfd372104ea10f0fb316fb checksum=30b15df6bdfbffc78d805ac1d4081af0ccefbfc263fcd617aa0c2e0eb62bfe89
long_desc=" long_desc="
Telepathy is a D-Bus framework for unifying real time communication, Telepathy is a D-Bus framework for unifying real time communication,
including instant messaging, voice calls and video calls. It abstracts including instant messaging, voice calls and video calls. It abstracts
@ -22,15 +21,9 @@ Add_dependency run glib
Add_dependency run dbus-libs Add_dependency run dbus-libs
Add_dependency run dbus-glib Add_dependency run dbus-glib
Add_dependency build automake
Add_dependency build pkg-config Add_dependency build pkg-config
Add_dependency build intltool Add_dependency build intltool
Add_dependency build vala-devel Add_dependency build vala-devel
Add_dependency build libxslt
Add_dependency build gobject-introspection Add_dependency build gobject-introspection
Add_dependency build dbus-glib-devel Add_dependency build dbus-glib-devel
Add_dependency build libxslt
pre_configure()
{
autoreconf -fi
}