Merge lp:~townsend/libertine/release-1.1 into lp:libertine/trunk

[Christopher Townsend]

No commit message necessary due to how ci-train is making changelog entries.

[Stephen M. Webb (bregma)]

No evil code herein. I'm not sure about all the empty translation strings, we'll see if it causes problems during testing.

review: Approve

[lp:~townsend/libertine/release-1.1]

131. By Christopher Townsend on 2016-06-07

Update .pot/.po files for this release.

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-05-02 20:45:21 +0000
+++ data/CMakeLists.txt	2016-06-07 12:41:22 +0000
@@ -1,10 +1,8 @@
-add_subdirectory(demo)
-
 install(FILES libertine.desktop
         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
 install(FILES libertine_64.png libertine-lxc.conf
   DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME})
-install(FILES puritine-click.conf libertine-lxc-manager.conf libertine-xmir.conf
+install(FILES libertine-lxc-manager.conf libertine-xmir.conf
         DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
 install(FILES puritine-15.04.1.framework
         DESTINATION ${CMAKE_INSTALL_DATADIR}/click/frameworks)
 
=== removed directory 'data/demo'
=== removed file 'data/demo/CMakeLists.txt'
--- data/demo/CMakeLists.txt	2015-09-01 20:32:12 +0000
+++ data/demo/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-add_subdirectory(desktop_files)
-
-install(DIRECTORY icons/
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/demo/icons)
 
=== removed directory 'data/demo/desktop_files'
=== removed file 'data/demo/desktop_files/CMakeLists.txt'
--- data/demo/desktop_files/CMakeLists.txt	2015-09-18 14:35:55 +0000
+++ data/demo/desktop_files/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-execute_process(COMMAND dpkg-architecture -qDEB_BUILD_ARCH
-        OUTPUT_VARIABLE BUILD_ARCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-configure_file("puritine_firefox_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_firefox_0.0.desktop" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_firefox_0.0.desktop"
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo")
-
-configure_file("puritine_gedit_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_gedit_0.0.desktop" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_gedit_0.0.desktop"
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo")
-
-configure_file("puritine_gimp_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_gimp_0.0.desktop" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_gimp_0.0.desktop"
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo")
-
-configure_file("puritine_libreoffice-startcenter_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_libreoffice-startcenter_0.0.desktop" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_libreoffice-startcenter_0.0.desktop"
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo")
-
-configure_file("puritine_xchat-gnome_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_xchat-gnome_0.0.desktop" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_xchat-gnome_0.0.desktop"
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo")
 
=== removed file 'data/demo/desktop_files/puritine_firefox_0.0.desktop.in'
--- data/demo/desktop_files/puritine_firefox_0.0.desktop.in	2015-09-18 14:35:55 +0000
+++ data/demo/desktop_files/puritine_firefox_0.0.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Firefox
-Exec=/bin/true
-Type=Application
-StartupNotify=true
-Icon=/usr/share/libertine/demo/icons/firefox.png
-Keywords=Libertine
-NotShowIn=Unity;
-X-Ubuntu-Touch=true
-X-Ubuntu-XMir-Enable=true
 
=== removed file 'data/demo/desktop_files/puritine_gedit_0.0.desktop.in'
--- data/demo/desktop_files/puritine_gedit_0.0.desktop.in	2015-09-18 14:35:55 +0000
+++ data/demo/desktop_files/puritine_gedit_0.0.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Gedit
-Exec=/bin/true
-Type=Application
-StartupNotify=true
-Icon=/usr/share/libertine/demo/icons/accessories-text-editor.svg
-Keywords=Libertine
-NotShowIn=Unity;
-X-Ubuntu-Touch=true
-X-Ubuntu-XMir-Enable=true
 
=== removed file 'data/demo/desktop_files/puritine_gimp_0.0.desktop.in'
--- data/demo/desktop_files/puritine_gimp_0.0.desktop.in	2015-09-18 14:35:55 +0000
+++ data/demo/desktop_files/puritine_gimp_0.0.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=GIMP Image Editor
-Exec=/bin/true
-Type=Application
-StartupNotify=true
-Icon=/usr/share/libertine/demo/icons/gimp.png
-Keywords=Libertine
-NotShowIn=Unity;
-X-Ubuntu-Touch=true
-X-Ubuntu-XMir-Enable=true
 
=== removed file 'data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in'
--- data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in	2015-09-18 14:35:55 +0000
+++ data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=LibreOffice
-Exec=/bin/true
-Type=Application
-StartupNotify=true
-Icon=/usr/share/libertine/demo/icons/libreoffice-startcenter.png
-Keywords=Libertine
-NotShowIn=Unity;
-X-Ubuntu-Touch=true
-X-Ubuntu-XMir-Enable=true
 
=== removed file 'data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in'
--- data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in	2015-09-18 14:35:55 +0000
+++ data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=XChat-GNOME
-Exec=/bin/true
-Type=Application
-StartupNotify=true
-Icon=/usr/share/libertine/demo/icons/xchat-gnome.png
-Keywords=Libertine
-NotShowIn=Unity;
-X-Ubuntu-Touch=true
-X-Ubuntu-XMir-Enable=true
 
=== removed directory 'data/demo/icons'
=== removed file 'data/demo/icons/accessories-text-editor.svg'
--- data/demo/icons/accessories-text-editor.svg	2015-09-01 20:32:12 +0000
+++ data/demo/icons/accessories-text-editor.svg	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg2820" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata id="metadata290">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <defs id="defs2822">
-  <linearGradient id="linearGradient5060">
-   <stop id="stop5062" offset="0"/>
-   <stop id="stop5064" style="stop-opacity:0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3104">
-   <stop id="stop3106" style="stop-color:#a0a0a0" offset="0"/>
-   <stop id="stop3108" style="stop-color:#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2670" y2="26.03" gradientUnits="userSpaceOnUse" x2="9" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -3.6613 16.731)" y1="29.057" x1="9">
-   <stop id="stop2607" style="stop-color:#ece5a5" offset="0"/>
-   <stop id="stop2609" style="stop-color:#fcfbf2" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2673" y2="41.392" gradientUnits="userSpaceOnUse" x2="9.5221" gradientTransform="matrix(.56036 .024186 .024156 .55967 19.547 13.104)" y1="37.372" x1="5.5179">
-   <stop id="stop2613" style="stop-color:#dbce48" offset="0"/>
-   <stop id="stop2615" style="stop-color:#c5b625" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2676" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -2.3288 15.392)" y1="24.99" x1="30.038">
-   <stop id="stop2599" style="stop-color:#b1b1b1" offset="0"/>
-   <stop id="stop2601" style="stop-color:#fff" offset=".5"/>
-   <stop id="stop2603" style="stop-color:#8f8f8f" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2679" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -2.1461 15.208)" y1="24.99" x1="30.038">
-   <stop id="stop2591" style="stop-color:#565656" offset="0"/>
-   <stop id="stop2593" style="stop-color:#9a9a9a" offset=".5"/>
-   <stop id="stop2595" style="stop-color:#545454" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2682" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -2.9668 16.033)" y1="24.99" x1="30.038">
-   <stop id="stop2583" style="stop-color:#b1b1b1" offset="0"/>
-   <stop id="stop2585" style="stop-color:#fff" offset=".5"/>
-   <stop id="stop2587" style="stop-color:#8f8f8f" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2685" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -2.7841 15.849)" y1="24.99" x1="30.038">
-   <stop id="stop2575" style="stop-color:#565656" offset="0"/>
-   <stop id="stop2577" style="stop-color:#9a9a9a" offset=".5"/>
-   <stop id="stop2579" style="stop-color:#545454" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2688" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -3.6017 16.671)" y1="24.99" x1="30.038">
-   <stop id="stop2567" style="stop-color:#b1b1b1" offset="0"/>
-   <stop id="stop2569" style="stop-color:#fff" offset=".5"/>
-   <stop id="stop2571" style="stop-color:#8f8f8f" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2691" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -3.419 16.487)" y1="24.99" x1="30.038">
-   <stop id="stop2559" style="stop-color:#565656" offset="0"/>
-   <stop id="stop2561" style="stop-color:#9a9a9a" offset=".5"/>
-   <stop id="stop2563" style="stop-color:#545454" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2697" y2="31.211" gradientUnits="userSpaceOnUse" x2="23.576" gradientTransform="matrix(.65657 -.65979 .73452 .73087 -1.013 19.863)" y1="25.357" x1="23.576">
-   <stop id="stop2541" style="stop-color:#181818" offset="0"/>
-   <stop id="stop2543" style="stop-color:#dbdbdb" offset=".13483"/>
-   <stop id="stop2545" style="stop-color:#a4a4a4" offset=".20224"/>
-   <stop id="stop2547" style="stop-color:#fff" offset=".26966"/>
-   <stop id="stop2549" style="stop-color:#8d8d8d" offset=".44650"/>
-   <stop id="stop2551" style="stop-color:#959595" offset=".57114"/>
-   <stop id="stop2553" style="stop-color:#cecece" offset=".72038"/>
-   <stop id="stop2555" style="stop-color:#181818" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2973" y2="114.54" gradientUnits="userSpaceOnUse" x2="-60.908" gradientTransform="matrix(.45037 .00027173 -.00027421 .44630 46.808 -6.9909)" y1="13.668" x1="-60.97">
-   <stop id="stop3828" style="stop-color:#f4f4f4" offset="0"/>
-   <stop id="stop3604" style="stop-color:#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient2975" y2="-1.0041" xlink:href="#linearGradient3104" gradientUnits="userSpaceOnUse" x2="11.536" gradientTransform="translate(5e-7 .047615)" y1="44.952" x1="11.536"/>
-  <radialGradient id="radialGradient2978" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.022892 0 0 .012353 26.354 38.471)" r="117.14"/>
-  <radialGradient id="radialGradient2981" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.022892 0 0 .012353 21.646 38.471)" r="117.14"/>
-  <linearGradient id="linearGradient2984" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.066893 0 0 .012353 -.17722 38.471)" y1="366.65" x1="302.86">
-   <stop id="stop5050" style="stop-opacity:0" offset="0"/>
-   <stop id="stop5056" offset=".5"/>
-   <stop id="stop5052" style="stop-opacity:0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient3781" y2="3.0719" xlink:href="#linearGradient3104" gradientUnits="userSpaceOnUse" x2="22.004" y1="44.854" x1="22.004"/>
- </defs>
- <rect id="rect3706" style="opacity:.40206;fill:url(#linearGradient2984)" height="3" width="32.3" y="43" x="7.85"/>
- <path id="path3708" style="opacity:.40206;fill:url(#radialGradient2981)" d="m7.85 43v3c-1.1789 0.006-2.85-0.672-2.85-1.5s1.3156-1.5 2.85-1.5z"/>
- <path id="path3710" style="opacity:.40206;fill:url(#radialGradient2978)" d="m40.15 43v3c1.179 0.006 2.85-0.672 2.85-1.5s-1.316-1.5-2.85-1.5z"/>
- <path id="path2855" style="stroke-linejoin:round;stroke:url(#linearGradient2975);stroke-linecap:round;fill:url(#linearGradient2973)" d="m7.5 3.5c8.522 0.0051 24.478-0.0051 33 0 0.075 1.6058 0.924 38.198 0.999 41-11.666-0.007-23.333-0.014-34.999-0.021 0.0918-3.147 0.9082-39.567 1-40.979z"/>
- <path id="path5685" style="opacity:.59070;stroke-linejoin:round;fill-rule:evenodd;stroke:#f6abab;stroke-linecap:round;stroke-width:0.5;fill:#80b3ff" d="m12.688 4.2499l-0.438 39.5"/>
- <path id="path6656" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.057 9.875l-32.18-0.1845"/>
- <path id="path6658" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.131 11.875l-32.262-0.185"/>
- <path id="path6660" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.214 13.875l-32.428-0.185"/>
- <path id="path6662" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.297 15.875l-32.594-0.185"/>
- <path id="path6664" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.297 17.875l-32.594-0.185"/>
- <path id="path6666" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.379 19.875l-32.758-0.185"/>
- <path id="path7637" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.379 21.875l-32.758-0.185"/>
- <path id="path7639" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.462 23.875l-32.924-0.185"/>
- <path id="path7641" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.462 25.875l-32.924-0.185"/>
- <path id="path7645" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.627 27.875l-33.254-0.185"/>
- <path id="path7647" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.627 29.864l-33.254-0.184"/>
- <path id="path7649" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 31.875l-33.75-0.185"/>
- <path id="path7651" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 33.83l-33.75-0.184"/>
- <path id="path7653" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 35.814l-33.75-0.185"/>
- <path id="path7655" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 37.797l-33.75-0.185"/>
- <path id="path7657" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 39.78l-33.75-0.185"/>
- <path id="path7659" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 41.875l-33.75-0.185"/>
- <path id="path7671" style="opacity:.59070;stroke-linejoin:round;stroke:#b9d5ff;stroke-linecap:round;stroke-width:0.5;fill:none" d="m35.25 4.1673l1.05 39.5"/>
- <path id="path3715" style="stroke:url(#linearGradient3781);stroke-width:1px;fill:none" d="m12.999 11.546h2.348m0.335 0h2.181m0.351 0h1.945m0.32 0h0.838m0.336 0h1.878m0.369 0h4.931m0.335 0h3.757m0.336 0h1.14m-21.4 1.954h3.641m0.423 0h1.74m0.321 0h0.859m0.349 0h1.602m0.336 0h1.643m0.31 0h2.581m0.335 0h3.404m-17.544 1.98h3.081m0.324 0h5.075m0.311 0h2.461m0.316 0h2.302m0.33 0h1.961m0.316 0l3.085 0.02m-19.562 2h4.284m0.337 0h4.63m0.32 0h1.82m0.335 0h4.331m0.292 0h2.968m0.336 0h1.175m0.335 0h0.65m-21.813 2h1.599m0.492 0h5.921m-8.012 10h3.641m0.423 0h1.74m0.321 0h0.859m0.349 0h1.602m0.336 0h1.643m0.31 0h2.581m-13.805 3.98h3.081m0.324 0h5.075m0.311 0h2.461m8.697 0.061h5.027m-24.976-6.041h4.284m0.337 0h4.63m0.32 0h1.82m0.335 0h4.331m-16.057-4h2.348m0.335 0h2.181m0.351 0h1.945m0.32 0h0.838m0.336 0h1.878m0.369 0h4.931m0.335 0h3.757m-19.924 2h3.954m0.311 0h4.199m0.32 0h1.642m0.31 0h3.95m0.317 0h4.314m-19.317 10h3.695m0.397 0h1.629m0.381 0h0.813m0.259 0h1.604m0.213 0h8.492m0.399 0h2.267m0.305 0h0.572m-16.816 2h1.205m-5.415 0h3.857m1.866 0h2.805m0.297 0h4.116m0.32 0h2.793m0.281 0h0.576m0.315 0h3.546m0.363 0h1.856m-18.781 2h1.702m-5.912 0h3.857m2.423 0h2.393"/>
- <path id="path2422" style="opacity:.15;fill:#0c0c0c;fill-rule:evenodd" d="m38.469 23.944c-0.173-0.101-0.307-0.075-0.396-0.018l-11.796 7.511-2.171 1.387-0.067 0.028-2.57 5.792 6.37 0.192 0.053-0.036 2.185-1.379 11.793-7.576c0.354-0.227-0.206-1.731-1.257-3.381-0.788-1.237-1.624-2.214-2.144-2.52z"/>
- <path id="rect2383" style="stroke-linejoin:round;stroke:#0c0c0c;stroke-width:.5;fill:url(#linearGradient2697)" d="m24.934 31.028c0.446-0.334 1.697 0.294 2.847 1.438 1.147 1.141 1.751 2.362 1.424 2.812-0.001 0.002 0.029 0.026 0.027 0.027l16.01-16.088c0.407-0.409-0.225-1.7-1.411-2.88s-2.48-1.806-2.887-1.397l-16.01 16.088z"/>
- <path id="rect3175" style="opacity:.8;stroke-linejoin:round;stroke:#e28ccd;stroke-width:.5;fill:#ffb6ed" d="m38.99 16.903c0.446-0.334 1.697 0.293 2.847 1.438 1.147 1.141 1.752 2.362 1.425 2.812-0.002 0.002 0.028 0.025 0.026 0.027l1.954-1.963 0.04-0.04c0.001-0.002-0.028-0.025-0.027-0.027 0.327-0.45-0.277-1.672-1.424-2.813-1.15-1.144-2.401-1.772-2.847-1.437l-0.04 0.04-1.954 1.963z"/>
- <path id="path3208" style="opacity:.6;fill:#0c0c0c" d="m24.934 31.028c0.446-0.334 1.697 0.294 2.847 1.438 1.147 1.141 1.751 2.362 1.424 2.812-0.001 0.002 0.029 0.026 0.027 0.027l11.026-11.079 0.04-0.041c0.001-0.001-0.028-0.025-0.027-0.026 0.327-0.451-0.278-1.672-1.425-2.813-1.149-1.144-2.401-1.772-2.846-1.437l-0.04 0.04-11.026 11.079z"/>
- <path id="path3233" style="fill:url(#linearGradient2691)" d="m36.8 19.104c0.446-0.334 1.697 0.293 2.847 1.437 1.147 1.142 1.751 2.363 1.424 2.813-0.001 0.002 0.029 0.025 0.027 0.027l0.2-0.2c0.001-0.002-0.028-0.025-0.027-0.027 0.327-0.45-0.278-1.672-1.425-2.813-1.149-1.144-2.401-1.772-2.846-1.437l-0.2 0.2z"/>
- <path id="path3216" style="fill:url(#linearGradient2688)" d="m36.617 19.288c0.446-0.335 1.698 0.293 2.847 1.437 1.147 1.141 1.752 2.363 1.425 2.813-0.002 0.002 0.028 0.025 0.027 0.027l0.199-0.201c0.001-0.001-0.028-0.025-0.027-0.026 0.327-0.451-0.277-1.672-1.424-2.813-1.15-1.144-2.401-1.772-2.847-1.438l-0.2 0.201z"/>
- <path id="path3248" style="fill:url(#linearGradient2685)" d="m37.435 18.466c0.446-0.334 1.697 0.293 2.847 1.437 1.147 1.142 1.751 2.363 1.424 2.813-0.001 0.002 0.028 0.025 0.027 0.027l0.2-0.2c0.001-0.002-0.029-0.025-0.027-0.027 0.327-0.45-0.278-1.672-1.425-2.813-1.149-1.144-2.401-1.772-2.847-1.437l-0.199 0.2z"/>
- <path id="path3250" style="fill:url(#linearGradient2682)" d="m37.252 18.65c0.446-0.335 1.697 0.293 2.847 1.437 1.147 1.141 1.752 2.363 1.425 2.813-0.002 0.002 0.028 0.025 0.026 0.027l0.2-0.201c0.001-0.002-0.028-0.025-0.027-0.027 0.327-0.45-0.277-1.671-1.424-2.812-1.15-1.144-2.401-1.772-2.847-1.438l-0.2 0.201z"/>
- <path id="path3256" style="fill:url(#linearGradient2679)" d="m38.073 17.825c0.446-0.335 1.697 0.293 2.847 1.437 1.147 1.142 1.751 2.363 1.424 2.813-0.001 0.002 0.028 0.025 0.027 0.027l0.2-0.201c0.001-0.001-0.029-0.025-0.027-0.026 0.327-0.451-0.278-1.672-1.425-2.813-1.149-1.144-2.401-1.772-2.847-1.437l-0.199 0.2z"/>
- <path id="path3258" style="fill:url(#linearGradient2676)" d="m37.89 18.009c0.446-0.335 1.697 0.293 2.847 1.437 1.147 1.141 1.752 2.362 1.425 2.813-0.002 0.001 0.028 0.025 0.027 0.026l0.199-0.2c0.001-0.002-0.028-0.025-0.027-0.027 0.327-0.45-0.277-1.671-1.424-2.813-1.15-1.144-2.401-1.771-2.847-1.437l-0.2 0.201z"/>
- <path id="path3270" style="fill-rule:evenodd;stroke:url(#linearGradient2673);stroke-width:.5;fill:url(#linearGradient2670)" d="m21.866 38.31l7.284-2.97 0.062-0.063c0.327-0.45-0.285-1.671-1.432-2.813-1.15-1.144-2.4-1.768-2.846-1.433l-3.068 7.279z"/>
- <path id="path3281" style="fill-rule:evenodd;stroke:#0c0c0c;stroke-width:.5;fill:#0c0c0c" d="m22.697 36.339l-0.831 1.964 1.986-0.815c-0.159-0.191-0.306-0.384-0.497-0.575-0.22-0.219-0.437-0.396-0.658-0.574z"/>
-</svg>
 
=== removed file 'data/demo/icons/firefox.png'
 Binary files data/demo/icons/firefox.png	2015-09-01 20:32:12 +0000 and data/demo/icons/firefox.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/demo/icons/gimp.png'
 Binary files data/demo/icons/gimp.png	2015-09-01 20:32:12 +0000 and data/demo/icons/gimp.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/demo/icons/libreoffice-startcenter.png'
 Binary files data/demo/icons/libreoffice-startcenter.png	2015-09-01 20:32:12 +0000 and data/demo/icons/libreoffice-startcenter.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/demo/icons/xchat-gnome.png'
 Binary files data/demo/icons/xchat-gnome.png	2015-09-01 20:32:12 +0000 and data/demo/icons/xchat-gnome.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/puritine-click.conf'
--- data/puritine-click.conf	2016-04-25 15:45:05 +0000
+++ data/puritine-click.conf	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-description "Puritine Click chroot linking"
-
-start on starting unity8
-
-script
-PACKAGE_PATH=`click pkgdir com.ubuntu.puritine`
-CONTAINER_NAME=puritine
-CHROOT_PATH=$PACKAGE_PATH/libertine-data/libertine-container/$CONTAINER_NAME
-
-if [ -x $CHROOT_PATH/rootfs ] ; then
-	# Link the chroot
-	if [ ! -L $HOME/.cache/libertine-container/$CONTAINER_NAME/rootfs ] ; then
-		mkdir -p $HOME/.cache/libertine-container/$CONTAINER_NAME/
-		ln -s $CHROOT_PATH/rootfs $HOME/.cache/libertine-container/$CONTAINER_NAME/rootfs
-	fi
-
-	# Copy or merge the container config files
-	if [ ! -e $HOME/.local/share/libertine/ContainersConfig.json ] ; then
-		mkdir -p $HOME/.local/share/libertine/
-		cp $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json $HOME/.local/share/libertine/ContainersConfig.json
-	elif [ -L $HOME/.local/share/libertine/ContainersConfig.json ] ; then
-		rm $HOME/.local/share/libertine/ContainersConfig.json
-		cp $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json $HOME/.local/share/libertine/ContainersConfig.json
-	else
-		libertine-container-manager merge-configs -f $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json    
-	fi
-
-	# Create and copy the user-data dir from the click package
-	if [ ! -d $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME ] ; then
-		cp -dR $PACKAGE_PATH/libertine-config/libertine-container/ $HOME/.local/share/libertine-container/
-	fi
-else
-	rm -rf $HOME/.cache/libertine-container/$CONTAINER_NAME
-	if [ $(libertine-container-manager list | grep -v ${CONTAINER_NAME} | wc -l) -eq 0 ]; then
-		rm -rf $HOME/.local/share/libertine
-	fi
-	rm -rf $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME/.config/
-fi
-end script
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-05-19 17:53:58 +0000
+++ debian/changelog	2016-06-07 12:41:22 +0000
@@ -1,3 +1,26 @@
+libertine (1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Brandon Schaefer ]
+  * Set up a new proxy socket for the maliit server.
+
+  [ Chris Townsend ]
+  * Remove the demo icons and desktop files and deprecate libertine-demo.
+    (LP: #1575315)
+  * Explicitly create .config/dconf and the common XDG data directories in the
+    user container's mapped home directory in order to make sure the file
+    permissions are correct. (LP: #1570961) (LP: #1581131)
+  * Bump version to 1.1.
+
+  [ Larry Price ]
+  * Make it possible for the user to interact with debconf prompts from apt-get.
+    (LP: #1518814)
+  * Refactor ContainerManagerWorker to use the async QProcess API.
+  * Reap children processes when closing GUI and attempt to recover as necessary.
+  * Implement bash auto-completion for libertine-container-manager.
+    (LP: #1580610)
+
+ -- Chris Townsend <[e-mail]>  Mon, 06 Jun 2016 16:50:28 -0400
+
 libertine (1.0.4+16.10.20160519-0ubuntu1) yakkety; urgency=medium
 
   [ Chris Townsend ]
 
=== modified file 'debian/control'
--- debian/control	2016-04-28 22:06:04 +0000
+++ debian/control	2016-06-07 12:41:22 +0000
@@ -22,6 +22,7 @@
                python3-psutil,
                python3-testtools,
                python3-xdg,
+               python3-dbus,
                qtdeclarative5-dev
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/libertine
@@ -32,6 +33,7 @@
          python3-libertine-lxc,
          qml-module-qtquick2,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
+         python3-dbus,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: sandbox for running deb-packaged X11 apps on Ubuntu Personal
@@ -48,6 +50,8 @@
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
+Breaks: libertine-demo
+Replaces: libertine-demo
 Description: CLI tools for running deb-packaged X11 apps on Ubuntu Personal
  Command-line tools that can be used for creating, manipulating, and using
  the Ubuntu Personal sandbox for legacy Deb-packaged X11 applicatons.
@@ -131,14 +135,4 @@
  This package provides the chroot-based container back end module for the
  Libertine sandbox.  This container back end module is intended only for
  curated containers distributed for devices that do not support unprivileged
- LXC contaiers.
-
-Package: libertine-demo
-Architecture: any
-Multi-Arch: allowed
-Depends: libertine-tools,
-         python3-libertine-chroot,
-         ${misc:Depends}
-Description: Adds desktop files and icon for Unity 8 desktop support
- Add desktop files and icons for the targeted applications needed for legacy
- X application support on Unity 8.
+ LXC containers.
 
=== removed file 'debian/libertine-demo.install'
--- debian/libertine-demo.install	2015-11-06 21:28:21 +0000
+++ debian/libertine-demo.install	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-data/demo/icons/* usr/share/libertine/demo/icons/
-usr/share/applications/demo/* usr/share/applications/
-usr/share/upstart/sessions/puritine-click.conf
-usr/share/click/frameworks/puritine-15.04.1.framework
 
=== removed file 'debian/libertine-demo.lintian-overrides'
--- debian/libertine-demo.lintian-overrides	2015-09-02 12:55:00 +0000
+++ debian/libertine-demo.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_firefox_0.0.desktop bin/true
-libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_gedit_0.0.desktop bin/true
-libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_gimp_0.0.desktop bin/true
-libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_libreoffice-startcenter_0.0.desktop bin/true
-libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_xchat-gnome_0.0.desktop bin/true
 
=== modified file 'debian/libertine-tools.install'
--- debian/libertine-tools.install	2016-05-02 20:45:21 +0000
+++ debian/libertine-tools.install	2016-06-07 12:41:22 +0000
@@ -3,8 +3,10 @@
 usr/bin/libertine-container-manager
 usr/bin/libertine-lxc-manager
 usr/bin/libertine-xmir
+etc/bash_completion.d/libertine-container-manager
 usr/lib/*/libertine/update-puritine-containers
 usr/share/man
 usr/share/libertine/libertine-lxc.conf
 usr/share/upstart/sessions/libertine-lxc-manager.conf
 usr/share/upstart/sessions/libertine-xmir.conf
+usr/share/click/frameworks/puritine-15.04.1.framework
 
=== modified file 'libertine/ContainerManager.cpp'
--- libertine/ContainerManager.cpp	2016-05-11 17:26:27 +0000
+++ libertine/ContainerManager.cpp	2016-06-07 12:41:22 +0000
@@ -18,7 +18,6 @@
  */
 #include "libertine/ContainerManager.h"
 
-#include <QtCore/QProcess>
 
 namespace
 {
@@ -27,453 +26,245 @@
 static const QString PACKAGE_REMOVAL_FAILED = QObject::tr("Removal of package %1 failed");
 static const QString PACKAGE_SEARCH_FAILED = QObject::tr("Searching for query %1 failed");
 static const QString CONTAINER_UPDATE_FAILED = QObject::tr("Updating container %1 failed");
+static const QString CONTAINER_CREATE_FAILED = QObject::tr("Creating container %1 failed");
+static const QString CONTAINER_DESTROY_FAILED = QObject::tr("Destroying container %1 failed");
 static const QString RUN_COMMAND_FAILED = QObject::tr("Running command %1 failed");
 static const QString CONTAINER_CONFIGURE_FAILED = QObject::tr("Attempt to configure container %1 failed");
+constexpr auto libertine_container_manager_tool = "libertine-container-manager";
+
 
 static const QString readAllStdOutOrStdErr(QProcess& proc)
 {
   auto out = proc.readAllStandardOutput();
   return out.isEmpty() ? proc.readAllStandardError() : out;
 }
-}
-const QString ContainerManagerWorker::libertine_container_manager_tool = "libertine-container-manager";
+
+
+static void pidKiller(const QString& pid, bool shouldKill = true)
+{
+  QProcess list_child_pids;
+  list_child_pids.start("pgrep", QStringList{"-P", pid});
+  list_child_pids.waitForFinished();
+  auto pids = QString::fromUtf8(list_child_pids.readAllStandardOutput()).split('\n', QString::SkipEmptyParts);
+  for (const auto& child: pids)
+  {
+    pidKiller(child);
+  }
+  if (shouldKill)
+  {
+    QProcess::execute("kill " + pid);
+  }
+}
+}
 
 
 ContainerManagerWorker::
 ContainerManagerWorker()
-{ }
-
-
-ContainerManagerWorker::
-ContainerManagerWorker(ContainerAction container_action,
-                       QString const& container_id,
-                       QString const& container_type)
-: container_action_(container_action)
-, container_id_(container_id)
-, container_type_(container_type)
-{ }
-
-
-ContainerManagerWorker::
-ContainerManagerWorker(ContainerAction container_action,
-                       QString const& container_id,
-                       QString const& container_type,
-                       QString const& data)
-: container_action_(container_action)
-, container_id_(container_id)
-, container_type_(container_type)
-, data_(data)
-{ }
-
-
-ContainerManagerWorker::
-ContainerManagerWorker(ContainerAction container_action,
-                       QString const& container_id,
-                       QString const& container_type,
-                       QStringList data_list)
-: container_action_(container_action)
-, container_id_(container_id)
-, container_type_(container_type)
-, data_list_(data_list)
-{ }
+{
+  connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &QObject::deleteLater);
+}
 
 
 ContainerManagerWorker::
 ~ContainerManagerWorker()
-{ }
-
-
-ContainerManagerWorker::ContainerAction ContainerManagerWorker::
-container_action() const
-{ return container_action_; }
-
-
-void ContainerManagerWorker::
-container_action(ContainerAction container_action)
-{
-  container_action_ = container_action;
-}
-
-
-QString const& ContainerManagerWorker::
-container_id() const
-{ return container_id_; }
-
-
-void ContainerManagerWorker::
-container_id(QString const& container_id)
-{
-  container_id_ = container_id;
-}
-
-
-QString const& ContainerManagerWorker::
-container_type() const
-{ return container_type_; }
-
-
-void ContainerManagerWorker::
-container_type(QString const& container_type)
-{
-  container_type_ = container_type;
-}
-
-
-QString const& ContainerManagerWorker::
-container_distro() const
-{ return container_distro_; }
-
-
-void ContainerManagerWorker::
-container_distro(QString const& container_distro)
-{
-  if (container_distro != container_distro_)
-  {
-    container_distro_ = container_distro;
-  }
-}
-
-
-QString const& ContainerManagerWorker::
-container_name() const
-{ return container_name_; }
-
-
-void ContainerManagerWorker::
-container_name(QString const& container_name)
-{
-  if (container_name != container_name_)
-  {
-    container_name_ = container_name;
-  }
-}
-
-
-bool ContainerManagerWorker::
-container_multiarch()
-{ return container_multiarch_; }
-
-
-void ContainerManagerWorker::
-container_multiarch(bool container_multiarch)
-{
-  if (container_multiarch != container_multiarch_)
-  {
-    container_multiarch_ = container_multiarch;
-  }
-}
-
-
-QString const& ContainerManagerWorker::
-data() const
-{ return data_; }
-
-
-void ContainerManagerWorker::
-data(QString const& data)
-{
-  data_ = data;
-}
-
-
-QStringList ContainerManagerWorker::
-data_list()
-{ return data_list_; }
-
-
-void ContainerManagerWorker::
-data_list(QStringList data_list)
-{
-  data_list_ = data_list;
-}
-
-
-void ContainerManagerWorker::
-run()
-{
-  switch(container_action_)
-  {
-    case ContainerAction::Create:
-      createContainer(data_);
-      break;
-
-    case ContainerAction::Destroy:
-      destroyContainer();
-      break;
-
-    case ContainerAction::Install:
-      installPackage(data_);
-      break;
-
-    case ContainerAction::Remove:
-      removePackage(data_);
-      break;
-
-    case ContainerAction::Search:
-      searchPackageCache(data_);
-      break;
-
-    case ContainerAction::Update:
-      updateContainer();
-      break;
-
-    case ContainerAction::Exec:
-      runCommand(data_);
-      break;
-
-    case ContainerAction::Configure:
-      configureContainer(data_list_);
-      break;
-
-    default:
-      break;
-  }
-}
-
-
-void ContainerManagerWorker::
-createContainer(QString const& password)
-{
-  QProcess libertine_cli_tool;
-  QString exec_line = libertine_container_manager_tool;
-  QStringList args;
-
-  args << "create" << "-i" << container_id_ << "-d" << container_distro_ << "-n" << container_name_;
-
-  if (container_multiarch_)
+{
+  if (process_.state() == QProcess::Running)
+  {
+    pidKiller(QString::number(process_.pid()), false);
+    process_.close();
+  }
+}
+
+
+void ContainerManagerWorker::
+createContainer(const QString& id, const QString& name, const QString& distro, bool multiarch, const QString& password)
+{
+  connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+          [=](int exitCode, QProcess::ExitStatus){
+    if (exitCode != 0)
+    {
+      emit error(CONTAINER_CREATE_FAILED.arg(id), process_.readAllStandardError());
+    }
+  });
+  connect(&process_, &QProcess::started, [=]() {
+    process_.write(password.toUtf8());
+    process_.closeWriteChannel();
+  });
+
+  QStringList args{"create", "-i", id, "-d", distro, "-n", name};
+  if (multiarch)
   {
     args << "-m";
   }
-
-  libertine_cli_tool.start(exec_line, args);
-
-  if (!libertine_cli_tool.waitForStarted())
-  {
-    emit error(FAILED_TO_START.arg(libertine_container_manager_tool), libertine_cli_tool.readAll());
-    quit();
-    return;
-  }
-
-  libertine_cli_tool.write(password.toStdString().c_str());
-  libertine_cli_tool.closeWriteChannel();
-
-  libertine_cli_tool.waitForFinished(-1);
-
-  quit();
-}
-
-
-void ContainerManagerWorker::
-destroyContainer()
-{
-  QProcess libertine_cli_tool;
-  QString exec_line = libertine_container_manager_tool;
-  QStringList args;
-
-  args << "destroy" << "-i" << container_id_;
-  libertine_cli_tool.start(exec_line, args);
-
-  if (!libertine_cli_tool.waitForStarted())
-  {
-    emit error(FAILED_TO_START.arg(libertine_container_manager_tool), libertine_cli_tool.readAll());
-    quit();
-    return;
-  }
-
-  libertine_cli_tool.waitForFinished(-1);
-
-  emit finishedDestroy(container_id_);
-  quit();
-}
-
-
-void ContainerManagerWorker::
-installPackage(QString const& package_name)
-{
-  QProcess libertine_cli_tool;
-  QString exec_line = libertine_container_manager_tool;
-  QStringList args;
-
-  args << "install-package" << "-i" << container_id_ << "-p" << package_name;
-
-  libertine_cli_tool.start(exec_line, args);
-
-  if (!libertine_cli_tool.waitForStarted())
-  {
-    emit error(FAILED_TO_START.arg(libertine_container_manager_tool), libertine_cli_tool.readAll());
-    quit();
-    return;
-  }
-  libertine_cli_tool.waitForFinished(-1);
-  if (libertine_cli_tool.exitCode() != 0)
-  {
-    emit error(PACKAGE_INSTALLATION_FAILED.arg(package_name), libertine_cli_tool.readAllStandardError());
-  }
-  quit();
-}
-
-
-void ContainerManagerWorker::
-removePackage(QString const& package_name)
-{
-  QProcess libertine_cli_tool;
-  QString exec_line = libertine_container_manager_tool;
-  QStringList args;
-
-  args << "remove-package" << "-i" << container_id_ << "-p" << package_name;
-  libertine_cli_tool.start(exec_line, args);
-
-  if (!libertine_cli_tool.waitForStarted())
-  {
-    emit error(FAILED_TO_START.arg(libertine_container_manager_tool), libertine_cli_tool.readAllStandardError());
-    quit();
-    return;
-  }
-
-  libertine_cli_tool.waitForFinished(-1);
-  if (libertine_cli_tool.exitCode() != 0)
-  {
-    emit error(PACKAGE_REMOVAL_FAILED.arg(package_name), readAllStdOutOrStdErr(libertine_cli_tool));
-    quit();
-    return;
-  }
-  quit();
-}
-
-
-void ContainerManagerWorker::
-searchPackageCache(QString const& search_string)
-{
-  QProcess libertine_cli_tool;
-  QString exec_line = libertine_container_manager_tool;
-  QStringList args;
-  QByteArray search_output;
-  QList<QString> packageList;
-
-  args << "search-cache" << "-i" << container_id_ << "-s" << search_string;
-  libertine_cli_tool.start(exec_line, args);
-
-  if (!libertine_cli_tool.waitForStarted())
-  {
-    emit error(FAILED_TO_START.arg(libertine_container_manager_tool), libertine_cli_tool.readAll());
-    quit();
-    return;
-  }
-
-  libertine_cli_tool.waitForFinished(-1);
-  if (libertine_cli_tool.exitCode() != 0)
-  {
-    QString err(libertine_cli_tool.readAllStandardError());
-    if (!err.isEmpty())
-    {
-      emit error(PACKAGE_SEARCH_FAILED.arg(search_string), err);
-      quit();
-      return;
-    }
-    // if there is no error message, there probably were no packages found
-    // continue to return an empty list
-  }
-  else
-  {
-    search_output = libertine_cli_tool.readAllStandardOutput();
-    QList<QByteArray> packages = search_output.split('\n');
-
-    for (const auto& package: packages)
-    {
-      packageList.append(QString(package));
-    }
-  }
-
-  emit finishedSearch(packageList);
-  quit();
-}
-
-
-void ContainerManagerWorker::
-updateContainer()
-{
-  QProcess libertine_cli_tool;
-  QString exec_line = libertine_container_manager_tool;
-  QStringList args;
-
-  args << "update" << "-i" << container_id_;
-
-  libertine_cli_tool.start(exec_line, args);
-
-  if (!libertine_cli_tool.waitForStarted())
-  {
-    emit error(FAILED_TO_START.arg(libertine_container_manager_tool), libertine_cli_tool.readAll());
-    quit();
-    return;
-  }
-
-  libertine_cli_tool.waitForFinished(-1);
-  if (libertine_cli_tool.exitCode() != 0)
-  {
-    emit error(CONTAINER_UPDATE_FAILED.arg(container_name_), readAllStdOutOrStdErr(libertine_cli_tool));
-    quit();
-    return;
-  }
-
-  quit();
-}
-
-
-void ContainerManagerWorker::
-runCommand(QString const& command_line)
-{
-  QProcess libertine_cli_tool;
-  QString exec_line = libertine_container_manager_tool, command_output, error_msg;
-  QStringList args;
-
-  args << "exec" << "-i" << container_id_ << "-c" << command_line;
-
-  libertine_cli_tool.start(exec_line, args);
-
-  if (!libertine_cli_tool.waitForStarted())
-  {
-    emit error(FAILED_TO_START.arg(libertine_container_manager_tool), libertine_cli_tool.readAll());
-    quit();
-    return;
-  }
-  libertine_cli_tool.waitForFinished(-1);
-  if (libertine_cli_tool.exitCode() != 0)
-  {
-    emit error(RUN_COMMAND_FAILED.arg(command_line), readAllStdOutOrStdErr(libertine_cli_tool));
-    quit();
-    return;
-  }
-
-  emit finishedCommand(libertine_cli_tool.readAllStandardOutput());
-  quit();
-}
-
-
-void ContainerManagerWorker::
-configureContainer(QStringList configure_command)
-{
-  QProcess libertine_cli_tool;
-  QString exec_line = libertine_container_manager_tool;
-  QStringList args;
-
-  args << "configure" << "-i" << container_id_ << configure_command.at(0) << configure_command.mid(1);
-
-  libertine_cli_tool.start(exec_line, args);
-
-  if (!libertine_cli_tool.waitForStarted())
-  {
-    emit error(FAILED_TO_START.arg(libertine_container_manager_tool), libertine_cli_tool.readAll());
-    quit();
-    return;
-  }
-
-  libertine_cli_tool.waitForFinished(-1);
-
-  if (libertine_cli_tool.exitCode() != 0)
-  {
-    error(CONTAINER_CONFIGURE_FAILED.arg(container_name_), readAllStdOutOrStdErr(libertine_cli_tool));
-  }
-
-  emit finishedConfigure();
-  quit();
+  process_.start(libertine_container_manager_tool, args);
+}
+
+
+void ContainerManagerWorker::
+destroyContainer(const QString& id)
+{
+  connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+          [=](int exitCode, QProcess::ExitStatus){
+    if (exitCode != 0)
+    {
+      emit error(CONTAINER_DESTROY_FAILED.arg(id), process_.readAllStandardError());
+    }
+    emit finishedDestroy(id);
+  });
+
+  process_.start(libertine_container_manager_tool, QStringList{"destroy", "-i", id});
+}
+
+
+void ContainerManagerWorker::
+packageOperationInteraction(const QString& input)
+{
+  if (process_.state() == QProcess::Running)
+  {
+    process_.write(input.toUtf8() + "\n");
+  }
+}
+
+
+void ContainerManagerWorker::
+installPackage(const QString& container_id, const QString& package_name)
+{
+  connect(&process_, &QProcess::readyRead, [=](){
+    auto output = process_.readAllStandardOutput();
+    if (!output.isEmpty())
+    {
+      emit updatePackageOperationDetails(container_id, package_name, output);
+      process_output_ += output;
+    }
+  });
+  connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+          [=](int exitCode, QProcess::ExitStatus){
+    if (exitCode != 0)
+    {
+      auto stderr = process_.readAllStandardError();
+      emit error(PACKAGE_INSTALLATION_FAILED.arg(package_name), stderr.isEmpty() ? process_output_ : stderr);
+    }
+     emit packageOperationFinished(container_id, package_name);
+  });
+
+  process_.start(libertine_container_manager_tool, QStringList{"install-package", "-i", container_id, "-p", package_name, "-r"});
+}
+
+
+void ContainerManagerWorker::
+removePackage(const QString& container_id, const QString& package_name)
+{
+  connect(&process_, &QProcess::readyRead, [=](){
+    auto output = process_.readAllStandardOutput();
+    if (!output.isEmpty())
+    {
+      emit updatePackageOperationDetails(container_id, package_name, output);
+      process_output_ += output;
+    }
+  });
+  connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+          [=](int exitCode, QProcess::ExitStatus){
+    if (exitCode != 0)
+    {
+      emit error(PACKAGE_INSTALLATION_FAILED.arg(package_name), process_output_.isEmpty() ? process_.readAllStandardError() : process_output_);
+    }
+  });
+
+  process_.start(libertine_container_manager_tool, QStringList{"remove-package", "-i", container_id, "-p", package_name, "-r"});
+}
+
+
+void ContainerManagerWorker::
+searchPackageCache(const QString& container_id, const QString& search_string)
+{
+  connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+          [=](int exitCode, QProcess::ExitStatus){
+    QList<QString> packageList;
+    if (exitCode != 0)
+    {
+      QString err(process_.readAllStandardError());
+      if (!err.isEmpty())
+      {
+        emit error(PACKAGE_SEARCH_FAILED.arg(search_string), err);
+      }
+      // if there is no error message, there probably were no packages found
+      // continue to return an empty list
+    }
+    else
+    {
+      auto search_output = process_.readAllStandardOutput();
+      QList<QByteArray> packages = search_output.split('\n');
+
+      for (const auto& package: packages)
+      {
+        packageList.append(QString(package));
+      }
+    }
+
+    emit finishedSearch(packageList);
+  });
+
+  process_.start(libertine_container_manager_tool, QStringList{"search-cache", "-i", container_id, "-s", search_string});
+}
+
+
+void ContainerManagerWorker::
+updateContainer(const QString& container_id, const QString& container_name)
+{
+  connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+          [=](int exitCode, QProcess::ExitStatus){
+    if (exitCode != 0)
+    {
+      emit error(CONTAINER_UPDATE_FAILED.arg(container_name), readAllStdOutOrStdErr(process_));
+    }
+  });
+
+  process_.start(libertine_container_manager_tool, QStringList{"update", "-i", container_id});
+}
+
+
+void ContainerManagerWorker::
+runCommand(const QString& container_id, const QString& container_name, const QString& command_line)
+{
+  connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+          [=](int exitCode, QProcess::ExitStatus){
+    if (exitCode != 0)
+    {
+      emit error(RUN_COMMAND_FAILED.arg(container_name), readAllStdOutOrStdErr(process_));
+    }
+    else
+    {
+      emit finishedCommand(process_.readAllStandardOutput());
+    }
+  });
+
+  process_.start(libertine_container_manager_tool, QStringList{"exec", "-i", container_id, "-c", command_line});
+}
+
+
+void ContainerManagerWorker::
+configureContainer(const QString& container_id, const QString& container_name, const QStringList& configure_command)
+{
+  connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+          [=](int exitCode, QProcess::ExitStatus){
+    if (exitCode != 0)
+    {
+      emit error(CONTAINER_CONFIGURE_FAILED.arg(container_name), readAllStdOutOrStdErr(process_));
+    }
+    else
+    {
+      emit finishedConfigure();
+    }
+  });
+
+  QStringList args{"configure", "-i", container_id};
+  args << configure_command.at(0) << configure_command.mid(1);
+  process_.start(libertine_container_manager_tool, args);
+}
+
+
+void ContainerManagerWorker::
+fixIntegrity()
+{
+  process_.start(libertine_container_manager_tool, QStringList{"fix-integrity"});
 }
 
