Imported Upstream version 3.4.0.2
Laurent Bigonville
12 years ago
0 | commit ff7a5a1efe769532579f3d1f05c0482980fc6295 | |
1 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
2 | Date: Fri Apr 6 09:45:41 2012 +0200 | |
3 | ||
4 | prepare 3.4.0.2 | |
5 | ||
6 | NEWS | 6 ++++++ | |
7 | configure.ac | 4 ++-- | |
8 | 2 files changed, 8 insertions(+), 2 deletions(-) | |
9 | ||
10 | commit bd55c7dec76d6c95d294ee60da616b7fe51d181a | |
11 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
12 | Date: Fri Apr 6 09:42:10 2012 +0200 | |
13 | ||
14 | DISTCHECK_CONFIGURE_FLAGS add --enable-empathy-av | |
15 | ||
16 | Make sure we'll ship empathy-av files in the tarball | |
17 | ||
18 | https://bugzilla.gnome.org/show_bug.cgi?id=673593 | |
19 | ||
20 | Makefile.am | 1 + | |
21 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
22 | ||
23 | commit 85e3defb0a9c38bf0689254d8c2240eeb5733659 | |
24 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
25 | Date: Thu Apr 5 15:58:46 2012 +0200 | |
26 | ||
27 | roster-window: Bring back log entry in individual context menu | |
28 | ||
29 | Looks like it has been accidentally removed. | |
30 | ||
31 | src/empathy-roster-window.c | 1 + | |
32 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
33 | ||
34 | commit c5df89dcd6132acda4e3d52ab56dc9072990b391 | |
35 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | |
36 | Date: Thu Apr 5 15:25:37 2012 +0200 | |
37 | ||
38 | remove released flag | |
39 | ||
40 | configure.ac | 2 +- | |
41 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
42 | ||
0 | 43 | commit beb1e9f725a34f63bbd88744ff92ad6a596574e0 |
1 | 44 | Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> |
2 | 45 | Date: Thu Apr 5 11:02:31 2012 +0200 |
16 | 16 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
17 | 17 | |
18 | 18 | DISTCHECK_CONFIGURE_FLAGS = \ |
19 | --enable-empathy-av \ | |
19 | 20 | --disable-scrollkeeper \ |
20 | 21 | --disable-schemas-install |
21 | 22 |
314 | 314 | SUBDIRS = $(MY_SUBDIRS) $(am__append_1) $(am__append_2) |
315 | 315 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
316 | 316 | DISTCHECK_CONFIGURE_FLAGS = \ |
317 | --enable-empathy-av \ | |
317 | 318 | --disable-scrollkeeper \ |
318 | 319 | --disable-schemas-install |
319 | 320 |
0 | NEW in 3.4.0.2 (06/04/2012) | |
1 | ============== | |
2 | ||
3 | This release fixes the build with --enable-empathy-av and brings back the | |
4 | "Previous conversations" menu item which has been accidentally removed. | |
5 | ||
0 | 6 | NEW in 3.4.0.1 (05/04/2012) |
1 | 7 | ============== |
2 | 8 |
0 | 0 | #! /bin/sh |
1 | 1 | # Guess values for system-dependent variables and create Makefiles. |
2 | # Generated by GNU Autoconf 2.68 for Empathy 3.4.0.1. | |
2 | # Generated by GNU Autoconf 2.68 for Empathy 3.4.0.2. | |
3 | 3 | # |
4 | 4 | # Report bugs to <http://bugzilla.gnome.org/browse.cgi?product=empathy>. |
5 | 5 | # |
575 | 575 | # Identity of this package. |
576 | 576 | PACKAGE_NAME='Empathy' |
577 | 577 | PACKAGE_TARNAME='empathy' |
578 | PACKAGE_VERSION='3.4.0.1' | |
579 | PACKAGE_STRING='Empathy 3.4.0.1' | |
578 | PACKAGE_VERSION='3.4.0.2' | |
579 | PACKAGE_STRING='Empathy 3.4.0.2' | |
580 | 580 | PACKAGE_BUGREPORT='http://bugzilla.gnome.org/browse.cgi?product=empathy' |
581 | 581 | PACKAGE_URL='https://live.gnome.org/Empathy' |
582 | 582 | |
1481 | 1481 | # Omit some internal or obsolete options to make the list less imposing. |
1482 | 1482 | # This message is too long to be a string in the A/UX 3.1 sh. |
1483 | 1483 | cat <<_ACEOF |
1484 | \`configure' configures Empathy 3.4.0.1 to adapt to many kinds of systems. | |
1484 | \`configure' configures Empathy 3.4.0.2 to adapt to many kinds of systems. | |
1485 | 1485 | |
1486 | 1486 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1487 | 1487 | |
1555 | 1555 | |
1556 | 1556 | if test -n "$ac_init_help"; then |
1557 | 1557 | case $ac_init_help in |
1558 | short | recursive ) echo "Configuration of Empathy 3.4.0.1:";; | |
1558 | short | recursive ) echo "Configuration of Empathy 3.4.0.2:";; | |
1559 | 1559 | esac |
1560 | 1560 | cat <<\_ACEOF |
1561 | 1561 | |
1755 | 1755 | test -n "$ac_init_help" && exit $ac_status |
1756 | 1756 | if $ac_init_version; then |
1757 | 1757 | cat <<\_ACEOF |
1758 | Empathy configure 3.4.0.1 | |
1758 | Empathy configure 3.4.0.2 | |
1759 | 1759 | generated by GNU Autoconf 2.68 |
1760 | 1760 | |
1761 | 1761 | Copyright (C) 2010 Free Software Foundation, Inc. |
2038 | 2038 | This file contains any messages produced by compilers while |
2039 | 2039 | running configure, to aid debugging if configure makes a mistake. |
2040 | 2040 | |
2041 | It was created by Empathy $as_me 3.4.0.1, which was | |
2041 | It was created by Empathy $as_me 3.4.0.2, which was | |
2042 | 2042 | generated by GNU Autoconf 2.68. Invocation command line was |
2043 | 2043 | |
2044 | 2044 | $ $0 $@ |
2921 | 2921 | |
2922 | 2922 | # Define the identity of the package. |
2923 | 2923 | PACKAGE='empathy' |
2924 | VERSION='3.4.0.1' | |
2924 | VERSION='3.4.0.2' | |
2925 | 2925 | |
2926 | 2926 | |
2927 | 2927 | # Some tools Automake needs. |
17398 | 17398 | # report actual input values of CONFIG_FILES etc. instead of their |
17399 | 17399 | # values after options handling. |
17400 | 17400 | ac_log=" |
17401 | This file was extended by Empathy $as_me 3.4.0.1, which was | |
17401 | This file was extended by Empathy $as_me 3.4.0.2, which was | |
17402 | 17402 | generated by GNU Autoconf 2.68. Invocation command line was |
17403 | 17403 | |
17404 | 17404 | CONFIG_FILES = $CONFIG_FILES |
17465 | 17465 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
17466 | 17466 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
17467 | 17467 | ac_cs_version="\\ |
17468 | Empathy config.status 3.4.0.1 | |
17468 | Empathy config.status 3.4.0.2 | |
17469 | 17469 | configured by $0, generated by GNU Autoconf 2.68, |
17470 | 17470 | with options \\"\$ac_cs_config\\" |
17471 | 17471 |
3 | 3 | m4_define([empathy_major_version], [3]) |
4 | 4 | m4_define([empathy_minor_version], [4]) |
5 | 5 | m4_define([empathy_micro_version], [0]) |
6 | m4_define([empathy_nano_version], [1]) | |
6 | m4_define([empathy_nano_version], [2]) | |
7 | 7 | |
8 | 8 | dnl Display the nano_version only if it's not '0' |
9 | 9 | m4_define([empathy_base_version], |
0 | [org.freedesktop.Telepathy.Client] | |
1 | Interfaces=org.freedesktop.Telepathy.Client.Handler | |
2 | ||
3 | [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0] | |
4 | org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia | |
5 | org.freedesktop.Telepathy.Channel.TargetHandleType u=1 | |
6 | ||
7 | [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 1] | |
8 | org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia | |
9 | org.freedesktop.Telepathy.Channel.TargetHandleType u=1 | |
10 | org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialAudio b=true | |
11 | ||
12 | [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 2] | |
13 | org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia | |
14 | org.freedesktop.Telepathy.Channel.TargetHandleType u=1 | |
15 | org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialVideo b=true | |
16 | ||
17 | [org.freedesktop.Telepathy.Client.Handler.Capabilities] | |
18 | org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp=true | |
19 | org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p=true | |
20 | org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264=true |
140 | 140 | X-GNOME-Bugzilla-Bugzilla=GNOME |
141 | 141 | X-GNOME-Bugzilla-Product=empathy |
142 | 142 | X-GNOME-Bugzilla-Component=General |
143 | X-GNOME-Bugzilla-Version=3.4.0.1 | |
143 | X-GNOME-Bugzilla-Version=3.4.0.2 |
10 | 10 | X-GNOME-Bugzilla-Bugzilla=GNOME |
11 | 11 | X-GNOME-Bugzilla-Product=empathy |
12 | 12 | X-GNOME-Bugzilla-Component=General |
13 | X-GNOME-Bugzilla-Version=3.4.0.1 | |
13 | X-GNOME-Bugzilla-Version=3.4.0.2 |
289 | 289 | X-GNOME-Bugzilla-Bugzilla=GNOME |
290 | 290 | X-GNOME-Bugzilla-Product=empathy |
291 | 291 | X-GNOME-Bugzilla-Component=General |
292 | X-GNOME-Bugzilla-Version=3.4.0.1 | |
292 | X-GNOME-Bugzilla-Version=3.4.0.2 |
12 | 12 | X-GNOME-Bugzilla-Bugzilla=GNOME |
13 | 13 | X-GNOME-Bugzilla-Product=empathy |
14 | 14 | X-GNOME-Bugzilla-Component=General |
15 | X-GNOME-Bugzilla-Version=3.4.0.1 | |
15 | X-GNOME-Bugzilla-Version=3.4.0.2 |
0 | [D-BUS Service] | |
1 | Name=org.freedesktop.Telepathy.Client.Empathy.AudioVideo | |
2 | Exec=@libexecdir@/empathy-av |