Merge lp://qastaging/~noskcaj/ubuntu/vivid/gtk-doc/merge into lp://qastaging/ubuntu/vivid/gtk-doc
Proposed by
Jackson Doak
| Status: | Approved |
|---|---|
| Approved by: | Iain Lane |
| Approved revision: | 33 |
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/vivid/gtk-doc/merge |
| Merge into: | lp://qastaging/ubuntu/vivid/gtk-doc |
| Diff against target: |
80 lines (+27/-3) 3 files modified
debian/changelog (+20/-0) debian/control (+4/-2) debian/control.in (+3/-1) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/gtk-doc/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Iain Lane | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Revision history for this message
| Iain Lane (laney) wrote | # |
Revision history for this message
| Iain Lane (laney) | # |
review:
Approve
Unmerged revisions
- 33. By Jackson Doak
-
fix typo
- 32. By Jackson Doak
-
* Merge from debian. Remaining changes:
- debian/control.in: Drop optional highlight dependency, which is in
universe.
* Team upload.
* Build-depend on dblatex so that gtkdoc-mkpdf works. Closes: #570751.
* Suggest dblatex as well since it might be useful at runtime.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Uploaded, ta