lp:~tiagosh/ubuntu/trusty/telepathy-qt5/group-chat
- Get this branch:
- bzr branch lp:~tiagosh/ubuntu/trusty/telepathy-qt5/group-chat
Branch merges
- Gustavo Pichorim Boiko (community): Approve
-
Diff: 5775 lines (+5535/-31)19 files modified.pc/06-conference_interfaces.patch/TelepathyQt/base-channel-internal.h (+351/-0)
.pc/06-conference_interfaces.patch/TelepathyQt/base-channel.cpp (+1688/-0)
.pc/06-conference_interfaces.patch/TelepathyQt/base-channel.h (+479/-0)
.pc/06-conference_interfaces.patch/TelepathyQt/service-types.h (+97/-0)
.pc/06-conference_interfaces.patch/TelepathyQt/svc-channel.xml (+38/-0)
.pc/07-fix_createChannel.patch/TelepathyQt/base-connection.cpp (+1356/-0)
.pc/07-fix_createChannel.patch/TelepathyQt/base-connection.h (+364/-0)
.pc/applied-patches (+2/-0)
TelepathyQt/base-channel-internal.h (+67/-0)
TelepathyQt/base-channel.cpp (+294/-0)
TelepathyQt/base-channel.h (+113/-0)
TelepathyQt/base-connection.cpp (+7/-29)
TelepathyQt/base-connection.h (+2/-2)
TelepathyQt/service-types.h (+6/-0)
TelepathyQt/svc-channel.xml (+2/-0)
debian/changelog (+9/-0)
debian/patches/06-conference_interfaces.patch (+554/-0)
debian/patches/07-fix_createChannel.patch (+104/-0)
debian/patches/series (+2/-0)
Branch information
- Owner:
- Tiago Salem Herrmann
- Status:
- Development
Recent revisions
- 6. By Tiago Salem Herrmann
-
* debian/
patches/ 06-conference_ interfaces. patch: add conference related interfaces
* debian/patches/ 07-fix_ ensureChannel. patch: pass request details on ensureChannel()
and do not check for TargetHandle and TargetHandleType as managers will take care of
them. - 5. By Timo Jyrinki
-
* debian/
patches/ 05-fix- qt52-build. patch: build against both
Qt 5.0 and 5.2 (thanks to Albert) (LP: #1267835)
* Update symbols files - 4. By Ricardo Salveti
-
debian/
libtelepathy- qt5-dev. install: should also install
libtelepathy-qt5-service. a - 2. By Ricardo Salveti
-
* Renaming source package until upstream supports building both Qt4 and Qt5
versions from the same source (and with Qt5 final)
* Applying changes to port to Qt5 done for Ubuntu Touch:
- 01-force_setInterfaces_ on_call- content- for-dtmf. patch
- 02-adapt_to_work_ with_q5_ final.patch
- 03-add_service_ side_classes. patch
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/trusty/telepathy-qt5