=== modified file 'libertine/ContainerManager.h'
--- libertine/ContainerManager.h	2016-05-04 19:41:25 +0000
+++ libertine/ContainerManager.h	2016-06-07 12:41:22 +0000
@@ -23,122 +23,33 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QThread>
+#include <QtCore/QProcess>
 
 class ContainerManagerWorker
-: public QThread
+: public QObject
 {
   Q_OBJECT
-  Q_ENUMS(ContainerAction)
-  Q_PROPERTY(ContainerAction containerAction READ container_action WRITE container_action NOTIFY containerActionChanged)
-  Q_PROPERTY(QString containerId READ container_id WRITE container_id NOTIFY containerIdChanged)
-  Q_PROPERTY(QString containerType READ container_type WRITE container_type NOTIFY containerTypeChanged)
-  Q_PROPERTY(QString containerDistro READ container_distro WRITE container_distro NOTIFY containerDistroChanged)
-  Q_PROPERTY(QString containerName READ container_name WRITE container_name NOTIFY containerNameChanged)
-  Q_PROPERTY(bool containerMultiarch READ container_multiarch WRITE container_multiarch)
-  Q_PROPERTY(QString data READ data WRITE data NOTIFY dataChanged)
-  Q_PROPERTY(QStringList data_list READ data_list WRITE data_list NOTIFY dataListChanged) 
-
-public:
-  static const QString libertine_container_manager_tool;
-
-  enum class ContainerAction
-  : int
-  {
-    Create,
-    Destroy,
-    Install,
-    Remove,
-    Search,
-    Update,
-    Exec,
-    Configure
-  };
-
-public:
-  ContainerManagerWorker();
-  ContainerManagerWorker(ContainerAction container_action,
-                         QString const& container_id,
-                         QString const& container_type);
-  ContainerManagerWorker(ContainerAction container_action,
-                         QString const& container_id,
-                         QString const& container_type,
-                         QString const& data);
-  ContainerManagerWorker(ContainerAction container_action,
-                         QString const& container_id,
-                         QString const& container_type,
-                         QStringList data_list);
-  ~ContainerManagerWorker();
-
-  ContainerAction
-  container_action() const;
-
-  void
-  container_action(ContainerAction container_action);
-
-  QString const&
-  container_id() const;
-
-  void
-  container_id(QString const& container_id);
-
-  QString const&
-  container_type() const;
-
-  void
-  container_type(QString const& container_type);
-
-  QString const&
-  container_distro() const;
-
-  void
-  container_distro(QString const& container_distro);
-
-  QString const&
-  container_name() const;
-
-  void
-  container_name(QString const& container_name);
-
-  bool
-  container_multiarch();
-
-  void
-  container_multiarch(bool container_multiarch);
-
-  QString const&
-  data() const;
-
-  void
-  data(QString const& data);
-
-  QStringList
-  data_list();
-
-  void
-  data_list(QStringList data_list);
-
-protected:
-  void run() Q_DECL_OVERRIDE;
-
-private:
-  void createContainer(QString const& password);
-  void destroyContainer();
-  void installPackage(QString const& package_name);
-  void removePackage(QString const& package_name);
-  void searchPackageCache(QString const& search_string);
-  void updateContainer();
-  void runCommand(QString const& command_line);
-  void configureContainer(QStringList configure_command);
-
-private:
-  ContainerAction container_action_;
-  QString container_id_;
-  QString container_type_;
-  QString container_distro_;
-  QString container_name_;
-  bool container_multiarch_;
-  QString data_;
-  QStringList data_list_;
+
+public:
+  explicit ContainerManagerWorker();
+  virtual ~ContainerManagerWorker();
+
+  Q_INVOKABLE void createContainer(const QString& id, const QString& name, const QString& distro, bool multiarch, const QString& password);
+  Q_INVOKABLE void destroyContainer(const QString& id);
+  Q_INVOKABLE void installPackage(const QString& id, const QString& package_name);
+  Q_INVOKABLE void removePackage(const QString& container_id, const QString& package_name);
+  Q_INVOKABLE void searchPackageCache(const QString& container_id, const QString& search_string);
+  Q_INVOKABLE void updateContainer(const QString& container_id, const QString& container_name);
+  Q_INVOKABLE void runCommand(const QString& container_id, const QString& container_name, const QString& command_line);
+  Q_INVOKABLE void configureContainer(const QString& container_id, const QString& container_name, const QStringList& configure_command);
+  Q_INVOKABLE void fixIntegrity();
+
+public slots:
+  void packageOperationInteraction(const QString& input);
+
+private:
+  QProcess process_;
+  QString process_output_;
 
 signals:
   void containerActionChanged();
@@ -154,6 +65,8 @@
   void finishedSearch(QList<QString> packageList);
   void finishedCommand(QString const& command_output);
   void finishedConfigure();
+  void updatePackageOperationDetails(const QString& container_id, const QString& package_name, const QString& details);
+  void packageOperationFinished(const QString& container_id, const QString& package_name);
 
   void error(const QString& short_description, const QString& details);
 };
 
