lp:~ari-tczew/ubuntu/vivid/telepathy-mission-control-5/merge
- Get this branch:
- bzr branch lp:~ari-tczew/ubuntu/vivid/telepathy-mission-control-5/merge
Branch merges
- Daniel Holbach (community): Approve
-
Diff: 336 lines (+77/-30)12 files modifiedChangeLog (+22/-0)
NEWS (+7/-0)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+17/-0)
debian/watch (+1/-0)
doc/reference/mission-control-plugins/html/McpAccountManager.html (+6/-6)
doc/reference/mission-control-plugins/html/McpDispatchOperation.html (+6/-6)
doc/reference/mission-control-plugins/html/index.sgml (+2/-2)
doc/reference/mission-control-plugins/html/mission-control-plugins.devhelp2 (+2/-2)
doc/reference/mission-control-plugins/mission-control-plugins-sections.txt (+2/-2)
src/mcd-connection.c (+1/-1)
Branch information
- Owner:
- Artur Rona
- Status:
- Development
Recent revisions
- 82. By Artur Rona
-
* Merge from Debian unstable. Remaining changes:
- debian/apparmor- profile, debian/control, debian/rules:
+ AppArmor confinement.
- debian/telepathy- mission- control- 5.apport, debian/rules:
+ Apport hook.
* debian/watch: mangle version number to omit epoch
* New upstream stable release - 79. By Martin Pitt
-
* Resynchronize with Debian. Remaining Ubuntu changes:
- AppArmor confinement:
+ debian/apparmor- profile: Profile
+ debian/control: build-depend on dh-apparmor, suggest apparmor
+ debian/rules: install apparmor profile
- Apport hook:
+ debian/telepathy- mission- control- 5.apport
+ debian/rules: Install hook
* Moves from upower to logind (LP: #1330037) - 78. By Sergio Schvezov
-
debian/
apparmor- profile: allowing writes for telepathy-ofono within its
cache dir. - 75. By Sergio Schvezov
-
debian/
apparmor- profile: allow read access to
$HOME/.local/share/ nuntium/ store
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/vivid/telepathy-mission-control-5