Merge lp://qastaging/~timo-jyrinki/ubuntu/utopic/totem/enable_grilo_totem into lp://qastaging/ubuntu/utopic/totem
Proposed by
Timo Jyrinki
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | Iain Lane | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://qastaging/~timo-jyrinki/ubuntu/utopic/totem/enable_grilo_totem | ||||
| Merge into: | lp://qastaging/ubuntu/utopic/totem | ||||
| Diff against target: |
100 lines (+13/-20) 7 files modified
configure.ac (+1/-1) debian/changelog (+9/-0) debian/control (+1/-1) debian/control.in (+1/-1) debian/patches/93_grilo_optional.patch (+0/-16) debian/patches/series (+0/-1) debian/totem-plugins.install (+1/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~timo-jyrinki/ubuntu/utopic/totem/enable_grilo_totem | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Iain Lane | Approve | ||
|
Review via email:
|
|||
Commit message
* Enable grilo for upnp/dlna support (LP: #1035701)
- bring back libgrilo-0.2-dev build-dep
- install grilo plugins
- drop 93_grilo_
To post a comment you must log in.
Revision history for this message
| Doug McMahon (mc3man) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
As mentioned (in bug), if actually going ahead then should take the opportunity to square up the plugin's control.in file > Description: ... as it's currently incorrect & these changes won't make it any less so.
(LP: #1313298