=== modified file 'libertine/qml/ContainerPasswordDialog.qml'
--- libertine/qml/ContainerPasswordDialog.qml	2016-05-06 21:13:01 +0000
+++ libertine/qml/ContainerPasswordDialog.qml	2016-06-07 12:41:22 +0000
@@ -86,14 +86,8 @@
     function passwordAccepted(password) {
         var container_id = containerConfigList.addNewContainer("lxc", containerName)
         var comp = Qt.createComponent("ContainerManager.qml")
-        var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Create,
-                                                  "containerId": container_id,
-                                                  "containerType": null,
-                                                  "data": password})
-        worker.containerDistro = containerConfigList.getContainerDistro(container_id)
-        worker.containerName = containerConfigList.getContainerName(container_id)
-        worker.containerMultiarch = enableMultiarch
-        mainView.currentContainer = container_id
-        worker.start()
+        var worker = comp.createObject(mainView)
+        worker.createContainer(container_id, containerConfigList.getContainerName(container_id),
+                               containerConfigList.getContainerDistro(container_id), enableMultiarch, password)
     }
 }
 
=== modified file 'libertine/qml/ContainersView.qml'
--- libertine/qml/ContainersView.qml	2016-05-10 18:55:24 +0000
+++ libertine/qml/ContainersView.qml	2016-06-07 12:41:22 +0000
@@ -59,7 +59,7 @@
         function edit(containerId) {
             mainView.currentContainer = containerId
             containerAppsList.setContainerApps(mainView.currentContainer)
-            pageStack.push(Qt.resolvedUrl("HomeView.qml"))
+            pageStack.push(Qt.resolvedUrl("HomeView.qml"), {"currentContainer": mainView.currentContainer})
         }
 
         delegate: ListItem {
@@ -93,10 +93,8 @@
                         description: i18n.tr("Delete Container")
                         onTriggered: {
                             var comp = Qt.createComponent("ContainerManager.qml")
-                            var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Destroy,
-                                                                      "containerId": containerId,
-                                                                      "containerType": containerConfigList.getContainerType(containerId)})
-                            worker.start()
+                            var worker = comp.createObject(mainView)
+                            worker.destroyContainer(containerId)
                             mainView.currentContainer = containerId
                         }
                     }
 
