Merge lp://qastaging/~townsend/libertine/release-1.3 into lp://qastaging/libertine/trunk
Proposed by
Christopher Townsend
| Status: | Merged |
|---|---|
| Approved by: | Larry Price |
| Approved revision: | 141 |
| Merged at revision: | 141 |
| Proposed branch: | lp://qastaging/~townsend/libertine/release-1.3 |
| Merge into: | lp://qastaging/libertine/trunk |
| Diff against target: |
3963 lines (+1319/-1135) 38 files modified
data/CMakeLists.txt (+4/-0) data/libertine-lxc-sudo (+1/-0) debian/changelog (+22/-0) debian/control (+2/-0) debian/libertine-tools.install (+0/-3) debian/python3-libertine-lxc.install (+5/-0) libertine/ContainerManager.cpp (+32/-5) libertine/ContainerManager.h (+1/-0) libertine/PasswordHelper.cpp (+0/-123) libertine/PasswordHelper.h (+0/-43) libertine/libertine.cpp (+0/-4) libertine/libertine.h (+0/-2) libertine/qml/AddExtraArchiveView.qml (+117/-0) libertine/qml/ContainerOptionsDialog.qml (+30/-8) libertine/qml/ContainerPasswordDialog.qml (+0/-98) libertine/qml/ContainersView.qml (+1/-2) libertine/qml/ExtraArchivesView.qml (+13/-61) libertine/qml/ManageContainer.qml (+1/-1) libertine/qml/WelcomeView.qml (+1/-2) liblibertine/CMakeLists.txt (+0/-1) po/en_GB.po (+91/-52) po/en_US.po (+388/-336) po/es.po (+96/-54) po/it.po (+79/-54) po/libertine.pot (+120/-100) python/libertine/ContainersConfig.py (+8/-5) python/libertine/Libertine.py (+119/-36) python/libertine/LxcContainer.py (+3/-10) python/libertine/__init__.py (+2/-1) tests/unit/CMakeLists.txt (+7/-11) tests/unit/libertine_launch_tests.py (+12/-34) tools/CMakeLists.txt (+1/-1) tools/libertine-container-manager (+64/-41) tools/libertine-container-manager.1 (+13/-8) tools/libertine-launch (+5/-20) tools/libertine-lxc-setup (+9/-0) tools/libertine-session-bridge (+6/-1) tools/update-puritine-containers (+66/-18) |
| To merge this branch: | bzr merge lp://qastaging/~townsend/libertine/release-1.3 |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Larry Price | Approve | ||
|
Review via email:
|
|||
Commit message
* This creates a LibertineApplic
* Rework the whole way we handle updating the necessary system files for unprivileged LXC's: (LP: #1598785)
- Add new script that does the updates.
- Add sudoers file for this script.
- Remove the password dialog in the UI.
* Add functionality to "favorite" the Libertine scope upon first installation of the Puritine click package. (LP: #1602397)
* Bump version to 1.3.
* Allow adding all forms of additional archives to containers.
* Support adding private PPAs inside of a container. (LP: #1599882)
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
lgtm