Merge lp://staging/~townsend/libertine/release-1.2 into lp://staging/libertine/trunk
Status: | Merged |
---|---|
Approved by: | Christopher Townsend |
Approved revision: | 133 |
Merged at revision: | 132 |
Proposed branch: | lp://staging/~townsend/libertine/release-1.2 |
Merge into: | lp://staging/libertine/trunk |
Diff against target: |
1268 lines (+475/-159) 24 files modified
debian/changelog (+26/-0) debian/control (+2/-1) debian/libertine-tools.install (+1/-1) libertine/ContainerConfigList.cpp (+11/-3) libertine/ContainerConfigList.h (+1/-1) libertine/ContainerManager.cpp (+51/-3) libertine/ContainerManager.h (+3/-2) libertine/qml/ContainerInfoView.qml (+52/-2) libertine/qml/ContainerPasswordDialog.qml (+5/-0) libertine/qml/ContainersView.qml (+2/-3) libertine/qml/HomeView.qml (+5/-5) libertine/qml/ManageContainer.qml (+54/-21) libertine/qml/PackageInfoView.qml (+29/-10) libertine/qml/libertine.qml (+52/-27) python/libertine/ChrootContainer.py (+7/-1) python/libertine/Libertine.py (+5/-2) python/libertine/LxcContainer.py (+12/-0) python/libertine/utils.py (+17/-2) tools/CMakeLists.txt (+2/-2) tools/bash_completion.d/libertine-container-manager (+0/-72) tools/completions/libertine-container-manager (+75/-0) tools/libertine-container-manager (+38/-1) tools/libertine-container-manager.1 (+22/-0) tools/update-puritine-containers (+3/-0) |
To merge this branch: | bzr merge lp://staging/~townsend/libertine/release-1.2 |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brandon Schaefer (community) | Approve | ||
Review via email: mp+297503@code.staging.launchpad.net |
Commit message
* Add maliit packages for seeding in containers upon creation. (LP: #1543351)
* Enable title bars in matchbox to work around input focus issue when using OSK in X apps. (LP: #1592549)
* Add the Vivid Stable Overlay PPA to Vivid based chroots during creation. (LP: #1587890)
* Check if ~/.cache/
* Be more verbose when the LXC container won't start. (LP: #1591228)
* Invalid Libertine Scope results after successfully installing or removing a package. (LP: #1592115)
* Add a method to set the default container. (LP: #1589674)
* Show candidate package version when installed version unavailable. (LP: #1589683)
* Install bash completion in modern install directory.
* Show operation details for create container, update container, enable multiarch, install package, and remove package. (LP: #1583323)
Looks reasonable to me