=== modified file 'libertine/qml/ExtraArchivesView.qml'
--- libertine/qml/ExtraArchivesView.qml	2016-05-09 20:27:38 +0000
+++ libertine/qml/ExtraArchivesView.qml	2016-06-07 12:41:22 +0000
@@ -127,26 +127,20 @@
 
     function addArchive(archive) {
         var comp = Qt.createComponent("ContainerManager.qml")
-        worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
-                                              "containerId": mainView.currentContainer,
-                                              "containerType": containerConfigList.getContainerType(mainView.currentContainer),
-                                              "data_list": ["--add-archive", archive]})
+        worker = comp.createObject(mainView)
         worker.finishedConfigure.connect(finishedConfigure)
         worker.error.connect(sendAddError)
         error.connect(mainView.error)
-        worker.start()
+        worker.configureContainer(mainView.currentContainer, containerConfigList.getContainerName(mainView.currentContainer), ["--add-archive", archive])
     }
 
     function deleteArchive(archive) {
         var comp = Qt.createComponent("ContainerManager.qml")
-        worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
-                                              "containerId": mainView.currentContainer,
-                                              "containerType": containerConfigList.getContainerType(mainView.currentContainer),
-                                              "data_list": ["--delete-archive", archive]})
+        worker = comp.createObject(mainView)
         worker.finishedConfigure.connect(finishedConfigure)
         worker.error.connect(sendDeleteError)
         error.connect(mainView.error)
-        worker.start()
+        worker.configureContainer(mainView.currentContainer, containerConfigList.getContainerName(mainView.currentContainer), ["--delete-archive", archive])
     }
 
     Component.onCompleted: {
 
=== modified file 'libertine/qml/HomeView.qml'
--- libertine/qml/HomeView.qml	2016-05-10 18:55:24 +0000
+++ libertine/qml/HomeView.qml	2016-06-07 12:41:22 +0000
@@ -26,7 +26,7 @@
     id: homeView
     header: PageHeader {
         id: pageHeader
-        title: i18n.tr("Classic Apps - %1").arg(containerConfigList.getContainerName(mainView.currentContainer))
+        title: i18n.tr("Classic Apps - %1").arg(containerConfigList.getContainerName(currentContainer))
         trailingActionBar.actions: [
             Action {
                 id: settingsButton
@@ -39,6 +39,7 @@
             }
         ]
     }
+    property var currentContainer: null
 
     Component {
         id: enterPackagePopup
@@ -69,9 +70,8 @@
                     width: (parent.width - parent.spacing) / 2
                     onClicked: {
                         if (enterPackageInput.text != "") {
-                            if (!containerConfigList.isAppInstalled(mainView.currentContainer, enterPackageInput.text)) {
+                            if (!containerConfigList.isAppInstalled(currentContainer, enterPackageInput.text)) {
                                 installPackage(enterPackageInput.text)
-                                mainView.currentPackage = enterPackageInput.text
                                 PopupUtils.close(enterPackageDialog)
                             }
                             else {
@@ -97,30 +97,30 @@
     }
 
     Component {
-	id: settingsMenu
-	ActionSelectionPopover {
-	    actions: ActionList {
-		Action {
-		    text: i18n.tr("Manage Container")
-		    onTriggered: {
+        id: settingsMenu
+        ActionSelectionPopover {
+            actions: ActionList {
+                Action {
+                    text: i18n.tr("Manage Container")
+                    onTriggered: {
                         pageStack.push(Qt.resolvedUrl("ManageContainer.qml"))
                     }
-		}
+                }
                 Action {
                     text: i18n.tr("Container Information")
                     onTriggered: {
                         pageStack.push(Qt.resolvedUrl("ContainerInfoView.qml"))
                     }
                 }
-		Action {
-		    text: i18n.tr("Switch Container")
-		    onTriggered: {
+                Action {
+                    text: i18n.tr("Switch Container")
+                    onTriggered: {
                         pageStack.pop()
                         pageStack.push(Qt.resolvedUrl("ContainersView.qml"))
                     }
-		}
-	    }
-	}
+                }
+            }
+        }
     }
 
     Component {
@@ -160,7 +160,7 @@
     }
 
     function reloadAppList() {
-        containerAppsList.setContainerApps(mainView.currentContainer)
+        containerAppsList.setContainerApps(currentContainer)
 
         appsList.visible = !containerAppsList.empty()  ? true : false
     }
@@ -175,8 +175,7 @@
         visible: !containerAppsList.empty()  ? true : false
 
         function info(packageName) {
-            mainView.currentPackage = packageName
-            pageStack.push(Qt.resolvedUrl("PackageInfoView.qml"))
+            pageStack.push(Qt.resolvedUrl("PackageInfoView.qml"), {"currentPackage": packageName, "currentContainer": currentContainer})
         }
 
         delegate: ListItem {
@@ -211,7 +210,6 @@
                         text: i18n.tr("delete")
                         description: i18n.tr("Remove Package")
                         onTriggered: {
-                            mainView.currentPackage = packageName
                             removePackage(packageName)
                         }
                     }
@@ -242,23 +240,21 @@
         text: i18n.tr("No packages are installed")
     }
 
-    function installPackage(package_name) {
+    function operationSetup() {
         var comp = Qt.createComponent("ContainerManager.qml")
-        var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Install,
-                                                  "containerId": mainView.currentContainer,
-                                                  "containerType": containerConfigList.getContainerType(mainView.currentContainer),
-                                                  "data": package_name})
+        var worker = comp.createObject(mainView)
         worker.error.connect(mainView.error)
-        worker.start()
+        worker.updatePackageOperationDetails.connect(mainView.updatePackageOperationDetails)
+        mainView.packageOperationInteraction.connect(worker.packageOperationInteraction)
+        worker.packageOperationFinished.connect(mainView.resetPackageDetails)
+        return worker
+    }
+
+    function installPackage(packageName) {
+        operationSetup().installPackage(currentContainer, packageName)
     }
 
     function removePackage(packageName) {
-        var comp = Qt.createComponent("ContainerManager.qml")
-        var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Remove,
-                                                  "containerId": mainView.currentContainer,
-                                                  "containerType": containerConfigList.getContainerType(mainView.currentContainer),
-                                                  "data": packageName})
-        worker.error.connect(mainView.error)
-        worker.start()
+        operationSetup().removePackage(currentContainer, packageName)
     }
 }
 
=== modified file 'libertine/qml/ManageContainer.qml'
--- libertine/qml/ManageContainer.qml	2016-05-09 20:27:38 +0000
+++ libertine/qml/ManageContainer.qml	2016-06-07 12:41:22 +0000
@@ -49,18 +49,14 @@
                     onClicked: {
                         var comp = Qt.createComponent("ContainerManager.qml")
                         if (checked) {
-                            var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
-                                                               "containerId": mainView.currentContainer,
-                                                               "containerType": containerConfigList.getContainerType(mainView.currentContainer),
-                                                               "data_list": ["--multiarch", "enable"]})
-                            worker.start()
+                            comp.createObject(mainView).configureContainer(mainView.currentContainer,
+                                                                           containerConfigList.getContainerName(mainView.currentContainer),
+                                                                           ["--multiarch", "enable"])
                         }
                         else {
-                            var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
-                                                               "containerId": mainView.currentContainer,
-                                                               "containerType": containerConfigList.getContainerType(mainView.currentContainer),
-                                                               "data_list": ["--multiarch", "disable"]})
-                            worker.start()
+                            comp.createObject(mainView).configureContainer(mainView.currentContainer,
+                                                                           containerConfigList.getContainerName(mainView.currentContainer),
+                                                                           ["--multiarch", "disable"])
                         }
                     }
                 }
@@ -110,11 +106,9 @@
 
     function updateContainer() {
         var comp = Qt.createComponent("ContainerManager.qml")
-        var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Update,
-                                                  "containerId": mainView.currentContainer,
-                                                  "containerType": containerConfigList.getContainerType(mainView.currentContainer)})
+        var worker = comp.createObject(mainView)
         worker.error.connect(mainView.error);
-        worker.start()
+        worker.updateContainer(mainView.currentContainer, containerConfigList.getContainerName(mainView.currentContainer))
     }
 
     function updateStatus() {
 
=== modified file 'libertine/qml/PackageInfoView.qml'
--- libertine/qml/PackageInfoView.qml	2016-05-09 20:27:38 +0000
+++ libertine/qml/PackageInfoView.qml	2016-06-07 12:41:22 +0000
@@ -27,14 +27,17 @@
     id: packageInfoView
     header: PageHeader {
         id: pageHeader
-        title: i18n.tr("Information for the %1 package").arg(mainView.currentPackage)
+        title: i18n.tr("Information for the %1 package").arg(currentPackage)
     }
-    property string currentContainer: mainView.currentContainer
-    property var currentPackage: mainView.currentPackage
+    property string currentContainer: null
+    property var currentPackage: null
     property var statusText: containerConfigList.getAppStatus(currentContainer, currentPackage)
     property var packageVersionText: i18n.tr("Obtaining package version…")
+    property string packageOperationDetails: ""
     property var worker: null
 
+    signal sendOperationInteraction(string text)
+
 
     Flickable {
         anchors {
@@ -52,6 +55,7 @@
             anchors.right: parent.right
 
             ListItem.Standard {
+                id: packageListItem
                 text: i18n.tr("Package version")
                 control: Label {
                     text: packageVersionText
@@ -59,11 +63,33 @@
             }
 
             ListItem.Standard {
+                id: statusListItem
                 text: i18n.tr("Install status")
                 control: Label {
                     text: statusText
                 }
             }
+
+            TextArea {
+                id: packageDetailsView
+                visible: text !== ""
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: Math.max(packageInfoView.height - pageHeader.height - packageListItem.height - statusListItem.height - 35, units.gu(35))
+                readOnly: true
+                text: packageOperationDetails
+            }
+
+            TextField {
+                visible: packageDetailsView.visible && (statusText === "installing" || statusText === "removing")
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: ""
+                onAccepted: {
+                    sendOperationInteraction(text)
+                    text = ""
+                }
+            }
         }
     }
 
@@ -71,21 +97,31 @@
         containerConfigList.configChanged.connect(reloadStatus)
         var command = "apt-cache policy " + currentPackage
         var comp = Qt.createComponent("ContainerManager.qml")
-        worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Exec,
-                                              "containerId": mainView.currentContainer,
-                                              "containerType": containerConfigList.getContainerType(mainView.currentContainer),
-                                              "data": command })
+        worker = comp.createObject(mainView)
         worker.finishedCommand.connect(getPackageVersion)
+
+        packageOperationDetails = mainView.getPackageOperationDetails(currentContainer, currentPackage)
+        packageDetailsView.cursorPosition = packageDetailsView.length
+
+        mainView.updatePackageDetails.connect(updatePackageDetails)
+        sendOperationInteraction.connect(mainView.packageOperationInteraction)
+
         worker.error.connect(mainView.error)
         worker.error.connect(onError)
