Merge lp://qastaging/~noskcaj/ubuntu/vivid/grilo-plugins/split into lp://qastaging/ubuntu/vivid/grilo-plugins
Proposed by
Jackson Doak
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | Tim Lunn | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/vivid/grilo-plugins/split | ||||
| Merge into: | lp://qastaging/ubuntu/vivid/grilo-plugins | ||||
| Diff against target: |
338 lines (+180/-49) 12 files modified
debian/changelog (+7/-0) debian/control (+92/-39) debian/docs (+0/-2) debian/grilo-plugins-0.2-base.docs (+2/-0) debian/grilo-plugins-0.2-base.install (+17/-0) debian/grilo-plugins-0.2-extra.install (+10/-0) debian/grilo-plugins-0.2-extra.lintian-overrides (+2/-0) debian/grilo-plugins-0.2.lintian-overrides (+0/-2) debian/install (+0/-5) debian/patches/guardian_new_API.patch (+44/-0) debian/patches/series (+1/-0) debian/rules (+5/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/grilo-plugins/split | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Lunn (community) | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Split packages into -base and -extra so we can include the -base part in main. This will be included by debian in the next upload, but we need to get this done before FF. Also include a patch to work with the new guardianvideos api
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks Jackson