Merge lp://staging/~themuso/ubuntu-terminal-app/yakkety-packaging-updates into lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Proposed by
Luke Yelavich
| Status: | Merged |
|---|---|
| Approved by: | Alan Pope 🍺🐧🐱 🦄 |
| Approved revision: | 218 |
| Merged at revision: | 209 |
| Proposed branch: | lp://staging/~themuso/ubuntu-terminal-app/yakkety-packaging-updates |
| Merge into: | lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot |
| Diff against target: |
772 lines (+532/-7) 26 files modified
CMakeLists.txt (+1/-0) debian/changelog (+11/-0) debian/control (+3/-3) debian/copyright (+96/-4) src/app/fileio.cpp (+21/-0) src/app/fileio.h (+21/-0) src/app/qml/AlternateActionPopover.qml (+17/-0) src/app/qml/CircularTransparentButton.qml (+17/-0) src/app/qml/ExpandableButton.qml (+17/-0) src/app/qml/KeyboardBar.qml (+17/-0) src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml (+17/-0) src/app/qml/KeyboardRows/JsonTranslator.qml (+17/-0) src/app/qml/KeyboardRows/KeyModel.qml (+17/-0) src/app/qml/KeyboardRows/KeyboardButton.qml (+17/-0) src/app/qml/KeyboardRows/KeyboardLayout.qml (+17/-0) src/app/qml/KeyboardRows/KeyboardRow.qml (+17/-0) src/app/qml/PressFeedback.qml (+17/-0) src/app/qml/TabsModel.qml (+17/-0) src/app/qml/TabsPage.qml (+17/-0) src/app/qml/TerminalComponent.qml (+17/-0) src/app/qml/TerminalInputArea.qml (+17/-0) src/app/qml/TerminalKeyboardShortcutHandler.qml (+17/-0) src/app/qml/TerminalPage.qml (+17/-0) src/app/qml/TerminalSettings.qml (+17/-0) src/app/qml/ubuntu-terminal-app.qml (+17/-0) terminal.1 (+56/-0) |
| To merge this branch: | bzr merge lp://staging/~themuso/ubuntu-terminal-app/yakkety-packaging-updates |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jenkins Bot | continuous-integration | Approve | |
| Alan Pope 🍺🐧🐱 🦄 (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Packaging fixes in preparation for yakkety:
* Added copyright headers to src/app/qml files that didn't have it.
* Added a manpage to satisfy lintian.
* Updated debian/copyright.
Description of the change
Packaging fixes in preparation for yakkety:
* Added copyright headers to src/app/qml files that didn't have it.
* Added a manpage to satisfy lintian.
* Updated debian/copyright.
To post a comment you must log in.
Revision history for this message
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Many thanks Luke!