-        worker.start()
+        worker.runCommand(currentContainer, containerConfigList.getContainerName(currentContainer), command)
     }
 
     Component.onDestruction: {
         containerConfigList.configChanged.disconnect(reloadStatus)
-        worker.finishedCommand.disconnect(getPackageVersion)
-        worker.error.disconnect(mainView.error)
-        worker.error.disconnect(onError)
+        mainView.updatePackageDetails.disconnect(updatePackageDetails)
+        sendOperationInteraction.disconnect(mainView.packageOperationInteraction)
+    }
+
+    function updatePackageDetails(container_id, package_name, details) {
+        if (container_id === currentContainer && package_name === currentPackage) {
+            packageOperationDetails += details
+            packageDetailsView.cursorPosition = packageDetailsView.length
+        }
     }
 
     function reloadStatus() {
 
=== modified file 'libertine/qml/SearchResultsView.qml'
--- libertine/qml/SearchResultsView.qml	2016-05-09 20:27:38 +0000
+++ libertine/qml/SearchResultsView.qml	2016-06-07 12:41:22 +0000
@@ -120,12 +120,9 @@
 
         var comp = Qt.createComponent("ContainerManager.qml")
         var worker = comp.createObject()
-        worker.containerAction = ContainerManagerWorker.Search
-        worker.containerId = mainView.currentContainer
-        worker.data = search_string
         worker.finishedSearch.connect(finishedSearch)
         worker.error.connect(mainView.error)
-        worker.start()
+        worker.searchPackageCache(mainView.currentContainer, search_string)
     }
 
     function finishedSearch(packageList) {
 
=== modified file 'libertine/qml/libertine.qml'
--- libertine/qml/libertine.qml	2016-05-09 20:27:38 +0000
+++ libertine/qml/libertine.qml	2016-06-07 12:41:22 +0000
@@ -29,22 +29,26 @@
     width:  units.gu(90)
     height: units.gu(75)
     property var currentContainer: undefined
-    property var currentPackage: undefined
+    property var packageOperationDetails: undefined
 
     signal error(string short_description, string details)
+    signal updatePackageDetails(string container_id, string package_name, string details)
+    signal packageOperationInteraction(string data)
 
     PageStack {
         id: pageStack
     }
 
     Component.onCompleted: {
+        Qt.createComponent("ContainerManager.qml").createObject(mainView).fixIntegrity()
+
         mainView.currentContainer = containerConfigList.defaultContainerId
 
         if (!containerConfigList.empty()) {
             pageStack.push(Qt.resolvedUrl("ContainersView.qml"))
             if (mainView.currentContainer) {
                 containerAppsList.setContainerApps(mainView.currentContainer)
-                pageStack.push(Qt.resolvedUrl("HomeView.qml"))
+                pageStack.push(Qt.resolvedUrl("HomeView.qml"), {"currentContainer": mainView.currentContainer})
             }
         }
         else {
@@ -56,4 +60,35 @@
         PopupUtils.open(Qt.resolvedUrl("GenericErrorDialog.qml"), null,
                                        {"short_description": short_description, "details": details})
     }
+
+    function updatePackageOperationDetails(container_id, package_name, details) {
+        if (!mainView) {
+            return
+        }
+        if (!packageOperationDetails) {
+            packageOperationDetails = {}
+        }
+        if (!packageOperationDetails[container_id]) {
+            packageOperationDetails[container_id] = {}
+        }
+        if (!packageOperationDetails[container_id][package_name]) {
+            packageOperationDetails[container_id][package_name] = ""
+        }
+        packageOperationDetails[container_id][package_name] += details
+
+        updatePackageDetails(container_id, package_name, details)
+    }
+
+    function resetPackageDetails(container_id, package_name) {
+        if (mainView && packageOperationDetails && packageOperationDetails[container_id] && packageOperationDetails[container_id][package_name]) {
+            delete packageOperationDetails[container_id][package_name]
+        }
+    }
+
+    function getPackageOperationDetails(container_id, package_name) {
+        if (packageOperationDetails && packageOperationDetails[container_id] && packageOperationDetails[container_id][package_name]) {
+            return packageOperationDetails[container_id][package_name]
+        }
+        return ""
+    }
 }
 
=== modified file 'po/en_US.po'
--- po/en_US.po	2016-05-09 14:38:13 +0000
+++ po/en_US.po	2016-06-07 12:41:22 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-09 10:33-0400\n"
+"POT-Creation-Date: 2016-06-07 07:58-0400\n"
 "PO-Revision-Date: 2016-03-21 10:21-0400\n"
 "Last-Translator: Chris Townsend <[e-mail]>\n"
 "Language-Team: English\n"
@@ -17,316 +17,358 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
+msgid "new"
+msgstr "new"
+
+#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
+#: ../libertine/qml/ContainersView.qml:81 ../libertine/qml/HomeView.qml:197
+#: ../libertine/qml/ExtraArchivesView.qml:99
+msgid "installing"
+msgstr "installing"
+
+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:119
+#: ../libertine/qml/ManageContainer.qml:79
+#: ../libertine/qml/ManageContainer.qml:119
+msgid "ready"
+msgstr "ready"
+
+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:120
+#: ../libertine/qml/ManageContainer.qml:91
+#: ../libertine/qml/ManageContainer.qml:115
+msgid "updating"
+msgstr "updating"
+
+#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
+#: ../libertine/qml/ContainersView.qml:82 ../libertine/qml/HomeView.qml:198
+#: ../libertine/qml/ExtraArchivesView.qml:100
+msgid "removing"
+msgstr "removing"
+
+#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
+#: ../libertine/qml/PackageInfoView.qml:131
+#: ../libertine/qml/ContainerInfoView.qml:93
+msgid "removed"
+msgstr "removed"
+
+#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
+msgid "failed"
+msgstr "failed"
+
+#: ../libertine/ContainerConfig.cpp:186
+msgid "installed"
+msgstr "installed"
+
+#: ../libertine/ContainerManager.cpp:24
+msgid "%1 failed to start"
+msgstr "%1 failed to start"
+
 #: ../libertine/ContainerManager.cpp:25
-msgid "%1 failed to start"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:35
-msgid "Add a new PPA"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:44
-msgid "Add additional PPA"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:174
-msgid "Adding archive failed"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:26
-msgid "Additional Archives and PPAs"
-msgstr ""
-
-#: ../libertine/qml/ManageContainer.qml:59
-msgid "Additional archives and PPAs"
-msgstr ""
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:27
-msgid "Authentication required"
-msgstr ""
-
-#: ../libertine/qml/DebianPackagePicker.qml:26
-msgid "Available Debian Packages to Install"
-msgstr ""
-
+msgid "Installation of package %1 failed"
+msgstr "Installation of package %1 failed"
+
+#: ../libertine/ContainerManager.cpp:26
+msgid "Removal of package %1 failed"
+msgstr "Removal of package %1 failed"
+
+#: ../libertine/ContainerManager.cpp:27
+msgid "Searching for query %1 failed"
+msgstr "Searching for query %1 failed"
+
+#: ../libertine/ContainerManager.cpp:28
+msgid "Updating container %1 failed"
+msgstr "Updating container %1 failed"
+
+#: ../libertine/ContainerManager.cpp:29
+msgid "Creating container %1 failed"
+msgstr "Creating container %1 failed"
+
+#: ../libertine/ContainerManager.cpp:30
+msgid "Destroying container %1 failed"
+msgstr "Destroying container %1 failed"
+
+#: ../libertine/ContainerManager.cpp:31
+msgid "Running command %1 failed"
+msgstr "Running command %1 failed"
+
+#: ../libertine/ContainerManager.cpp:32
+msgid "Attempt to configure container %1 failed"
+msgstr "Attempt to configure container %1 failed"
+
+#: ../libertine/qml/PackageExistsDialog.qml:28
+msgid "The %1 package is already installed."
+msgstr "The %1 package is already installed."
+
+#: .:./libertine/qml/PackageExistsDialog.qml:29
+msgid "Search again or return to search results."
+msgstr "Search again or return to search results."
+
+#: ../libertine/qml/PackageExistsDialog.qml:33
+msgid "Search again"
+msgstr "Search again"
+
+#: ../libertine/qml/PackageExistsDialog.qml:43
+msgid "Return to search results"
+msgstr "Return to search results"
+
+#: ../libertine/qml/ContainersView.qml:33
+msgid "My Containers"
+msgstr "My Containers"
+
+#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:210
+msgid "delete"
+msgstr "delete"
+
+#: ../libertine/qml/ContainersView.qml:93
+msgid "Delete Container"
+msgstr "Delete Container"
+
+#: ../libertine/qml/ContainersView.qml:108 ../libertine/qml/HomeView.qml:222
+msgid "info"
+msgstr "info"
+
+#: ../libertine/qml/ContainersView.qml:109
+msgid "Container Info"
+msgstr "Container Info"
+
+#: ../libertine/qml/ContainersView.qml:117
+msgid "edit"
+msgstr "edit"
+
+#: ../libertine/qml/ContainersView.qml:118
+msgid "Container Apps"
+msgstr "Container Apps"
+
+#: ../libertine/qml/SearchPackagesDialog.qml:26
+#: ../libertine/qml/SearchResultsView.qml:36
+msgid "Search for packages"
+msgstr "Search for packages"
+
+#: ../libertine/qml/SearchPackagesDialog.qml:27
+msgid "Search archives for packages"
+msgstr "Search archives for packages"
+
+#: ../libertine/qml/SearchPackagesDialog.qml:31
+msgid "search"
+msgstr "search"
+
+#: ../libertine/qml/SearchPackagesDialog.qml:39
+#: ../libertine/qml/ContainerPasswordDialog.qml:52
+#: ../libertine/qml/HomeView.qml:68 ../libertine/qml/ExtraArchivesView.qml:57
+#: ../libertine/qml/ContainerOptionsDialog.qml:64
+msgid "OK"
+msgstr "OK"
+
+#: ../libertine/qml/SearchPackagesDialog.qml:57
+#: ../libertine/qml/ContainerPasswordDialog.qml:70
+#: ../libertine/qml/HomeView.qml:88 ../libertine/qml/ExtraArchivesView.qml:65
 #: ../libertine/qml/ContainerOptionsDialog.qml:75
-#: ../libertine/qml/ContainerPasswordDialog.qml:70
-#: ../libertine/qml/SearchPackagesDialog.qml:57
-#: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:63
 msgid "Cancel"
-msgstr ""
-
-#: ../libertine/qml/HomeView.qml:136
-msgid "Choose Debian package to install"
-msgstr ""
-
-#: ../libertine/qml/HomeView.qml:27
-msgid "Classic Apps - %1"
-msgstr "Classic Apps - %1"
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:28
-#, fuzzy
-msgid "Configure options for container creation."
-msgstr "Configure Container"
-
-#: ../libertine/qml/ContainersView.qml:100
-msgid "Container Apps"
-msgstr "Container Apps"
-
-#: ../libertine/qml/ContainersView.qml:91
-msgid "Container Info"
-msgstr "Container Info"
-
-#: ../libertine/qml/HomeView.qml:108
-#, fuzzy
-msgid "Container Information"
-msgstr "Container information for %1"
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:27
-#, fuzzy
-msgid "Container Options"
-msgstr "Container Apps"
-
-#: ../libertine/qml/ContainerInfoView.qml:28
-msgid "Container information for %1"
-msgstr "Container information for %1"
-
-#: ../libertine/qml/ContainersView.qml:73
-msgid "Delete Container"
-msgstr "Delete Container"
-
-#: ../libertine/qml/ExtraArchivesView.qml:178
-msgid "Deleting archive failed"
-msgstr ""
-
-#: ../libertine/qml/GenericErrorDialog.qml:32
-msgid "Dismiss"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:62
-#, fuzzy
-msgid "Distribution"
-msgstr "Distribution: %1"
-
-#: ../libertine/qml/HomeView.qml:46
-#, fuzzy
-msgid "Enter exact package name or full path to a Debian package file"
-msgstr "Please enter the exact package name of the app to install:"
-
-#: ../libertine/qml/ExtraArchivesView.qml:45
-msgid "Enter name of PPA in the form ppa:user/ppa-name:"
-msgstr ""
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:50
-msgid "Enter or name for the container or leave blank for default name"
-msgstr ""
-
-#: ../libertine/qml/HomeView.qml:130
-#, fuzzy
-msgid "Enter package name or Debian file"
-msgstr "Please enter the exact package name of the app to install:"
-
-#: ../libertine/qml/ContainerInfoView.qml:48
-msgid "ID"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:29
+msgstr "Cancel"
+
+#: ../libertine/qml/PackageInfoView.qml:30
 msgid "Information for the %1 package"
 msgstr "Information for the %1 package"
 
-#: ../libertine/qml/WelcomeView.qml:58
-msgid "Install"
-msgstr "Install"
-
-#: ../libertine/qml/DebianPackagePicker.qml:53
-#: ../libertine/qml/SearchResults.qml:42
+#: ../libertine/qml/PackageInfoView.qml:35
+msgid "Obtaining package version…"
+msgstr "Obtaining package version…"
+
+#: ../libertine/qml/PackageInfoView.qml:59
+msgid "Package version"
+msgstr "Package version"
+
+#: ../libertine/qml/PackageInfoView.qml:67
+msgid "Install status"
+msgstr "Install status"
+
+#: ../libertine/qml/PackageInfoView.qml:140
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../libertine/qml/SearchResultsView.qml:31
+msgid "Package Search Results"
+msgstr "Package Search Results"
+
+#: ../libertine/qml/SearchResultsView.qml:35
+msgid "Search"
+msgstr "Search"
+
+#: ../libertine/qml/SearchResultsView.qml:52
+msgid "No Search Results Found"
+msgstr "No Search Results Found"
+
+#: ../libertine/qml/SearchResultsView.qml:57
+msgid "Search Again"
+msgstr "Search Again"
+
+#: ../libertine/qml/SearchResultsView.qml:67
+msgid "Return to Apps Page"
+msgstr "Return to Apps Page"
+
+#: ../libertine/qml/SearchResultsView.qml:95
+msgid "Searching for packages…"
+msgstr "Searching for packages…"
+
+#: ../libertine/qml/SearchResults.qml:60
+#: ../libertine/qml/DebianPackagePicker.qml:70
 msgid "Install Package"
 msgstr "Install Package"
 
-#: ../libertine/qml/HomeView.qml:45
-#, fuzzy
-msgid "Install new package"
-msgstr "Install Package"
-
-#: ../libertine/qml/PackageInfoView.qml:58
-#, fuzzy
-msgid "Install status"
-msgstr "Install status: %1"
-
-#: ../libertine/ContainerManager.cpp:26
-#, fuzzy
-msgid "Installation of package %1 failed"
-msgstr "Install Package"
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:36
-msgid "Invalid password entered"
-msgstr ""
-
-#: ../libertine/qml/ManageContainer.qml:27
+#: ../libertine/qml/ManageContainer.qml:29
 msgid "Manage %1"
-msgstr ""
-
-#: ../libertine/qml/HomeView.qml:102
-#, fuzzy
-msgid "Manage Container"
-msgstr "My Containers"
-
-#: ../libertine/qml/ContainersView.qml:31
-msgid "My Containers"
-msgstr "My Containers"
-
-#: ../libertine/qml/ContainerInfoView.qml:55
-#, fuzzy
-msgid "Name"
-msgstr "Name: %1"
-
-#: ../libertine/qml/DebianPackagePicker.qml:72
+msgstr "Manage %1"
+
+#: ../libertine/qml/ManageContainer.qml:63
+#: ../libertine/qml/ContainerOptionsDialog.qml:40
+msgid "i386 multiarch support"
+msgstr "i386 multiarch support"
+
+#: ../libertine/qml/ManageContainer.qml:67
+msgid "Additional archives and PPAs"
+msgstr "Additional archives and PPAs"
+
+#: ../libertine/qml/ManageContainer.qml:78
+msgid "Update…"
+msgstr "Update…"
+
+#: ../libertine/qml/ManageContainer.qml:94
+msgid "Update container"
+msgstr "Update container"
+
+#: ../libertine/qml/DebianPackagePicker.qml:28
+msgid "Available Debian Packages to Install"
+msgstr "Available Debian Packages to Install"
+
+#: ../libertine/qml/DebianPackagePicker.qml:87
 msgid "No Debian packages available"
-msgstr ""
-
-#: ../libertine/qml/SearchResultsView.qml:49
-#, fuzzy
-msgid "No Search Results Found"
-msgstr "No search results for %1."
-
-#: ../libertine/qml/ExtraArchivesView.qml:120
-msgid "No additional archives and PPA's have been added"
-msgstr ""
-
-#: ../libertine/qml/HomeView.qml:227
-#, fuzzy
-msgid "No packages are installed"
-msgstr "Please enter the exact package name of the app to install:"
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:64
-#: ../libertine/qml/ContainerPasswordDialog.qml:52
-#: ../libertine/qml/SearchPackagesDialog.qml:39
-#: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:55
-msgid "OK"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:33
-msgid "Obtaining package version…"
-msgstr "Obtaining package version…"
-
-#: ../libertine/qml/HomeView.qml:209
-msgid "Package Info"
-msgstr "Package Info"
-
-#: ../libertine/qml/SearchResultsView.qml:28
-msgid "Package Search Results"
-msgstr ""
-
-#: ../libertine/qml/HomeView.qml:56
-msgid "Package name or Debian package path"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:51
-#, fuzzy
-msgid "Package version"
-msgstr "Package version: %1"
+msgstr "No Debian packages available"
+
+#: ../libertine/qml/ContainerPasswordDialog.qml:27
+msgid "Authentication required"
+msgstr "Authentication required"
 
 #: ../libertine/qml/ContainerPasswordDialog.qml:28
 msgid "Password is required to create a Libertine container"
-msgstr ""
-
-#: ../libertine/ContainerManager.cpp:27
-msgid "Removal of package %1 failed"
-msgstr ""
-
-#: ../libertine/qml/HomeView.qml:196
+msgstr "Password is required to create a Libertine container"
+
+#: ../libertine/qml/ContainerPasswordDialog.qml:36
+msgid "Invalid password entered"
+msgstr "Invalid password entered"
+
+#: ../libertine/qml/ContainerPasswordDialog.qml:41
+msgid "password"
+msgstr "password"
+
+#: ../libertine/qml/HomeView.qml:29
+msgid "Classic Apps - %1"
+msgstr "Classic Apps - %1"
+
+#: ../libertine/qml/HomeView.qml:48
+msgid "Install new package"
+msgstr "Install new package"
+
+#: ../libertine/qml/HomeView.qml:49
+msgid "Enter exact package name or full path to a Debian package file"
+msgstr "Enter exact package name or full path to a Debian package file"
+
+#: ../libertine/qml/HomeView.qml:59
+msgid "Package name or Debian package path"
+msgstr "Package name or Debian package path"
+
+#: ../libertine/qml/HomeView.qml:78
+msgid "The %1 package is already installed. Please try a different package name."
+msgstr "The %1 package is already installed. Please try a different package name."
+
+#: ../libertine/qml/HomeView.qml:104
+msgid "Manage Container"
+msgstr "Manage Container"
+
+#: ../libertine/qml/HomeView.qml:110
+msgid "Container Information"
+msgstr "Container Information"
+
+#: ../libertine/qml/HomeView.qml:116
+msgid "Switch Container"
+msgstr "Switch Container"
+
+#: ../libertine/qml/HomeView.qml:132
+msgid "Enter package name or Debian file"
+msgstr "Enter package name or Debian file"
+
+#: ../libertine/qml/HomeView.qml:138
+msgid "Choose Debian package to install"
+msgstr "Choose Debian package to install"
+
+#: ../libertine/qml/HomeView.qml:145
+msgid "Search archives for a package"
+msgstr "Search archives for a package"
+
+#: ../libertine/qml/HomeView.qml:211
 msgid "Remove Package"
 msgstr "Remove Package"
 
-#: ../libertine/qml/ExtraArchivesView.qml:103
+#: ../libertine/qml/HomeView.qml:223
+msgid "Package Info"
+msgstr "Package Info"
+
+#: ../libertine/qml/HomeView.qml:240
+msgid "No packages are installed"
+msgstr "No packages are installed"
+
+#: ../libertine/qml/ExtraArchivesView.qml:28
+msgid "Additional Archives and PPAs"
+msgstr "Additional Archives and PPAs"
+
+#: ../libertine/qml/ExtraArchivesView.qml:32
+msgid "add"
+msgstr "add"
+
+#: ../libertine/qml/ExtraArchivesView.qml:33
+msgid "Add a new PPA"
+msgstr "Add a new PPA"
+
+#: ../libertine/qml/ExtraArchivesView.qml:46
+msgid "Add additional PPA"
+msgstr "Add additional PPA"
+
+#: ../libertine/qml/ExtraArchivesView.qml:47
+msgid "Enter name of PPA in the form ppa:user/ppa-name:"
+msgstr "Enter name of PPA in the form ppa:user/ppa-name:"
+
+#: ../libertine/qml/ExtraArchivesView.qml:107
+msgid "remove"
+msgstr "remove"
+
+#: ../libertine/qml/ExtraArchivesView.qml:108
 msgid "Remove extra archive"
-msgstr ""
-
-#: ../libertine/qml/SearchResultsView.qml:64
-msgid "Return to Apps Page"
-msgstr ""
-
-#: ../libertine/qml/PackageExistsDialog.qml:43
-#, fuzzy
-msgid "Return to search results"
-msgstr "No search results for %1."
-
-#: ../libertine/qml/SearchResultsView.qml:38
-msgid "Search"
-msgstr ""
-
-#: ../libertine/qml/SearchResultsView.qml:54
-msgid "Search Again"
-msgstr ""
-
-#: ../libertine/qml/PackageExistsDialog.qml:33
-msgid "Search again"
-msgstr ""
-
-#: ../libertine/qml/PackageExistsDialog.qml:29
-msgid "Search again or return to search results."
-msgstr ""
-
-#: ../libertine/qml/HomeView.qml:143
-msgid "Search archives for a package"
-msgstr ""
-
-#: ../libertine/qml/SearchPackagesDialog.qml:27
-msgid "Search archives for packages"
-msgstr ""
-
-#: ../libertine/qml/SearchResultsView.qml:39
-#: ../libertine/qml/SearchPackagesDialog.qml:26
-msgid "Search for packages"
-msgstr ""
-
-#: ../libertine/qml/SearchResultsView.qml:92
-#, fuzzy
-msgid "Searching for packages…"
-msgstr "Obtaining package version…"
-
-#: ../libertine/qml/ContainerInfoView.qml:69
-#, fuzzy
-msgid "Status"
-msgstr "Status: %1"
-
-#: ../libertine/qml/HomeView.qml:114
-msgid "Switch Container"
-msgstr "Switch Container"
-
-#: ../libertine/qml/PackageExistsDialog.qml:28
-#, fuzzy
-msgid "The %1 package is already installed."
-msgstr "Please enter the exact package name of the app to install:"
-
-#: ../libertine/qml/HomeView.qml:76
-#, fuzzy
-msgid ""
-"The %1 package is already installed. Please try a different package name."
-msgstr "Package %1 already installed. Please try a different package name."
-
-#: ../libertine/qml/PackageInfoView.qml:100
-msgid "Unknown"
-msgstr ""
-
-#: ../libertine/qml/ManageContainer.qml:86
-#, fuzzy
-msgid "Update container"
-msgstr "Update Container"
-
-#: ../libertine/qml/ManageContainer.qml:70
-msgid "Update…"
-msgstr ""
-
-#: ../libertine/qml/WelcomeView.qml:27
+msgstr "Remove extra archive"
+
+#: ../libertine/qml/ExtraArchivesView.qml:125
+msgid "No additional archives and PPA's have been added"
+msgstr "No additional archives and PPA's have been added"
+
+#: ../libertine/qml/ExtraArchivesView.qml:173
+msgid "Adding archive failed"
+msgstr "Adding archive failed"
+
+#: ../libertine/qml/ExtraArchivesView.qml:177
+msgid "Deleting archive failed"
+msgstr "Deleting archive failed"
+
+#: ../libertine/qml/GenericErrorDialog.qml:32
+msgid "Dismiss"
+msgstr "Dismiss"
+
+#: ../libertine/qml/WelcomeView.qml:28
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../libertine/qml/WelcomeView.qml:42
+#: ../libertine/qml/WelcomeView.qml:50
 msgid "Welcome to the Ubuntu Legacy Application Support Manager."
 msgstr "Welcome to the Ubuntu Legacy Application Support Manager."
 
-#: ../libertine/qml/WelcomeView.qml:50
+#: ../libertine/qml/WelcomeView.qml:58
 msgid ""
 "You do not have Legacy Application Support configured at this time.  "
 "Downloading and setting up the required environment takes some time and "
@@ -336,87 +378,45 @@
 "Downloading and setting up the required environment takes some time and "
 "network bandwidth."
 
-#: ../libertine/qml/ExtraArchivesView.qml:34
-msgid "add"
-msgstr ""
+#: ../libertine/qml/WelcomeView.qml:66
+msgid "Install"
+msgstr "Install"
+
+#: ../libertine/qml/ContainerInfoView.qml:30
+msgid "Container information for %1"
+msgstr "Container information for %1"
+
+#: ../libertine/qml/ContainerInfoView.qml:53
+msgid "ID"
+msgstr "ID"
+
+#: ../libertine/qml/ContainerInfoView.qml:60
+msgid "Name"
+msgstr "Name"
+
+#: ../libertine/qml/ContainerInfoView.qml:67
+msgid "Distribution"
+msgstr "Distribution"
+
+#: ../libertine/qml/ContainerInfoView.qml:74
+msgid "Status"
+msgstr "Status"
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:27
+msgid "Container Options"
+msgstr "Container Options"
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:28
+msgid "Configure options for container creation."
+msgstr "Configure options for container creation."
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:50
+msgid "Enter or name for the container or leave blank for default name"
+msgstr "Enter or name for the container or leave blank for default name"
 
 #: ../libertine/qml/ContainerOptionsDialog.qml:56
-#, fuzzy
 msgid "container name"
-msgstr "Container Info"
-
-#: ../libertine/qml/ContainersView.qml:72 ../libertine/qml/HomeView.qml:195
-msgid "delete"
-msgstr "delete"
-
-#: ../libertine/qml/ContainersView.qml:99
-msgid "edit"
-msgstr "edit"
-
-#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
-msgid "failed"
-msgstr "failed"
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:40
-#: ../libertine/qml/ManageContainer.qml:55
-msgid "i386 multiarch support"
-msgstr "i386 multiarch support"
-
-#: ../libertine/qml/ContainersView.qml:90 ../libertine/qml/HomeView.qml:208
-msgid "info"
-msgstr "info"
-
-#: ../libertine/ContainerConfig.cpp:186
-msgid "installed"
-msgstr "installed"
-
-#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
-#: ../libertine/qml/ContainersView.qml:63 ../libertine/qml/HomeView.qml:187
-#: ../libertine/qml/ExtraArchivesView.qml:94
-msgid "installing"
-msgstr "installing"
-
-#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
-msgid "new"
-msgstr "new"
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:41
-#, fuzzy
-msgid "password"
-msgstr "Password"
-
-#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:101
-#: ../libertine/qml/ManageContainer.qml:71
-#: ../libertine/qml/ManageContainer.qml:112
-msgid "ready"
-msgstr "ready"
-
-#: ../libertine/qml/ExtraArchivesView.qml:102
-#, fuzzy
-msgid "remove"
-msgstr "removed"
-
-#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
-#: ../libertine/qml/ContainerInfoView.qml:88
-#: ../libertine/qml/PackageInfoView.qml:91
-msgid "removed"
-msgstr "removed"
-
-#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
-#: ../libertine/qml/ContainersView.qml:64 ../libertine/qml/HomeView.qml:188
-#: ../libertine/qml/ExtraArchivesView.qml:95
-msgid "removing"
-msgstr "removing"
-
-#: ../libertine/qml/SearchPackagesDialog.qml:31
-msgid "search"
-msgstr ""
-
-#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:102
-#: ../libertine/qml/ManageContainer.qml:83
-#: ../libertine/qml/ManageContainer.qml:108
-msgid "updating"
-msgstr ""
+msgstr "container name"
 
 #~ msgid "Configure %1"
 #~ msgstr "Configure %1"
 
=== modified file 'po/libertine.pot'
--- po/libertine.pot	2016-05-09 14:38:13 +0000
+++ po/libertine.pot	2016-06-07 12:41:22 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-09 10:33-0400\n"
+"POT-Creation-Date: 2016-06-07 07:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,49 +17,37 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../libertine/ContainerManager.cpp:25
-msgid "%1 failed to start"
-msgstr ""
-
-#: ../libertine/ContainerManager.cpp:26
-msgid "Installation of package %1 failed"
-msgstr ""
-
-#: ../libertine/ContainerManager.cpp:27
-msgid "Removal of package %1 failed"
-msgstr ""
-
 #: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
 msgid "new"
 msgstr ""
 
 #: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
-#: ../libertine/qml/ContainersView.qml:63 ../libertine/qml/HomeView.qml:187
-#: ../libertine/qml/ExtraArchivesView.qml:94
+#: ../libertine/qml/ContainersView.qml:81 ../libertine/qml/HomeView.qml:197
+#: ../libertine/qml/ExtraArchivesView.qml:99
 msgid "installing"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:101
-#: ../libertine/qml/ManageContainer.qml:71
-#: ../libertine/qml/ManageContainer.qml:112
+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:119
+#: ../libertine/qml/ManageContainer.qml:79
+#: ../libertine/qml/ManageContainer.qml:119
 msgid "ready"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:102
-#: ../libertine/qml/ManageContainer.qml:83
-#: ../libertine/qml/ManageContainer.qml:108
+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:120
+#: ../libertine/qml/ManageContainer.qml:91
+#: ../libertine/qml/ManageContainer.qml:115
 msgid "updating"
 msgstr ""
 
 #: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
-#: ../libertine/qml/ContainersView.qml:64 ../libertine/qml/HomeView.qml:188
-#: ../libertine/qml/ExtraArchivesView.qml:95
+#: ../libertine/qml/ContainersView.qml:82 ../libertine/qml/HomeView.qml:198
+#: ../libertine/qml/ExtraArchivesView.qml:100
 msgid "removing"
 msgstr ""
 
 #: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
-#: ../libertine/qml/ContainerInfoView.qml:88
-#: ../libertine/qml/PackageInfoView.qml:91
+#: ../libertine/qml/PackageInfoView.qml:131
+#: ../libertine/qml/ContainerInfoView.qml:93
 msgid "removed"
 msgstr ""
 
@@ -71,84 +59,188 @@
 msgid "installed"
 msgstr ""
 
-#: ../libertine/qml/ContainerOptionsDialog.qml:27
-msgid "Container Options"
-msgstr ""
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:28
-msgid "Configure options for container creation."
-msgstr ""
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:40
-#: ../libertine/qml/ManageContainer.qml:55
-msgid "i386 multiarch support"
-msgstr ""
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:50
-msgid "Enter or name for the container or leave blank for default name"
-msgstr ""
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:56
-msgid "container name"
-msgstr ""
-
+#: ../libertine/ContainerManager.cpp:24
+msgid "%1 failed to start"
+msgstr ""
+
+#: ../libertine/ContainerManager.cpp:25
+msgid "Installation of package %1 failed"
+msgstr ""
+
+#: ../libertine/ContainerManager.cpp:26
+msgid "Removal of package %1 failed"
+msgstr ""
+
+#: ../libertine/ContainerManager.cpp:27
+msgid "Searching for query %1 failed"
+msgstr ""
+
+#: ../libertine/ContainerManager.cpp:28
+msgid "Updating container %1 failed"
+msgstr ""
+
+#: ../libertine/ContainerManager.cpp:29
+msgid "Creating container %1 failed"
+msgstr ""
+
+#: ../libertine/ContainerManager.cpp:30
+msgid "Destroying container %1 failed"
+msgstr ""
+
+#: ../libertine/ContainerManager.cpp:31
+msgid "Running command %1 failed"
+msgstr ""
+
+#: ../libertine/ContainerManager.cpp:32
+msgid "Attempt to configure container %1 failed"
+msgstr ""
+
+#: ../libertine/qml/PackageExistsDialog.qml:28
+msgid "The %1 package is already installed."
+msgstr ""
+
+#: ../libertine/qml/PackageExistsDialog.qml:29
+msgid "Search again or return to search results."
+msgstr ""
+
+#: ../libertine/qml/PackageExistsDialog.qml:33
+msgid "Search again"
+msgstr ""
+
+#: ../libertine/qml/PackageExistsDialog.qml:43
+msgid "Return to search results"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:33
+msgid "My Containers"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:210
+msgid "delete"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:93
+msgid "Delete Container"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:108 ../libertine/qml/HomeView.qml:222
+msgid "info"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:109
+msgid "Container Info"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:117
+msgid "edit"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:118
+msgid "Container Apps"
+msgstr ""
+
+#: ../libertine/qml/SearchPackagesDialog.qml:26
+#: ../libertine/qml/SearchResultsView.qml:36
+msgid "Search for packages"
+msgstr ""
+
+#: ../libertine/qml/SearchPackagesDialog.qml:27
+msgid "Search archives for packages"
+msgstr ""
+
+#: ../libertine/qml/SearchPackagesDialog.qml:31
+msgid "search"
+msgstr ""
+
+#: ../libertine/qml/SearchPackagesDialog.qml:39
+#: ../libertine/qml/ContainerPasswordDialog.qml:52
+#: ../libertine/qml/HomeView.qml:68 ../libertine/qml/ExtraArchivesView.qml:57
 #: ../libertine/qml/ContainerOptionsDialog.qml:64
-#: ../libertine/qml/ContainerPasswordDialog.qml:52
-#: ../libertine/qml/SearchPackagesDialog.qml:39
-#: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:55
 msgid "OK"
 msgstr ""
 
+#: ../libertine/qml/SearchPackagesDialog.qml:57
+#: ../libertine/qml/ContainerPasswordDialog.qml:70
+#: ../libertine/qml/HomeView.qml:88 ../libertine/qml/ExtraArchivesView.qml:65
 #: ../libertine/qml/ContainerOptionsDialog.qml:75
-#: ../libertine/qml/ContainerPasswordDialog.qml:70
-#: ../libertine/qml/SearchPackagesDialog.qml:57
-#: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:63
 msgid "Cancel"
 msgstr ""
 
-#: ../libertine/qml/GenericErrorDialog.qml:32
-msgid "Dismiss"
-msgstr ""
-
-#: ../libertine/qml/SearchResultsView.qml:28
+#: ../libertine/qml/PackageInfoView.qml:30
+msgid "Information for the %1 package"
+msgstr ""
+
+#: ../libertine/qml/PackageInfoView.qml:35
+msgid "Obtaining package version…"
+msgstr ""
+
+#: ../libertine/qml/PackageInfoView.qml:59
+msgid "Package version"
+msgstr ""
+
+#: ../libertine/qml/PackageInfoView.qml:67
+msgid "Install status"
+msgstr ""
+
+#: ../libertine/qml/PackageInfoView.qml:140
+msgid "Unknown"
+msgstr ""
+
+#: ../libertine/qml/SearchResultsView.qml:31
 msgid "Package Search Results"
 msgstr ""
 
-#: ../libertine/qml/SearchResultsView.qml:38
+#: ../libertine/qml/SearchResultsView.qml:35
 msgid "Search"
 msgstr ""
 
-#: ../libertine/qml/SearchResultsView.qml:39
-#: ../libertine/qml/SearchPackagesDialog.qml:26
-msgid "Search for packages"
-msgstr ""
-
-#: ../libertine/qml/SearchResultsView.qml:49
+#: ../libertine/qml/SearchResultsView.qml:52
 msgid "No Search Results Found"
 msgstr ""
 
-#: ../libertine/qml/SearchResultsView.qml:54
+#: ../libertine/qml/SearchResultsView.qml:57
 msgid "Search Again"
 msgstr ""
 
-#: ../libertine/qml/SearchResultsView.qml:64
+#: ../libertine/qml/SearchResultsView.qml:67
 msgid "Return to Apps Page"
 msgstr ""
 
-#: ../libertine/qml/SearchResultsView.qml:92
+#: ../libertine/qml/SearchResultsView.qml:95
 msgid "Searching for packages…"
 msgstr ""
 
-#: ../libertine/qml/DebianPackagePicker.qml:26
+#: ../libertine/qml/SearchResults.qml:60
+#: ../libertine/qml/DebianPackagePicker.qml:70
+msgid "Install Package"
+msgstr ""
+
+#: ../libertine/qml/ManageContainer.qml:29
+msgid "Manage %1"
+msgstr ""
+
+#: ../libertine/qml/ManageContainer.qml:63
+#: ../libertine/qml/ContainerOptionsDialog.qml:40
+msgid "i386 multiarch support"
+msgstr ""
+
+#: ../libertine/qml/ManageContainer.qml:67
+msgid "Additional archives and PPAs"
+msgstr ""
+
+#: ../libertine/qml/ManageContainer.qml:78
+msgid "Update…"
+msgstr ""
+
+#: ../libertine/qml/ManageContainer.qml:94
+msgid "Update container"
+msgstr ""
+
+#: ../libertine/qml/DebianPackagePicker.qml:28
 msgid "Available Debian Packages to Install"
 msgstr ""
 
-#: ../libertine/qml/DebianPackagePicker.qml:53
-#: ../libertine/qml/SearchResults.qml:42
-msgid "Install Package"
-msgstr ""
-
-#: ../libertine/qml/DebianPackagePicker.qml:72
+#: ../libertine/qml/DebianPackagePicker.qml:87
 msgid "No Debian packages available"
 msgstr ""
 
@@ -168,226 +260,158 @@
 msgid "password"
 msgstr ""
 
-#: ../libertine/qml/ContainerInfoView.qml:28
-msgid "Container information for %1"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:48
-msgid "ID"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:55
-msgid "Name"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:62
-msgid "Distribution"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:69
-msgid "Status"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:31
-msgid "My Containers"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:72 ../libertine/qml/HomeView.qml:195
-msgid "delete"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:73
-msgid "Delete Container"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:90 ../libertine/qml/HomeView.qml:208
-msgid "info"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:91
-msgid "Container Info"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:99
-msgid "edit"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:100
-msgid "Container Apps"
-msgstr ""
-
-#: ../libertine/qml/SearchPackagesDialog.qml:27
-msgid "Search archives for packages"
-msgstr ""
-
-#: ../libertine/qml/SearchPackagesDialog.qml:31
-msgid "search"
-msgstr ""
-
-#: ../libertine/qml/ManageContainer.qml:27
-msgid "Manage %1"
-msgstr ""
-
-#: ../libertine/qml/ManageContainer.qml:59
-msgid "Additional archives and PPAs"
-msgstr ""
-
-#: ../libertine/qml/ManageContainer.qml:70
-msgid "Update…"
-msgstr ""
-
-#: ../libertine/qml/ManageContainer.qml:86
-msgid "Update container"
-msgstr ""
-
-#: ../libertine/qml/HomeView.qml:27
+#: ../libertine/qml/HomeView.qml:29
 msgid "Classic Apps - %1"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:45
+#: ../libertine/qml/HomeView.qml:48
 msgid "Install new package"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:46
+#: ../libertine/qml/HomeView.qml:49
 msgid "Enter exact package name or full path to a Debian package file"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:56
+#: ../libertine/qml/HomeView.qml:59
 msgid "Package name or Debian package path"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:76
+#: ../libertine/qml/HomeView.qml:78
 msgid ""
 "The %1 package is already installed. Please try a different package name."
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:102
+#: ../libertine/qml/HomeView.qml:104
 msgid "Manage Container"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:108
+#: ../libertine/qml/HomeView.qml:110
 msgid "Container Information"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:114
+#: ../libertine/qml/HomeView.qml:116
 msgid "Switch Container"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:130
+#: ../libertine/qml/HomeView.qml:132
 msgid "Enter package name or Debian file"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:136
+#: ../libertine/qml/HomeView.qml:138
 msgid "Choose Debian package to install"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:143
+#: ../libertine/qml/HomeView.qml:145
 msgid "Search archives for a package"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:196
+#: ../libertine/qml/HomeView.qml:211
 msgid "Remove Package"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:209
+#: ../libertine/qml/HomeView.qml:223
 msgid "Package Info"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:227
+#: ../libertine/qml/HomeView.qml:240
 msgid "No packages are installed"
 msgstr ""
 
-#: ../libertine/qml/PackageInfoView.qml:29
-msgid "Information for the %1 package"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:33
-msgid "Obtaining package version…"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:51
-msgid "Package version"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:58
-msgid "Install status"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:100
-msgid "Unknown"
-msgstr ""
-
-#: ../libertine/qml/WelcomeView.qml:27
-msgid "Welcome"
-msgstr ""
-
-#: ../libertine/qml/WelcomeView.qml:42
-msgid "Welcome to the Ubuntu Legacy Application Support Manager."
-msgstr ""
-
-#: ../libertine/qml/WelcomeView.qml:50
-msgid ""
-"You do not have Legacy Application Support configured at this time.  "
-"Downloading and setting up the required environment takes some time and "
-"network bandwidth."
-msgstr ""
-
-#: ../libertine/qml/WelcomeView.qml:58
-msgid "Install"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:26
+#: ../libertine/qml/ExtraArchivesView.qml:28
 msgid "Additional Archives and PPAs"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:34
+#: ../libertine/qml/ExtraArchivesView.qml:32
 msgid "add"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:35
+#: ../libertine/qml/ExtraArchivesView.qml:33
 msgid "Add a new PPA"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:44
+#: ../libertine/qml/ExtraArchivesView.qml:46
 msgid "Add additional PPA"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:45
+#: ../libertine/qml/ExtraArchivesView.qml:47
 msgid "Enter name of PPA in the form ppa:user/ppa-name:"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:102
+#: ../libertine/qml/ExtraArchivesView.qml:107
 msgid "remove"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:103
+#: ../libertine/qml/ExtraArchivesView.qml:108
 msgid "Remove extra archive"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:120
+#: ../libertine/qml/ExtraArchivesView.qml:125
 msgid "No additional archives and PPA's have been added"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:174
+#: ../libertine/qml/ExtraArchivesView.qml:173
 msgid "Adding archive failed"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:178
+#: ../libertine/qml/ExtraArchivesView.qml:177
 msgid "Deleting archive failed"
 msgstr ""
 
-#: ../libertine/qml/PackageExistsDialog.qml:28
-msgid "The %1 package is already installed."
-msgstr ""
-
-#: ../libertine/qml/PackageExistsDialog.qml:29
-msgid "Search again or return to search results."
-msgstr ""
-
-#: ../libertine/qml/PackageExistsDialog.qml:33
-msgid "Search again"
-msgstr ""
-
-#: ../libertine/qml/PackageExistsDialog.qml:43
-msgid "Return to search results"
+#: ../libertine/qml/GenericErrorDialog.qml:32
+msgid "Dismiss"
+msgstr ""
+
+#: ../libertine/qml/WelcomeView.qml:28
+msgid "Welcome"
+msgstr ""
+
+#: ../libertine/qml/WelcomeView.qml:50
+msgid "Welcome to the Ubuntu Legacy Application Support Manager."
+msgstr ""
+
+#: ../libertine/qml/WelcomeView.qml:58
+msgid ""
+"You do not have Legacy Application Support configured at this time.  "
+"Downloading and setting up the required environment takes some time and "
+"network bandwidth."
+msgstr ""
+
+#: ../libertine/qml/WelcomeView.qml:66
+msgid "Install"
+msgstr ""
+
+#: ../libertine/qml/ContainerInfoView.qml:30
+msgid "Container information for %1"
+msgstr ""
+
+#: ../libertine/qml/ContainerInfoView.qml:53
+msgid "ID"
+msgstr ""
+
+#: ../libertine/qml/ContainerInfoView.qml:60
+msgid "Name"
+msgstr ""
+
+#: ../libertine/qml/ContainerInfoView.qml:67
+msgid "Distribution"
+msgstr ""
+
+#: ../libertine/qml/ContainerInfoView.qml:74
+msgid "Status"
+msgstr ""
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:27
+msgid "Container Options"
+msgstr ""
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:28
+msgid "Configure options for container creation."
+msgstr ""
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:50
+msgid "Enter or name for the container or leave blank for default name"
+msgstr ""
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:56
+msgid "container name"
 msgstr ""
 
=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-05-11 17:26:27 +0000
+++ python/libertine/ChrootContainer.py	2016-06-07 12:41:22 +0000
@@ -180,8 +180,8 @@
         self._run_ldconfig(verbosity)
         return retcode
 
-    def install_package(self, package_name, verbosity=1, extra_apt_args=""):
-        returncode = super().install_package(package_name, verbosity, extra_apt_args)
+    def install_package(self, package_name, verbosity=1, readline=False):
+        returncode = super().install_package(package_name, verbosity, readline)
 
         if returncode:
             self._run_ldconfig(verbosity)
@@ -210,7 +210,7 @@
             % (utils.get_libertine_container_userdata_dir_path(self.container_id), home_path)
         )
 
