Libertine

Merge lp://qastaging/~townsend/libertine/release-1.3.1 into lp://qastaging/libertine/trunk

release-1.3.1
Merge into trunk

Proposed by Christopher Townsend on 2016-08-12

Status:

Merged

Approved by:

Larry Price on 2016-08-12

Approved revision:

153

Merged at revision:

151

Proposed branch:

lp://qastaging/~townsend/libertine/release-1.3.1

Merge into:

lp://qastaging/libertine/trunk

Diff against target:

547 lines (+131/-72)

18 files modified

CMakeLists.txt (+1/-1)
data/CMakeLists.txt (+2/-4)
data/puritine-15.04.1.framework (+0/-2)
debian/changelog (+23/-0)
debian/control (+3/-1)
debian/libertine-tools.install (+0/-2)
debian/python3-libertine-chroot.install (+1/-0)
liblibertine/CMakeLists.txt (+0/-1)
liblibertine/libertine.cpp (+14/-2)
liblibertine/libertine.h (+2/-2)
python/libertine/ChrootContainer.py (+4/-5)
python/libertine/LxcContainer.py (+16/-15)
python/libertine/utils.py (+17/-7)
tools/libertine-container-manager (+8/-6)
tools/libertine-container-manager.1 (+1/-1)
tools/libertine-lxc-manager (+12/-12)
tools/libertine-session-bridge (+7/-4)
tools/update-puritine-containers (+20/-7)

To merge this branch:

bzr merge lp://qastaging/~townsend/libertine/release-1.3.1

Related bugs:

Bug #1579821: Use policykit instead of password entry	Medium	Fix Released
Bug #1606505: /usr/lib/x86_64-linux-gnu/libertine/update-puritine-containers: FileNotFoundError: /usr/lib/x86_64-linux-gnu/libertine/update-puritine-containers@156	Medium	Fix Released
Bug #1607819: No results are shown for containers that have an underscore in the id	Medium	Fix Released
Bug #1608556: liblibertine misses listing applications nested in /usr/share/applications	Medium	Fix Released
Bug #1610123: User directory export broken	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Larry Price		2016-08-12	Approve on 2016-08-12
Review via email: mp+302832@code.qastaging.launchpad.net

Commit message

* Update our dbus session socket path to allow for the new session bus address while still supporting the older way.
* Fix crash where /run/user/$UID/dbus-session doesn't exist when the update-puritine-containers click hook runs. (LP: #1606505)
* Only install the puritine click hook stuff in the python3-libertine-chroot package since puritine is only a chroot and remove the unused puritine framework.
* Bump version to 1.3.1.
* Enforce click requirements for container ID. (LP: #1607819)
* Extend desktop file search to recurse directories. (LP: #1608556)
* Remove unused dependency on pam. (LP: #1579821)
* Create bind-mount directories based on information from xdg-user-dir, and only mount on container startup. (LP: #1610123)

Revision history for this message

Larry Price (larryprice) wrote on 2016-08-12:

Couple quick inline comments - pulling this down now to do a sanity check.

review: Needs Information

lp://qastaging/~townsend/libertine/release-1.3.1 updated on 2016-08-12

152. By Christopher Townsend on 2016-08-12: Update changelog message for a commit.
153. By Christopher Townsend on 2016-08-12: Change project version in CMakeLists to 1.3.1.