lp:~ubuntu-branches/ubuntu/precise/telepathy-glib/precise-201111092112

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/precise/telepathy-glib

Ubuntu branches: Pending requested 2011-11-09

Diff: 2803 lines (+2792/-0) (has conflicts)

1 file modified

.pc/ludicrous-timeout-for-lp-buildd.patch/tests/dbus/contact-lists.c (+2792/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

70. By Ken VanDine on 2011-11-09

releasing version 0.16.2-1ubuntu1

69. By Ken VanDine on 2011-10-17

releasing version 0.16.0-0ubuntu1

68. By Ken VanDine on 2011-10-17

  - Fixed Connection Manager crash when a client acks the same message
    twice (LP: #838242)
  - Ensure sent messages have a sender even with butterfly, which does
    not set "message-sender" (LP: #80928)
  - TpChannel now trusts the ChannelType property included in
    the dictionary of immutable properties passed to its constructor.
    Practically speaking, this resolves a race condition where channels
    would sometimes fail to prepare (and hence, conversation windows would
    fail to open).
  - TpAccount:normalized-name now refers to XMPP JIDs and ICQ
    UINs, to give examples of what its value means.
  - Fixed unknown handle owners in chat rooms no longer crashes TpChannel.
  - Fixed crash in some situations when using TP_CHANNEL_FEATURE_CONTACTS.
  - Fixed memory leaks in TpConnection and protocol.c
  - Fixed memory leak if the debug message cache is disabled
  - Fix a crash in TpMessageMixin, triggered by delivery reports.
  - Make sure tp_connection_upgrade_contacts() is no-op if all features
    are already prepared
* debian/libtelepathy-glib0.symbols
  - Added new symbols
* debian/control
  - require valac-0.14

67. By Ken VanDine on 2011-10-17

New upstream release.

66. By Ken VanDine on 2011-08-19

* Merged with debian, remaining changes:
  * ludicrous-timeout-for-lp-buildd.patch
    - cope with launchpad-buildd's slightly sad output buffering/handling.

65. By Adam Conrad on 2011-07-18

* Cherry-pick fix from Simon McVittie to create a second tp-glib-tests
  library for the few tests that seem to need to use tp-glib internal
  symbols to avoid GLib assertions when linked with -Bsymbolic
* Add dep3 headers to our timeout patch to make it clear that this
  shouldn't be upstreamed, and not dropped until we fix lp-buildd

64. By Adam Conrad on 2011-07-12

* Resurrect the ludicrous-timeout-for-lp-buildd.patch to cope with
  launchpad-buildd's slightly sad output buffering/handling.
* Merge with Debian/upstream, bringing in several minor fixes.

63. By Laurent Bigonville on 2011-07-06

[ Simon McVittie ]
* Tag patches as applied upstream

[ Laurent Bigonville ]
* debian/patches/fix-ftbfs-ia64.patch: Properly convert the GType with
  GSIZE_TO_POINTER, fix FTBFS on ia64 (Closes: #632326)

62. By Adam Conrad on 2011-06-23

Add our own Ubuntu local patch (for now) to bump the contact-lists
test timeout to a ludicrously long value, as launchpad-buildd has
a bit of a problem coping on our current hardware. (LP: #791271)

61. By Adam Conrad on 2011-06-22

Cherry-pick upstream fix to increase timeout of the contact-lists
test on slower architectures like armel, mips, and mipsel.