-        xdg_user_dirs = ['Documents', 'Music', 'Pictures', 'Videos']
+        xdg_user_dirs = utils.get_common_xdg_directories()
         for user_dir in xdg_user_dirs:
             user_dir_path = os.path.join(home_path, user_dir)
             bind_mounts += " -b %s:%s" % (user_dir_path, user_dir_path)
 
=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-05-11 17:26:27 +0000
+++ python/libertine/Libertine.py	2016-06-07 12:41:22 +0000
@@ -77,7 +77,9 @@
         self.container_type = 'unknown'
         self.container_id = container_id
         self.root_path = libertine.utils.get_libertine_container_rootfs_path(self.container_id)
-        self.default_packages = ['matchbox', 'libnss-extrausers', 'software-properties-common',
+        self.default_packages = ['matchbox',
+                                 'libnss-extrausers',
+                                 'software-properties-common',
                                  'humanity-icon-theme']
 
     def create_libertine_container(self, password=None, multiarch=False, verbosity=1):
@@ -148,7 +150,7 @@
         self.run_in_container(apt_command_prefix(verbosity) + '--force-yes update')
         return self.run_in_container(apt_command_prefix(verbosity) + '--force-yes upgrade')
 
-    def install_package(self, package_name, verbosity=1, extra_apt_args=""):
+    def install_package(self, package_name, verbosity=1, readline=False):
         """
         Installs a named package in the container.
 
@@ -163,16 +165,17 @@
             self.run_in_container('dpkg -i ' +
                 os.path.join('/', 'tmp', package_name.split('/')[-1]))
 
-            ret = self.run_in_container(apt_command_prefix(verbosity) +
-                    extra_apt_args + " install -f") == 0
+            ret = self.run_in_container(apt_command_prefix(verbosity) + " install -f") == 0
 
             if delete_package:
                 self.delete_package_in_container(package_name)
 
             return ret
         else:
-            return self.run_in_container(apt_command_prefix(verbosity) +
-                    extra_apt_args + " install '" + package_name + "'") == 0
+            cmd = apt_command_prefix(verbosity) + " install '" + package_name + "'"
+            if readline:
+                cmd = "env DEBIAN_FRONTEND=readline " + cmd
+            return self.run_in_container(cmd) == 0
 
     def configure_command(self, command, *args, verbosity=1):
         """
@@ -326,17 +329,17 @@
         except RuntimeError as e:
             return handle_runtime_error(e)
 
-    def install_package(self, package_name, verbosity=1):
+    def install_package(self, package_name, verbosity=1, readline=False):
         """
         Installs a package in the container.
         """
         try:
             with ContainerRunning(self.container):
-                return self.container.install_package(package_name, verbosity)
+                return self.container.install_package(package_name, verbosity, readline)
         except RuntimeError as e:
             return handle_runtime_error(e)
 
-    def remove_package(self, package_name, verbosity=1):
+    def remove_package(self, package_name, verbosity=1, readline=False):
         """
         Removes a package from the container.
 
@@ -345,7 +348,10 @@
         """
         try:
             with ContainerRunning(self.container):
-                if self.container.run_in_container(apt_command_prefix(verbosity) + "purge '" + package_name + "'") != 0:
+                cmd = apt_command_prefix(verbosity) + " purge '" + package_name + "'"
+                if readline:
+                    cmd = "env DEBIAN_FRONTEND=readline " + cmd
+                if self.container.run_in_container(cmd) != 0:
                     return False
                 return self.container.run_in_container(apt_command_prefix(verbosity) + "autoremove --purge") == 0
         except RuntimeError as e:
 
=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-05-11 17:26:27 +0000
+++ python/libertine/LxcContainer.py	2016-06-07 12:41:22 +0000
@@ -225,7 +225,7 @@
         # Bind mount the user's home directory
         self.container.append_config_item("lxc.mount.entry", home_entry)
 
-        xdg_user_dirs = ['Documents', 'Music', 'Pictures', 'Videos']
+        xdg_user_dirs = utils.get_common_xdg_directories()
 
         for user_dir in xdg_user_dirs:
             xdg_user_dir_entry = (
 
=== modified file 'python/libertine/utils.py'
--- python/libertine/utils.py	2016-04-06 19:14:10 +0000
+++ python/libertine/utils.py	2016-06-07 12:41:22 +0000
@@ -100,12 +100,29 @@
     return dpkg.stdout.read().strip()
 
 
+def get_common_xdg_directories():
+    return ['Documents', 'Music', 'Pictures', 'Videos', 'Downloads']
+
+
 def create_libertine_user_data_dir(container_id):
     user_data = get_libertine_container_userdata_dir_path(container_id)
 
     if not os.path.exists(user_data):
         os.makedirs(user_data)
 
+    config_path = os.path.join(user_data, ".config", "dconf")
+
+    if not os.path.exists(config_path):
+        os.makedirs(config_path)
+
+    xdg_user_dirs = get_common_xdg_directories()
+
+    for xdg_dir in xdg_user_dirs:
+        xdg_path = os.path.join(user_data, xdg_dir)
+
+        if not os.path.exists(xdg_path):
+            os.makedirs(xdg_path)
+
 
 def get_libertine_lxc_socket():
     return '\0libertine_lxc_socket'
 
=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2016-05-02 20:45:21 +0000
+++ tools/CMakeLists.txt	2016-06-07 12:41:22 +0000
@@ -5,3 +5,6 @@
         COMPONENT doc)
 install(PROGRAMS update-puritine-containers
         DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libertine)
+
+install(FILES bash_completion.d/libertine-container-manager
+        DESTINATION ${DESTDIR}/etc/bash_completion.d)
 
=== added directory 'tools/bash_completion.d'
=== added file 'tools/bash_completion.d/libertine-container-manager'
--- tools/bash_completion.d/libertine-container-manager	1970-01-01 00:00:00 +0000
+++ tools/bash_completion.d/libertine-container-manager	2016-06-07 12:41:22 +0000
@@ -0,0 +1,72 @@
+# Copyright (C) 2016 Canonical Ltd.
+# Author: Larry Price <[e-mail]>
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+_libertine-container-manager()
+{
+    local cur cmd opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    cmd="${COMP_WORDS[1]}"
+
+    if [[ ${cur} == -* ]]; then
+      case "${cmd}" in
+      "install-package" )
+        opts="--help --id --package --readline"
+        ;;
+      "remove-package" )
+        opts="--help --id --package --readline"
+        ;;
+      "create" )
+        opts="--help --id --type --distro --name --force --multiarch --password"
+        ;;
+      "destroy" )
+        opts="--help --id"
+        ;;
+      "search-cache" )
+        opts="--help --id --search-string"
+        ;;
+      "update" )
+        opts="--help --id"
+        ;;
+      "list-apps" )
+        opts="--help --id --json"
+        ;;
+      "list" )
+        opts="--help"
+        ;;
+      "configure" )
+        opts="--help --id --multiarch --add-archive --delete-archive"
+        ;;
+      * )
+        opts="--help --quiet --verbose"
+        ;;
+      esac
+    fi
+
+    if [[ ${cmd} == "configure" && "${COMP_WORDS[COMP_CWORD-1]}" == "--multiarch" ]]; then
+      opts="enable disable"
+    fi
+
+    if [[ -z ${opts} && "${COMP_CWORD}" == "1" ]]; then
+      opts="create destroy install-package remove-package search-cache update list list-apps configure"
+    fi
+
+    if [[ -n "${opts}" ]]; then
+      COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+      return 0
+    fi
+}
+complete -F _libertine-container-manager libertine-container-manager
 
