[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/5.4.1-1-18-g85b71a7
Simon McVittie
smcv at debian.org
Mon May 31 16:36:03 UTC 2010
The following commit has been merged in the debian branch:
commit a01c9e0ff0070d52366bd53f4e4ec7fa957dc191
Author: Simon McVittie <smcv at debian.org>
Date: Wed May 26 19:08:16 2010 +0100
Imported Upstream version 5.5.0
diff --git a/ChangeLog b/ChangeLog
index e347f22..9413bd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+commit 57ef8f9c6762ab0fc1d15991a15781e52ddff68d
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2010-05-26 19:04:43 +0100
+
+ Prepare release 5.5.0
+
+ NEWS | 4 +++-
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
commit 69d44b7e012282fe8a0d54c9828edd87c41a0304
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: 2010-05-26 18:50:24 +0100
diff --git a/NEWS b/NEWS
index 6d8e2ac..855e7db 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-telepathy-mission-control 5.5.0 (UNRELEASED)
+telepathy-mission-control 5.5.0 (2010-05-26)
============================================
+The "it's yours provided you take it away today" release.
+
Dependencies:
* telepathy-glib 0.11.6 is now required
diff --git a/configure b/configure
index 2350fd8..2f98bd3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for telepathy-mission-control 5.4.999+.
+# Generated by GNU Autoconf 2.65 for telepathy-mission-control 5.5.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='telepathy-mission-control'
PACKAGE_TARNAME='telepathy-mission-control'
-PACKAGE_VERSION='5.4.999+'
-PACKAGE_STRING='telepathy-mission-control 5.4.999+'
+PACKAGE_VERSION='5.5.0'
+PACKAGE_STRING='telepathy-mission-control 5.5.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1525,7 +1525,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures telepathy-mission-control 5.4.999+ to adapt to many kinds of systems.
+\`configure' configures telepathy-mission-control 5.5.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1596,7 +1596,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of telepathy-mission-control 5.4.999+:";;
+ short | recursive ) echo "Configuration of telepathy-mission-control 5.5.0:";;
esac
cat <<\_ACEOF
@@ -1750,7 +1750,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-telepathy-mission-control configure 5.4.999+
+telepathy-mission-control configure 5.5.0
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2236,7 +2236,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by telepathy-mission-control $as_me 5.4.999+, which was
+It was created by telepathy-mission-control $as_me 5.5.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -3047,7 +3047,7 @@ fi
# Define the identity of the package.
PACKAGE='telepathy-mission-control'
- VERSION='5.4.999+'
+ VERSION='5.5.0'
cat >>confdefs.h <<_ACEOF
@@ -17033,7 +17033,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by telepathy-mission-control $as_me 5.4.999+, which was
+This file was extended by telepathy-mission-control $as_me 5.5.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17099,7 +17099,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-telepathy-mission-control config.status 5.4.999+
+telepathy-mission-control config.status 5.5.0
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index dd4dbd2..7932a86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Set the version number to e.g. 5.0.beta42 immediately before a release.
dnl Set the version number to e.g. 5.0.beta42+ immediately after (this will
dnl enable -Werror).
-AC_INIT([telepathy-mission-control], [5.4.999+])
+AC_INIT([telepathy-mission-control], [5.5.0])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(Makefile.am)
diff --git a/doc/reference/mission-control-plugins/html/McpAccountStorage.html b/doc/reference/mission-control-plugins/html/McpAccountStorage.html
index ecf92ec..57a4352 100644
--- a/doc/reference/mission-control-plugins/html/McpAccountStorage.html
+++ b/doc/reference/mission-control-plugins/html/McpAccountStorage.html
@@ -143,7 +143,7 @@ from the interface initialization function, like this:
<p>
</p>
<div class="example">
-<a name="id594058"></a><p class="title"><b>Example 1. </b></p>
+<a name="id650884"></a><p class="title"><b>Example 1. </b></p>
<div class="example-contents">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -342,6 +342,8 @@ an account storage plugin in an account storage object, though.
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
</td>
</tr></tbody>
</table></div>
@@ -367,6 +369,8 @@ an account storage plugin in an account storage object, though.
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
</td>
</tr></tbody>
</table></div>
@@ -392,6 +396,8 @@ an account storage plugin in an account storage object, though.
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
</td>
</tr></tbody>
</table></div>
@@ -417,6 +423,8 @@ an account storage plugin in an account storage object, though.
@ const McpAccountStorage *, const McpAccountManager *:
@ const McpAccountStorage *, const McpAccountManager *:
@ const McpAccountStorage *, const McpAccountManager *:
+@ const McpAccountStorage *, const McpAccountManager *:
+@ const McpAccountStorage *, const McpAccountManager *:
</td>
</tr></tbody>
</table></div>
@@ -442,6 +450,8 @@ an account storage plugin in an account storage object, though.
<em class="parameter"><code>const</code></em> McpAccountStorage *, const McpAccountManager *am:
<em class="parameter"><code>const</code></em> McpAccountStorage *, const McpAccountManager *am:
<em class="parameter"><code>const</code></em> McpAccountStorage *, const McpAccountManager *am:
+<em class="parameter"><code>const</code></em> McpAccountStorage *, const McpAccountManager *am:
+<em class="parameter"><code>const</code></em> McpAccountStorage *, const McpAccountManager *am:
</td>
</tr></tbody>
</table></div>
@@ -467,6 +477,8 @@ an account storage plugin in an account storage object, though.
@ const McpAccountStorage *storage, const McpAccountManager *am:
@ const McpAccountStorage *storage, const McpAccountManager *am:
@ const McpAccountStorage *storage, const McpAccountManager *am:
+@ const McpAccountStorage *storage, const McpAccountManager *am:
+@ const McpAccountStorage *storage, const McpAccountManager *am:
</td>
</tr></tbody>
</table></div>
diff --git a/doc/reference/mission-control-plugins/html/ch01.html b/doc/reference/mission-control-plugins/html/ch01.html
index 54be17d..0c34396 100644
--- a/doc/reference/mission-control-plugins/html/ch01.html
+++ b/doc/reference/mission-control-plugins/html/ch01.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="Global functions">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id549564"></a>Global functions</h2></div></div></div>
+<a name="id574584"></a>Global functions</h2></div></div></div>
<div class="toc"><dl><dt>
<span class="refentrytitle"><a href="mission-control-plugins-loader.html">loader</a></span><span class="refpurpose"></span>
</dt></dl></div>
diff --git a/doc/reference/mission-control-plugins/html/ch02.html b/doc/reference/mission-control-plugins/html/ch02.html
index e749f11..8b7b804 100644
--- a/doc/reference/mission-control-plugins/html/ch02.html
+++ b/doc/reference/mission-control-plugins/html/ch02.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="Account storage">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id559986"></a>Account storage</h2></div></div></div>
+<a name="id585006"></a>Account storage</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="McpAccountStorage.html">McpAccountStorage</a></span><span class="refpurpose"> — Account Storage object, implemented by plugins</span>
diff --git a/doc/reference/mission-control-plugins/html/ch03.html b/doc/reference/mission-control-plugins/html/ch03.html
index 950ec70..f8b7432 100644
--- a/doc/reference/mission-control-plugins/html/ch03.html
+++ b/doc/reference/mission-control-plugins/html/ch03.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="Channel requests">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id547491"></a>Channel requests</h2></div></div></div>
+<a name="id572510"></a>Channel requests</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="mission-control-plugins-request-policy.html">request-policy</a></span><span class="refpurpose"></span>
diff --git a/doc/reference/mission-control-plugins/html/ch04.html b/doc/reference/mission-control-plugins/html/ch04.html
index 1bd33e8..38d7b23 100644
--- a/doc/reference/mission-control-plugins/html/ch04.html
+++ b/doc/reference/mission-control-plugins/html/ch04.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="Channel dispatch operations">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id568311"></a>Channel dispatch operations</h2></div></div></div>
+<a name="id593331"></a>Channel dispatch operations</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="mission-control-plugins-dispatch-operation-policy.html">dispatch-operation-policy</a></span><span class="refpurpose"></span>
diff --git a/doc/reference/mission-control-plugins/html/mission-control-plugins-dispatch-operation-policy.html b/doc/reference/mission-control-plugins/html/mission-control-plugins-dispatch-operation-policy.html
index ecbb50a..b0d0bf7 100644
--- a/doc/reference/mission-control-plugins/html/mission-control-plugins-dispatch-operation-policy.html
+++ b/doc/reference/mission-control-plugins/html/mission-control-plugins-dispatch-operation-policy.html
@@ -127,6 +127,8 @@ McpDispatchOperationPolicy requires
<em class="parameter"><code>McpDispatchOperationPolicy</code></em> *, McpDispatchOperation *:
<em class="parameter"><code>McpDispatchOperationPolicy</code></em> *, McpDispatchOperation *:
<em class="parameter"><code>McpDispatchOperationPolicy</code></em> *, McpDispatchOperation *:
+<em class="parameter"><code>McpDispatchOperationPolicy</code></em> *, McpDispatchOperation *:
+<em class="parameter"><code>McpDispatchOperationPolicy</code></em> *, McpDispatchOperation *:
</td>
</tr></tbody>
</table></div>
diff --git a/doc/reference/mission-control-plugins/html/mission-control-plugins-request-policy.html b/doc/reference/mission-control-plugins/html/mission-control-plugins-request-policy.html
index 7ca80cc..69d17e1 100644
--- a/doc/reference/mission-control-plugins/html/mission-control-plugins-request-policy.html
+++ b/doc/reference/mission-control-plugins/html/mission-control-plugins-request-policy.html
@@ -127,6 +127,8 @@ McpRequestPolicy requires
<em class="parameter"><code>McpRequestPolicy</code></em> *, McpRequest *:
<em class="parameter"><code>McpRequestPolicy</code></em> *, McpRequest *:
<em class="parameter"><code>McpRequestPolicy</code></em> *, McpRequest *:
+<em class="parameter"><code>McpRequestPolicy</code></em> *, McpRequest *:
+<em class="parameter"><code>McpRequestPolicy</code></em> *, McpRequest *:
</td>
</tr></tbody>
</table></div>
diff --git a/doc/reference/mission-control-plugins/tmpl/account-storage.sgml b/doc/reference/mission-control-plugins/tmpl/account-storage.sgml
index d88a486..6a4604f 100644
--- a/doc/reference/mission-control-plugins/tmpl/account-storage.sgml
+++ b/doc/reference/mission-control-plugins/tmpl/account-storage.sgml
@@ -133,6 +133,8 @@ account-storage
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@@ -149,6 +151,8 @@ account-storage
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *, const gchar *:
@@ -165,6 +169,8 @@ account-storage
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
+@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@ const McpAccountStorage *, const McpAccountManager *, const gchar *, const gchar *:
@@ -181,6 +187,8 @@ account-storage
@ const McpAccountStorage *, const McpAccountManager *:
@ const McpAccountStorage *, const McpAccountManager *:
@ const McpAccountStorage *, const McpAccountManager *:
+@ const McpAccountStorage *, const McpAccountManager *:
+@ const McpAccountStorage *, const McpAccountManager *:
@ const McpAccountStorage *, const McpAccountManager *:
@@ -197,6 +205,8 @@ account-storage
@const McpAccountStorage *, const McpAccountManager *am:
@const McpAccountStorage *, const McpAccountManager *am:
@const McpAccountStorage *, const McpAccountManager *am:
+ at const McpAccountStorage *, const McpAccountManager *am:
+ at const McpAccountStorage *, const McpAccountManager *am:
@const McpAccountStorage *, const McpAccountManager *am:
@@ -213,6 +223,8 @@ account-storage
@ const McpAccountStorage *storage, const McpAccountManager *am:
@ const McpAccountStorage *storage, const McpAccountManager *am:
@ const McpAccountStorage *storage, const McpAccountManager *am:
+@ const McpAccountStorage *storage, const McpAccountManager *am:
+@ const McpAccountStorage *storage, const McpAccountManager *am:
@ const McpAccountStorage *storage, const McpAccountManager *am:
diff --git a/doc/reference/mission-control-plugins/tmpl/dispatch-operation-policy.sgml b/doc/reference/mission-control-plugins/tmpl/dispatch-operation-policy.sgml
index d65f72c..73db244 100644
--- a/doc/reference/mission-control-plugins/tmpl/dispatch-operation-policy.sgml
+++ b/doc/reference/mission-control-plugins/tmpl/dispatch-operation-policy.sgml
@@ -54,6 +54,8 @@ dispatch-operation-policy
@McpDispatchOperationPolicy *, McpDispatchOperation *:
@McpDispatchOperationPolicy *, McpDispatchOperation *:
@McpDispatchOperationPolicy *, McpDispatchOperation *:
+ at McpDispatchOperationPolicy *, McpDispatchOperation *:
+ at McpDispatchOperationPolicy *, McpDispatchOperation *:
@McpDispatchOperationPolicy *, McpDispatchOperation *:
diff --git a/doc/reference/mission-control-plugins/tmpl/request-policy.sgml b/doc/reference/mission-control-plugins/tmpl/request-policy.sgml
index ea6ad8b..c04a852 100644
--- a/doc/reference/mission-control-plugins/tmpl/request-policy.sgml
+++ b/doc/reference/mission-control-plugins/tmpl/request-policy.sgml
@@ -54,6 +54,8 @@ request-policy
@McpRequestPolicy *, McpRequest *:
@McpRequestPolicy *, McpRequest *:
@McpRequestPolicy *, McpRequest *:
+ at McpRequestPolicy *, McpRequest *:
+ at McpRequestPolicy *, McpRequest *:
@McpRequestPolicy *, McpRequest *:
--
MC 5 packaging
More information about the Pkg-telepathy-commits
mailing list