=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-05-11 17:26:27 +0000
+++ tools/libertine-container-manager	2016-06-07 12:41:22 +0000
@@ -305,6 +305,16 @@
                     return
 
 
+def get_package_install_status(container_id, package_name):
+    container_list = read_container_config_file()
+
+    for container in container_list['containerList']:
+        if container['id'] == container_id:
+            for package in container['installedApps']:
+                if package['packageName'] == package_name:
+                    return package['appStatus']
+
+
 def add_new_package(container_id, package_name):
     container_list = read_container_config_file()
 
@@ -392,6 +402,14 @@
     update_container_install_status(args.id, "ready")
 
 
+def destroy_container_by_id(id):
+    container = LibertineContainer(id)
+    update_container_install_status(id, "removing")
+    container.destroy_libertine_container()
+    update_container_install_status(id, "removed")
+    delete_container(id)
+
+
 def destroy(args):
     if args.id and not libertine.utils.container_exists(args.id):
         print("Container id \'%s\' does not exist." % args.id, file=sys.stderr)
@@ -399,11 +417,7 @@
     elif not args.id:
         args.id = get_default_container_id()
 
-    container = LibertineContainer(args.id)
-    update_container_install_status(args.id, "removing")
-    container.destroy_libertine_container()
-    update_container_install_status(args.id, "removed")
-    delete_container(args.id)
+    destroy_container_by_id(args.id)
 
 
 def install_package(args):
@@ -434,13 +448,28 @@
     container = LibertineContainer(args.id)
 
     update_package_install_status(args.id, package, "installing")
-    if not container.install_package(args.package, args.verbosity):
+    if not container.install_package(args.package, args.verbosity, args.readline):
         delete_package(args.id, package)
         sys.exit(1)
 
     update_package_install_status(args.id, package, "installed")
 
 
+def remove_package_by_name(container_id, package_name, verbosity=1, readline=False):
+    fallback_status = get_package_install_status(container_id, package_name)
+    update_package_install_status(container_id, package_name, "removing")
+
+    container = LibertineContainer(container_id)
+    if not container.remove_package(package_name, verbosity, readline):
+        update_package_install_status(container_id, package_name, fallback_status)
+        return False
+
+    update_package_install_status(container_id, package_name, "removed")
+    delete_package(container_id, package_name)
+
+    return True
+
+
 def remove_package(args):
     if args.id and not libertine.utils.container_exists(args.id):
         print("Container id \'%s\' does not exist." % args.id, file=sys.stderr)
@@ -448,21 +477,13 @@
     elif not args.id:
         args.id = get_default_container_id()
 
-    if not package_exists(args.id, args.package):
+    if get_package_install_status(args.id, args.package) != 'installed':
         print("Package \'%s\' is not installed." % args.package)
         sys.exit(1)
 
-    container = LibertineContainer(args.id)
-    update_package_install_status(args.id, args.package, "removing")
-
-    if not container.remove_package(args.package, args.verbosity):
-        update_package_install_status(args.id, args.package, "installed")
+    if not remove_package_by_name(args.id, args.package, args.verbosity, args.readline):
         sys.exit(1)
 
-    update_package_install_status(args.id, args.package, "removed")
-
-    delete_package(args.id, args.package)
-
 
 def search_cache(args):
     if args.id and not libertine.utils.container_exists(args.id):
@@ -523,6 +544,14 @@
         sys.exit(1)
 
 
+def delete_archive_by_name(container_id, archive_name):
+    update_archive_install_status(container_id, archive_name, 'removing')
+    if LibertineContainer(container_id).configure_command('delete-archive', archive_name) is not 0:
+        return False
+    delete_container_archive(container_id, archive_name)
+    return True
+
+
 def configure(args):
     if args.id and not libertine.utils.container_exists(args.id):
         print("Container id \'%s\' does not exist." % args.id, file=sys.stderr)
@@ -565,17 +594,30 @@
             print("%s is not added in container." % args.delete_archive)
             sys.exit(1)
 
-        update_archive_install_status(args.id, args.delete_archive, 'removing')
-        if container.configure_command('delete-archive', args.delete_archive) is not 0:
+        if not delete_archive_by_name(args.id, args.delete_archive):
             sys.exit(1)
 
-        delete_container_archive(args.id, args.delete_archive)
-
 
 def merge(args):
     merge_container_config_files(args.file)
 
 
+def fix_integrity(args):
+    for container in read_container_config_file()['containerList']:
+        if container['installStatus'] != 'ready':
+            destroy_container_by_id(container['id'])
+            continue
+        LibertineContainer(container['id']).exec_command('dpkg --configure -a')
+
+        for package in container['installedApps']:
+            if package['appStatus'] != 'installed':
+                remove_package_by_name(container['id'], package['packageName'])
+        if 'extraArchives' in container:
+            for archive in container['extraArchives']:
+                if archive['archiveStatus'] != 'installed':
+                    delete_archive_by_name(container['id'], archive['archiveName'])
+
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="Legacy X application support for Unity 8")
 
@@ -644,6 +686,9 @@
     parser_install.add_argument(
         '-i', '--id',
         help=("Container identifier.  Default container is used if omitted."))
+    parser_install.add_argument(
+        '-r', '--readline', action='store_true',
+        help=("Readline mode. Use text-based frontend during debconf interactions."))
     parser_install.set_defaults(func=install_package)
 
     # Handle the remove-package command and its options
@@ -657,6 +702,9 @@
     parser_remove.add_argument(
         '-i', '--id',
         help=("Container identifier.  Default container is used if omitted."))
+    parser_remove.add_argument(
+        '-r', '--readline', action='store_true',
+        help=("Readline mode. Use text-based frontend during debconf interactions."))
     parser_remove.set_defaults(func=remove_package)
 
     # Handle the search-cache command and its options
@@ -747,6 +795,12 @@
         required=True)
     parser_merge.set_defaults(func=merge)
 
+    # Indiscriminately destroy containers, packages, and archives which are not fully installed
+    parser_integrity = subparsers.add_parser(
+        'fix-integrity',
+        add_help=False)
+    parser_integrity.set_defaults(func=fix_integrity)
+
     # Actually parse the args
     args = parser.parse_args()
     if args.verbosity is None:
 
=== modified file 'tools/libertine-launch'
--- tools/libertine-launch	2016-05-05 20:41:46 +0000
+++ tools/libertine-launch	2016-06-07 12:41:22 +0000
@@ -25,18 +25,36 @@
 from libertine import LibertineContainer
 
 
-def set_dbus_session_socket_path():
+def get_session_socket_path(session_socket_name):
     unique_id = os.environ['DISPLAY'].strip(':')
 
     if not os.path.exists(libertine.utils.get_libertine_runtime_dir()):
         os.makedirs(libertine.utils.get_libertine_runtime_dir())
 
-    dbus_session_socket_path = (
-        os.path.join(libertine.utils.get_libertine_runtime_dir(), 'host_dbus_session' + unique_id))
-
-    os.environ['DBUS_SESSION_BUS_ADDRESS'] = "unix:path=" + dbus_session_socket_path
-
-    return dbus_session_socket_path
+    session_socket_path = (
+        os.path.join(libertine.utils.get_libertine_runtime_dir(), session_socket_name + unique_id))
+
+    return session_socket_path
+
+
+def get_dbus_session_socket_path():
+    return get_session_socket_path('host_dbus_session')
+
+
+def get_maliit_session_socket_path():
+    return get_session_socket_path('host_maliit_session')
+
+
+def set_env_socket_path(session_socket_path, session_env):
+    os.environ[session_env] = "unix:path=" + session_socket_path
+
+
+def set_dbus_env_socket_path(socket_path):
+    set_env_socket_path(socket_path, 'DBUS_SESSION_BUS_ADDRESS')
+
+
+def set_maliit_env_socket_path(socket_path):
+    set_env_socket_path(socket_path, 'MALIIT_SERVER_ADDRESS')
 
 
 def launch_libertine_session_bridge(session_socket_path):
@@ -74,11 +92,17 @@
         if e in os.environ:
             del os.environ[e]
 
-    session_socket_path = set_dbus_session_socket_path()
-
-    session_bridge = launch_libertine_session_bridge(session_socket_path)
-
-    detect_session_bridge_socket(session_socket_path)
+    dbus_socket_path = get_dbus_session_socket_path()
+    maliit_socket_path = get_maliit_session_socket_path()
+    session_bridge_arguments = dbus_socket_path + ' ' + maliit_socket_path
+
+    session_bridge = launch_libertine_session_bridge(session_bridge_arguments)
+
+    set_dbus_env_socket_path(dbus_socket_path)
+    set_maliit_env_socket_path(maliit_socket_path)
+
+    # should detect the maliit socket, but dont know if its around or not here.
+    detect_session_bridge_socket(dbus_socket_path)
 
     container = LibertineContainer(args.container_id) 
 
 
=== modified file 'tools/libertine-session-bridge'
--- tools/libertine-session-bridge	2016-02-04 20:23:58 +0000
+++ tools/libertine-session-bridge	2016-06-07 12:41:22 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 
+import dbus 
 import libertine.utils
 import os
 import select
@@ -9,15 +10,15 @@
 from socket import *
 
 
-def accept_new_connection():
-    newconn = container_dbus_session_sock.accept()[0]
+def accept_new_connection(host_adder, container_sock):
+    newconn = container_sock.accept()[0]
     descriptors.append(newconn)
 
-    host_dbus_session_sock = socket(AF_UNIX, SOCK_STREAM)
-    host_dbus_session_sock.connect(host_dbus_session_addr)
-    descriptors.append(host_dbus_session_sock)
+    host_sock = socket(AF_UNIX, SOCK_STREAM)
+    host_sock.connect(host_adder)
+    descriptors.append(host_sock)
 
-    socket_pairs.append([newconn, host_dbus_session_sock])
+    socket_pairs.append([newconn, host_sock])
 
 
 def get_socket_pair(socket):
@@ -57,6 +58,26 @@
         j.close()
 
 
+def get_host_maliit_socket():
+    address_bus_name    = "org.maliit.server"
+    address_object_path = "/org/maliit/server/address"
+    address_interface   = "org.maliit.Server.Address"
+    address_property    = "address"
+    
+    session_bus = dbus.SessionBus()
+    maliit_object = session_bus.get_object('org.maliit.server', '/org/maliit/server/address')
+
+    interface = dbus.Interface(maliit_object, dbus.PROPERTIES_IFACE)
+    address = interface.Get('org.maliit.Server.Address', 'address')
+
+    partition_key = 'unix:abstract='
+    address = address.split(',')[0]
+    address = address.partition(partition_key)[2]
+    address = "\0%s" % address
+
+    return address
+
+
 def get_host_dbus_socket():
     socket_key = "DBUS_SESSION_BUS_ADDRESS=unix:abstract="
 
@@ -73,9 +94,13 @@
 
 
 def socket_cleanup(signum, frame):
-    container_dbus_session_sock.close()
+    for socket in descriptors:
+        socket.close()
+
     close_all_connections()
-    os.remove(dbus_session_socket_path)
+
+    for socket_path in session_socket_paths:
+        os.remove(socket_path)
 
 
 def main_loop():
@@ -94,8 +119,8 @@
             if sock.fileno() == -1:
                 continue
 
-            if sock == container_dbus_session_sock:
-                accept_new_connection()
+            if sock in host_session_socket_path_map:
+                accept_new_connection(host_session_socket_path_map[sock], sock)
 
             else:
                 data = sock.recv(4096)
@@ -118,14 +143,54 @@
                     totalsent = totalsent + sent
 
 
-dbus_session_socket_path = sys.argv[1]
-
-container_dbus_session_sock = socket(AF_UNIX, SOCK_STREAM)
-container_dbus_session_sock.bind(dbus_session_socket_path)
-container_dbus_session_sock.listen(5)
-
-host_dbus_session_addr = get_host_dbus_socket()
-descriptors = [container_dbus_session_sock]
+def create_socket(session_socket_path):
+    try:
+        sock = socket(AF_UNIX, SOCK_STREAM)
+    except:
+        sock = None
+    else:
+        try:
+            sock.bind(session_socket_path)
+            sock.listen(5)
+        except:
+            sock.close()
+            sock = None
+        else:
+            return sock
+
+    return None
+    
+
+def create_container_socket(session_socket_path, get_host_session_path_function):
+    container_session_sock = create_socket(session_socket_path)
+
+    if container_session_sock is not None:
+        try:
+            host_session_path = get_host_session_path_function()
+        except:
+            container_session_sock.close()
+            container_session_sock = None
+            raise
+        else:
+            host_session_socket_path_map.update({container_session_sock:host_session_path})
+
+            session_socket_paths.append(session_socket_path)
+            descriptors.append(container_session_sock)
+
+
+descriptors = []
+host_session_socket_path_map = {}
+session_socket_paths = []
+
+# Required sockets:
+create_container_socket(sys.argv[1], get_host_dbus_socket)
+
+# Optional sockets:
+try:
+    create_container_socket(sys.argv[2], get_host_maliit_socket)
+except:
+    pass
+
 socket_pairs = []
 
 main_loop()