Merge lp:~libertine-team/libertine/merge-devel into lp:libertine/trunk

[Christopher Townsend]

Merge in lp:libertine. Fixes include:
* Rename desktop files to match the Puritine container name.
* Add an upstart job to link to the Puritine container data.
* Add a function to determine the architecture used to create the container and set the container's sources.list entries appropriately.
* Add support for explicitly naming a container when creating one and various variable naming cleanup.
* Add a policy-rc.d script to the chroot to keep certain services from starting during package installation.
* Add runtime depends for fakechroot and fakeroot.
* Install Compiz by default inside the container.
* Install the create_bespoke_container script. This script will be moved to lp:puritine in the future.
* Add a libertine-demo package that installs desktop files and icons for the supported X apps.

[Stephen M. Webb (bregma)]

I removed the changelog messages for changes already landed in /trunk.

review: Approve

[lp:~libertine-team/libertine/merge-devel]

100. By Christopher Townsend on 2015-09-18

Merge in lp:libertine. Fixes include:
* Rename desktop files to match the Puritine container name.
* Add an upstart job to link to the Puritine container data.
* Add a function to determine the architecture used to create the container and set the container's sources.list entries appropriately.
* Add support for explicitly naming a container when creating one and various variable naming cleanup.
* Add a policy-rc.d script to the chroot to keep certain services from starting during package installation.
* Add runtime depends for fakechroot and fakeroot.
* Install Compiz by default inside the container.
* Install the create_bespoke_container script. This script will be moved to lp:puritine in the future.
* Add a libertine-demo package that installs desktop files and icons for the supported X apps.
Approved by: Stephen M. Webb

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-07-24 01:37:08 +0000
+++ data/CMakeLists.txt	2015-09-18 17:06:14 +0000
@@ -1,5 +1,8 @@
+add_subdirectory(demo)
+
 install(FILES libertine.desktop
         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
 install(FILES libertine_64.png
   DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME})
-
+install(FILES puritine-click.conf
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)

=== added directory 'data/demo'
=== added file 'data/demo/CMakeLists.txt'
--- data/demo/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/demo/CMakeLists.txt	2015-09-18 17:06:14 +0000
@@ -0,0 +1,4 @@
+add_subdirectory(desktop_files)
+
+install(DIRECTORY icons/
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/demo/icons)

=== added directory 'data/demo/desktop_files'
=== added file 'data/demo/desktop_files/CMakeLists.txt'
--- data/demo/desktop_files/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/demo/desktop_files/CMakeLists.txt	2015-09-18 17:06:14 +0000
@@ -0,0 +1,24 @@
+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")

=== added file 'data/demo/desktop_files/puritine_firefox_0.0.desktop.in'
--- data/demo/desktop_files/puritine_firefox_0.0.desktop.in	1970-01-01 00:00:00 +0000
+++ data/demo/desktop_files/puritine_firefox_0.0.desktop.in	2015-09-18 17:06:14 +0000
@@ -0,0 +1,11 @@
+[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

=== added file 'data/demo/desktop_files/puritine_gedit_0.0.desktop.in'
--- data/demo/desktop_files/puritine_gedit_0.0.desktop.in	1970-01-01 00:00:00 +0000
+++ data/demo/desktop_files/puritine_gedit_0.0.desktop.in	2015-09-18 17:06:14 +0000
@@ -0,0 +1,11 @@
+[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

=== added file 'data/demo/desktop_files/puritine_gimp_0.0.desktop.in'
--- data/demo/desktop_files/puritine_gimp_0.0.desktop.in	1970-01-01 00:00:00 +0000
+++ data/demo/desktop_files/puritine_gimp_0.0.desktop.in	2015-09-18 17:06:14 +0000
@@ -0,0 +1,11 @@
+[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

=== added file 'data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in'
--- data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in	1970-01-01 00:00:00 +0000
+++ data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in	2015-09-18 17:06:14 +0000
@@ -0,0 +1,11 @@
+[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

=== added file 'data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in'
--- data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in	1970-01-01 00:00:00 +0000
+++ data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in	2015-09-18 17:06:14 +0000
@@ -0,0 +1,11 @@
+[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

=== added directory 'data/demo/icons'
=== added file 'data/demo/icons/accessories-text-editor.svg'
--- data/demo/icons/accessories-text-editor.svg	1970-01-01 00:00:00 +0000
+++ data/demo/icons/accessories-text-editor.svg	2015-09-18 17:06:14 +0000
@@ -0,0 +1,119 @@
+<?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>

=== added file 'data/demo/icons/firefox.png'
Binary files data/demo/icons/firefox.png	1970-01-01 00:00:00 +0000 and data/demo/icons/firefox.png	2015-09-18 17:06:14 +0000 differ
=== added file 'data/demo/icons/gimp.png'
Binary files data/demo/icons/gimp.png	1970-01-01 00:00:00 +0000 and data/demo/icons/gimp.png	2015-09-18 17:06:14 +0000 differ
=== added file 'data/demo/icons/libreoffice-startcenter.png'
Binary files data/demo/icons/libreoffice-startcenter.png	1970-01-01 00:00:00 +0000 and data/demo/icons/libreoffice-startcenter.png	2015-09-18 17:06:14 +0000 differ
=== added file 'data/demo/icons/xchat-gnome.png'
Binary files data/demo/icons/xchat-gnome.png	1970-01-01 00:00:00 +0000 and data/demo/icons/xchat-gnome.png	2015-09-18 17:06:14 +0000 differ
=== added file 'data/puritine-click.conf'
--- data/puritine-click.conf	1970-01-01 00:00:00 +0000
+++ data/puritine-click.conf	2015-09-18 17:06:14 +0000
@@ -0,0 +1,34 @@
+description "Puritine Click chroot linking"
+
+start on started 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 [ ! -f $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
+
+	# Link the container config
+	if [ ! -f $HOME/.local/share/libertine/ContainersConfig.json ] ; then
+		mkdir -p $HOME/.local/share/libertine/
+		ln -s $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json $HOME/.local/share/libertine/ContainersConfig.json
+	fi
+
+	# Link the Compiz configs
+	if [ ! -d $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME/.config/compiz-1/compizconfig ] ; then
+		mkdir -p $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME/.config/compiz-1/compizconfig/
+		ln -s $PACKAGE_PATH/libertine-config/libertine-container/user-data/$CONTAINER_NAME/.config/compiz-1/compizconfig/config $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME/.config/compiz-1/compizconfig/config
+		ln -s $PACKAGE_PATH/libertine-config/libertine-container/user-data/$CONTAINER_NAME/.config/compiz-1/compizconfig/Default.ini $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME/.config/compiz-1/compizconfig/Default.ini
+	fi
+else
+	rm -rf $HOME/.cache/libertine-container/$CONTAINER_NAME
+	rm -rf $HOME/.local/share/libertine
+	rm -rf $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME/.config/
+fi
+end script

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-10 14:36:22 +0000
+++ debian/changelog	2015-09-18 17:06:14 +0000
@@ -1,3 +1,26 @@
+libertine (0.99.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Chris Townsend ]
+  * Rename desktop files to match the Puritine container name.
+  * Add an upstart job to link to the Puritine container data.
+  * Add a function to determine the architecture used to create the 
+    container and set the container's sources.list entries appropriately.
+  * Add support for explicitly naming a container when creating one and 
+    various variable naming cleanup.
+  * Add a policy-rc.d script to the chroot to keep certain services from
+    starting during package installation.
+  * Add runtime depends for fakechroot and fakeroot.
+  * Install Compiz by default inside the container.
+  * Install the create_bespoke_container script. This script will be moved
+    to lp:puritine in the future.
+  * Add a libertine-demo package that installs desktop files and icons for
+    the supported X apps.
+
+  [ Ted Gould ]
+  * Add an upstart job to link to the Puritine container data.
+
+ -- Chris Townsend <[e-mail]>  Fri, 18 Sep 2015 12:58:32 -0400
+
 libertine (0.99+15.10.20150910.2-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'debian/control'
--- debian/control	2015-09-10 13:45:10 +0000
+++ debian/control	2015-09-18 17:06:14 +0000
@@ -30,8 +30,8 @@
 
 Package: libertine-tools
 Architecture: any
-Depends: python3-daemonize,
-         python3-libertine,
+Depends: python3-libertine,
+         python3-psutil,
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
@@ -77,6 +77,8 @@
 Section: python
 Multi-Arch: allowed
 Depends: debootstrap,
+         fakechroot,
+         fakeroot,
          gir1.2-libertine,
          lsb-release,
          lxc-templates,
@@ -88,3 +90,12 @@
          ${python3:Depends}
 Description: Python3 scripts for the Libertine application sandbox
  Python3 modules for the Libertine application sandbox tools.
+
+Package: libertine-demo
+Architecture: any
+Multi-Arch: allowed
+Depends: libertine-tools,
+         ${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.

=== added file 'debian/libertine-demo.install'
--- debian/libertine-demo.install	1970-01-01 00:00:00 +0000
+++ debian/libertine-demo.install	2015-09-18 17:06:14 +0000
@@ -0,0 +1,4 @@
+data/demo/icons/* usr/share/libertine/demo/icons/
+usr/bin/create_bespoke_container
+usr/share/applications/demo/* usr/share/applications/
+usr/share/upstart/sessions/puritine-click.conf

=== added file 'debian/libertine-demo.lintian-overrides'
--- debian/libertine-demo.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libertine-demo.lintian-overrides	2015-09-18 17:06:14 +0000
@@ -0,0 +1,5 @@
+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 'libertine/ContainerConfig.cpp'
--- libertine/ContainerConfig.cpp	2015-07-30 15:16:08 +0000
+++ libertine/ContainerConfig.cpp	2015-09-18 17:06:14 +0000
@@ -100,11 +100,11 @@
   }
 
   QString
-  extract_image_id_from_json(QJsonObject const& json_object,
-                             QString const&     container_id)
+  extract_distro_series_from_json(QJsonObject const& json_object,
+                                  QString const&     container_id)
   {
-    QString image = container_id;
-    QJsonValue value = json_object["image"];
+    QString distro_series = container_id;
+    QJsonValue value = json_object["distro"];
     if (value != QJsonValue::Undefined)
     {
       QJsonValue::Type value_type = value.type();
@@ -113,12 +113,12 @@
         QString s = value.toString();
         if (s.length() > 0)
         {
-          image = s;
+          distro_series = s;
         }
       }
     }
 
-    return image;
+    return distro_series;
   }
 
   const static struct { QString string; ContainerConfig::InstallStatus enumeration; } install_status_names[] =
@@ -268,13 +268,13 @@
 ContainerConfig(QString const& container_id,
                 QString const& container_name,
                 QString const& container_type,
-                QString const& image_id,
+                QString const& distro_series,
                 QObject*       parent)
 : QObject(parent)
 , container_id_(container_id)
 , container_name_(container_name)
 , container_type_(container_type)
-, image_id_(image_id)
+, distro_series_(distro_series)
 , install_status_(InstallStatus::New)
 { }
 
@@ -287,7 +287,7 @@
 , container_id_(extract_container_id_from_json(json_object))
 , container_name_(extract_container_name_from_json(json_object, container_id_))
 , container_type_(extract_container_type_from_json(json_object, container_id_))
-, image_id_(extract_image_id_from_json(json_object, container_id_))
+, distro_series_(extract_distro_series_from_json(json_object, container_id_))
 , install_status_(extract_install_status_from_json(json_object))
 , container_apps_(extract_container_apps_from_json(json_object))
 { }
@@ -322,8 +322,8 @@
 
 
 QString const& ContainerConfig::
-image_id() const
-{ return image_id_; }
+distro_series() const
+{ return distro_series_; }
 
 
 ContainerConfig::InstallStatus ContainerConfig::
@@ -354,7 +354,7 @@
   json_object["id"] = container_id_;
   json_object["name"] = container_name_;
   json_object["type"] = container_type_;
-  json_object["image"] = image_id_;
+  json_object["distro"] = distro_series_;
   for (auto const& name: install_status_names)
   {
     if (install_status_ == name.enumeration)

=== modified file 'libertine/ContainerConfig.h'
--- libertine/ContainerConfig.h	2015-07-30 15:16:08 +0000
+++ libertine/ContainerConfig.h	2015-09-18 17:06:14 +0000
@@ -63,7 +63,7 @@
   Q_ENUMS(InstallStatus)
   Q_PROPERTY(QString containerId READ container_id)
   Q_PROPERTY(QString name READ name WRITE name NOTIFY nameChanged)
-  Q_PROPERTY(QString imageId READ image_id)
+  Q_PROPERTY(QString distroSeries READ distro_series)
   Q_PROPERTY(InstallStatus installStatus READ install_status WRITE install_status NOTIFY installStatusChanged)
 
 public:
@@ -76,7 +76,7 @@
   ContainerConfig(QString const& container_id,
                   QString const& container_name,
                   QString const& container_type,
-                  QString const& image_id,
+                  QString const& distro_series,
                   QObject*       parent = nullptr);
   ContainerConfig(QJsonObject const& json_object,
                   QObject*           parent = nullptr);
@@ -95,7 +95,7 @@
   container_type() const;
 
   QString const&
-  image_id() const;
+  distro_series() const;
 
   InstallStatus
   install_status() const;
@@ -117,7 +117,7 @@
   QString               container_id_;
   QString               container_name_;
   QString               container_type_;
-  QString               image_id_;
+  QString               distro_series_;
   InstallStatus         install_status_;
   QList<ContainerApps*> container_apps_;
 };

=== modified file 'libertine/ContainerConfigList.cpp'
--- libertine/ContainerConfigList.cpp	2015-07-30 15:16:08 +0000
+++ libertine/ContainerConfigList.cpp	2015-09-18 17:06:14 +0000
@@ -108,25 +108,32 @@
 QString ContainerConfigList::
 addNewContainer(QVariantMap const& image, QString const& type)
 {
-  QString image_id = image["id"].toString();
-  QString id = image_id;
+  QString distro_series = image["distro_series"].toString();
+  QString container_id = image["container_id"].toString();
   QString name = image["name"].toString();
-  int bis = generate_bis(image_id);
+
+  // Work around for now until we implement host distro discovery
+  if (distro_series.isEmpty())
+  {
+    distro_series = container_id;
+  }
+
+  int bis = generate_bis(container_id);
   if (bis > 0)
   {
-    id = QString("%1-%2").arg(id).arg(bis);
+    container_id = QString("%1-%2").arg(container_id).arg(bis);
     name = QString("%1 (%2)").arg(name).arg(bis);
   }
 
   beginInsertRows(QModelIndex(), rowCount(), rowCount());
-  configs_.append(new ContainerConfig(id, name, type, image_id, this));
+  configs_.append(new ContainerConfig(container_id, name, type, distro_series, this));
   if (this->size() == 1)
-    default_container_id_ = id;
+    default_container_id_ = container_id;
 
   save_container_config_list();
   endInsertRows();
 
-  return id;
+  return container_id;
 }
 
 
@@ -325,7 +332,7 @@
   roles[static_cast<int>(DataRole::ContainerId)]    = "containerId";
   roles[static_cast<int>(DataRole::ContainerName)]  = "name";
   roles[static_cast<int>(DataRole::ContainerType)]  = "type";
-  roles[static_cast<int>(DataRole::ImageId)]        = "imageId";
+  roles[static_cast<int>(DataRole::DistroSeries)]   = "distroSeries";
   roles[static_cast<int>(DataRole::InstallStatus)]  = "installStatus";
   return roles;
 }
@@ -349,8 +356,8 @@
       case DataRole::ContainerType:
         result = configs_[index.row()]->container_type();
         break;
-      case DataRole::ImageId:
-        result = configs_[index.row()]->image_id();
+      case DataRole::DistroSeries:
+        result = configs_[index.row()]->distro_series();
         break;
       case DataRole::InstallStatus:
         result = static_cast<int>(configs_[index.row()]->install_status());
@@ -381,7 +388,7 @@
 
 
 int ContainerConfigList::
-generate_bis(QString const& image_id)
+generate_bis(QString const& id)
 {
   int bis = 0;
   int max = 0;
@@ -389,7 +396,7 @@
   for (auto const& config: configs_)
   {
     int found = re.indexIn(config->container_id());
-    if (found >= 0 && re.cap(1) == image_id)
+    if (found >= 0 && re.cap(1) == id)
     {
       ++bis;
       bool ok;

=== modified file 'libertine/ContainerConfigList.h'
--- libertine/ContainerConfigList.h	2015-08-07 12:39:26 +0000
+++ libertine/ContainerConfigList.h	2015-09-18 17:06:14 +0000
@@ -61,7 +61,7 @@
     ContainerId = Qt::UserRole + 1,   /**< The container ID */
     ContainerName,                    /**< The container name */
     ContainerType,                    /**< The type of container - lxc or chroot */
-    ImageId,                          /**< The image from which the container was built */
+    DistroSeries,                     /**< The distro from which the container was built */
     InstallStatus,                    /**< Current container install status */
     Error                             /**< last role (error) */
   };
@@ -179,7 +179,7 @@
    * identical container ids and names.
    */
   int
-  generate_bis(QString const& image_id);
+  generate_bis(QString const& distro_series);
 
   void
   save_container_config_list();

=== modified file 'libertine/libertine_container_manager_cli.cpp'
--- libertine/libertine_container_manager_cli.cpp	2015-08-26 08:22:14 +0000
+++ libertine/libertine_container_manager_cli.cpp	2015-09-18 17:06:14 +0000
@@ -60,12 +60,23 @@
     commandlineParser.clearPositionalArguments();
     commandlineParser.addPositionalArgument("create", QCoreApplication::translate("main", "Create a new Libertine container."));
     commandlineParser.addOption({{"t", "type"}, QCoreApplication::translate("main", "Type of container.  Either 'lxc' or 'chroot'."), "container_type"});
-    commandlineParser.addOption({{"s", "series"}, QCoreApplication::translate("main", "Ubuntu distro series to create."), "distro_series"});
+    commandlineParser.addOption({{"d", "distro"}, QCoreApplication::translate("main", "Ubuntu distro series to create."), "distro_series"});
+    commandlineParser.addOption({{"i", "id"}, QCoreApplication::translate("main", "Container identifier."), "container_id"});
     commandlineParser.process(app);
 
     QString password;
     const QString container_type = commandlineParser.value("type");
-    const QString distro_series = commandlineParser.value("series");
+    const QString distro_series = commandlineParser.value("distro");
+
+    QString container_id;
+    if (commandlineParser.isSet("id"))
+    {
+      container_id = commandlineParser.value("id");
+    }
+    else
+    {
+      container_id = distro_series;
+    }
 
     if (container_type == "lxc")
     {
@@ -99,26 +110,27 @@
 
     QVariantMap image;
 
+    image.insert("distro_series", distro_series);
     if (distro_series == "trusty")
     {
-      image.insert("id", "trusty");
+      image.insert("container_id", container_id);
       image.insert("name", "Ubuntu 'Trusty Tahr'");
     }
     else if (distro_series == "vivid")
     {
-      image.insert("id", "vivid");
+      image.insert("container_id", container_id);
       image.insert("name", "Ubuntu 'Vivid Vervet'");
     }
     else
     {
-      image.insert("id", "wily");
+      image.insert("container_id", container_id);
       image.insert("name", "Ubuntu 'Wily Werewolf'");
     }
 
-    QString container_id = containers->addNewContainer(image, container_type);
+    QString unique_container_id = containers->addNewContainer(image, container_type);
 
     ContainerManagerWorker *worker = new ContainerManagerWorker(ContainerManagerWorker::ContainerAction::Create,
-                                                                container_id,
+                                                                unique_container_id,
                                                                 container_type,
                                                                 password);
     QObject::connect(worker, SIGNAL(finished()), &app, SLOT(quit()));
@@ -128,14 +140,14 @@
   {
     commandlineParser.clearPositionalArguments();
     commandlineParser.addPositionalArgument("destroy", QCoreApplication::translate("main", "Destroy an existing Libertine container."));
-    commandlineParser.addOption({{"n", "name"}, QCoreApplication::translate("main", "Name of container"), "container_name"});
+    commandlineParser.addOption({{"i", "id"}, QCoreApplication::translate("main", "Container identifier."), "container_id"});
 
     commandlineParser.process(app);
 
     QString container_id;
-    if (commandlineParser.isSet("name"))
+    if (commandlineParser.isSet("id"))
     {
-      container_id = commandlineParser.value("name");
+      container_id = commandlineParser.value("id");
     }
     else
     {
@@ -161,15 +173,15 @@
     commandlineParser.clearPositionalArguments();
     commandlineParser.addPositionalArgument("install-package", QCoreApplication::translate("main", "Install a package in an existing Libertine container."));
 
-    commandlineParser.addOption({{"n", "name"}, QCoreApplication::translate("main", "Name of container"), "container_name"});
+    commandlineParser.addOption({{"i", "id"}, QCoreApplication::translate("main", "Container identifier."), "container_id"});
     commandlineParser.addOption({{"p", "package"}, QCoreApplication::translate("main", "Name of package to install"), "package_name"});
 
     commandlineParser.process(app);
 
     QString container_id;
-    if (commandlineParser.isSet("name"))
+    if (commandlineParser.isSet("id"))
     {
-      container_id = commandlineParser.value("name");
+      container_id = commandlineParser.value("id");
     }
     else
     {
@@ -200,14 +212,14 @@
     commandlineParser.clearPositionalArguments();
     commandlineParser.addPositionalArgument("update", QCoreApplication::translate("main", "Update packages in an existing Libertine container."));
 
-    commandlineParser.addOption({{"n", "name"}, QCoreApplication::translate("main", "Name of container"), "container_name"});
+    commandlineParser.addOption({{"i", "id"}, QCoreApplication::translate("main", "Container identifier."), "container_id"});
 
     commandlineParser.process(app);
 
     QString container_id;
-    if (commandlineParser.isSet("name"))
+    if (commandlineParser.isSet("id"))
     {
-      container_id = commandlineParser.value("name");
+      container_id = commandlineParser.value("id");
     }
     else
     {

=== modified file 'libertine/qml/image_sources.js'
--- libertine/qml/image_sources.js	2015-06-03 19:03:52 +0000
+++ libertine/qml/image_sources.js	2015-09-18 17:06:14 +0000
@@ -1,4 +1,4 @@
 var availableSources = [
-  { id: "wily", name: "Ubuntu 'Wily Werewolf'" },
-  { id: "sid",  name: "Debian 'Unstable'" }
+  { container_id: "wily", name: "Ubuntu 'Wily Werewolf'" },
+  { container_id: "sid",  name: "Debian 'Unstable'" }
 ]

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2015-09-10 13:45:10 +0000
+++ python/libertine/Libertine.py	2015-09-18 17:06:14 +0000
@@ -12,17 +12,18 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import lxc
-import subprocess
-import os
-import lsb_release
 import crypt
 import ctypes
-import tempfile
 import io
-import sys
+import json
+import lsb_release
+import lxc
+import os
 import shlex
 import shutil
+import subprocess
+import sys
+import tempfile
 import xdg.BaseDirectory as basedir
 
 from contextlib import contextmanager
@@ -125,12 +126,72 @@
 def get_libertine_user_data_dir(name):
     return os.path.join(basedir.xdg_data_home, 'libertine-container', 'user-data', name)
 
+def get_libertine_json_file_path():
+    return os.path.join(basedir.xdg_data_home, 'libertine', 'ContainersConfig.json')
+
+def get_container_distro(container_id):
+    container_distro = ""
+
+    with open(get_libertine_json_file_path()) as fd:
+        container_list = json.load(fd)
+        fd.close()
+
+    for container in container_list["containerList"]:
+        if container["id"] == container_id:
+            return container["distro"]
+
+    return ""
+
+def get_host_architecture():
+    dpkg = subprocess.Popen(['dpkg', '--print-architecture'],
+                            stdout=subprocess.PIPE,
+                            universal_newlines=True)
+    if dpkg.wait() != 0:
+        parser.error("Failed to determine the local architecture.")
+
+    return dpkg.stdout.read().strip()
+
+def chown_recursive_dirs(path):
+    uid = int(os.environ['SUDO_UID'])
+    gid = int(os.environ['SUDO_GID'])
+
+    if uid is not None and gid is not None:
+        for root, dirs, files in os.walk(path):
+            for d in dirs:
+                os.chown(os.path.join(root, d), uid, gid)
+            for f in files:
+                os.chown(os.path.join(root, f), uid, gid)
+
+        os.chown(path, uid, gid)
+
 def create_libertine_user_data_dir(name):
     user_data = get_libertine_user_data_dir(name)
 
     if not os.path.exists(user_data):
         os.makedirs(user_data)
 
+def create_compiz_config(name):
+    user_data = get_libertine_user_data_dir(name)
+
+    compiz_config_dir = os.path.join(user_data, '.config', 'compiz-1', 'compizconfig')
+
+    os.makedirs(compiz_config_dir)
+
+    # Create the general Compiz config file
+    with open(os.path.join(compiz_config_dir, 'config'), 'w+') as fd:
+        fd.write("[general]\n")
+        fd.write("profile = Default\n")
+        fd.write("integration = true\n")
+    fd.close()
+
+    # Create the default profile file
+    with open(os.path.join(compiz_config_dir, 'Default.ini'), 'w+') as fd:
+        fd.write("[core]\n")
+        fd.write("s0_active_plugins = core;place;\n\n")
+        fd.write("[place]\n")
+        fd.write("s0_mode = 3")
+    fd.close()
+
 def start_container_for_update(container):
     if not container.running:
         print("Starting the container...")
@@ -167,7 +228,7 @@
 class LibertineLXC(object):
     def __init__(self, name):
         self.container = lxc_container(name)
-        self.series = name.split("-")[0]
+        self.series = get_container_distro(name)
 
     def destroy_libertine_container(self):
         if self.container.defined:
@@ -211,13 +272,7 @@
         installed_release = get_host_distro_release()
 
         ## Figure out the host architecture
-        dpkg = subprocess.Popen(['dpkg', '--print-architecture'],
-                                stdout=subprocess.PIPE,
-                                universal_newlines=True)
-        if dpkg.wait() != 0:
-            parser.error("Failed to determine the local architecture.")
-
-        architecture = dpkg.stdout.read().strip()
+        architecture = get_host_architecture()
 
         self.container.create("download", 0,
                               {"dist": "ubuntu",
@@ -238,6 +293,13 @@
         else:
             print("Container failed to start.")
 
+        print("Updating the contents of the container after creation...")
+        self.update_libertine_container()
+
+        print("Installing Compiz as the Xmir window manager...")
+        self.install_package('compiz')
+        create_compiz_config(self.container.name)
+
     def create_libertine_config(self):
         user_id = os.getuid()
         home_entry = "%s %s none bind,create=dir" % (get_libertine_user_data_dir(self.container.name), home_path.strip('/'))
@@ -324,9 +386,10 @@
 class LibertineChroot(object):
     def __init__(self, name):
         self.name = name
-        self.series = name.split("-")[0]
+        self.series = get_container_distro(name)
         self.chroot_path = os.path.join(get_libertine_container_path(), name, "rootfs")
         os.environ['FAKECHROOT_CMD_SUBST'] = '$FAKECHROOT_CMD_SUBST:/usr/bin/chfn=/bin/true'
+        os.environ['DEBIAN_FRONTEND'] = 'noninteractive'
 
     def destroy_libertine_container(self):
         shutil.rmtree(self.chroot_path)
@@ -348,14 +411,32 @@
             os.remove(os.path.join(self.chroot_path, 'dev'))
             os.remove(os.path.join(self.chroot_path, 'proc'))
 
+            with open(os.path.join(self.chroot_path, 'usr', 'sbin', 'policy-rc.d'), 'w+') as fd:
+                fd.write("#!/bin/sh\n\n")
+                fd.write("while true; do\n")
+                fd.write("case \"$1\" in\n")
+                fd.write("  -*) shift ;;\n")
+                fd.write("  makedev) exit 0;;\n")
+                fd.write("  *)  exit 101;;\n")
+                fd.write("esac\n")
+                fd.write("done\n")
+            fd.close()
+
+            os.chmod(os.path.join(self.chroot_path, 'usr', 'sbin', 'policy-rc.d'), 0o755)
+
         # Add universe and -updates to the chroot's sources.list
+        if (get_host_architecture() == 'armhf'):
+            archive = "deb http://ports.ubuntu.com/ubuntu-ports "
+        else:
+            archive = "deb http://archive.ubuntu.com/ubuntu "
+
         print("Updating chroot's sources.list entries...")
         with open(os.path.join(self.chroot_path, 'etc', 'apt', 'sources.list'), 'a') as fd:
-            fd.write("deb http://archive.ubuntu.com/ubuntu " + installed_release + " universe\n")
-            fd.write("deb http://archive.ubuntu.com/ubuntu " + installed_release + "-updates main\n")
-            fd.write("deb http://archive.ubuntu.com/ubuntu " + installed_release + "-updates universe\n")
+            fd.write(archive + installed_release + " universe\n")
+            fd.write(archive + installed_release + "-updates main\n")
+            fd.write(archive + installed_release + "-updates universe\n")
 
-            fd.close()
+        fd.close()
 
         create_libertine_user_data_dir(self.name)
 
@@ -399,6 +480,16 @@
             args = shlex.split(command_line)
             cmd = subprocess.Popen(args).wait()
 
+        print("Updating the contents of the container after creation...")
+        self.update_libertine_container()
+
+        print("Installing Compiz as the Xmir window manager...")
+        self.install_package("compiz")
+        create_compiz_config(self.name)
+
+        # Check if the container was created as root and chown the user directories as necessary
+        chown_recursive_dirs(get_libertine_user_data_dir(self.name))
+
     def update_libertine_container(self):
         if self.series == "trusty":
             proot_cmd = '/usr/bin/proot'

=== modified file 'tests/unit/ContainerConfigListTests.cpp'
--- tests/unit/ContainerConfigListTests.cpp	2015-07-09 15:22:37 +0000
+++ tests/unit/ContainerConfigListTests.cpp	2015-09-18 17:06:14 +0000
@@ -43,7 +43,7 @@
         "{"
           "\"id\":            \"wily\","
           "\"name\":          \"Wily Werewolf\","
-          "\"image\":         \"wily\","
+          "\"distro\":        \"wily\","
           "\"installedApps\": ["
           "],"
           "\"installStatus\": \"ready\""
@@ -51,7 +51,7 @@
         "{"
           "\"id\":            \"wily1\","
           "\"name\":          \"Wily Werewolf\","
-          "\"image\":         \"wily\","
+          "\"distro\":        \"wily\","
           "\"installedApps\": ["
           "],"
           "\"installStatus\": \"new\""

=== modified file 'tests/unit/ContainerConfigTests.cpp'
--- tests/unit/ContainerConfigTests.cpp	2015-07-30 15:16:08 +0000
+++ tests/unit/ContainerConfigTests.cpp	2015-09-18 17:06:14 +0000
@@ -28,12 +28,12 @@
 /** Verify constructing a New containerConfig DTRT. */
 TEST(LibertineContainerConfig, constructFromScalars)
 {
-  ContainerConfig container_config("id", "name", "type", "image");
+  ContainerConfig container_config("id", "name", "type", "distro");
 
   EXPECT_EQ(container_config.container_id(),   "id");
   EXPECT_EQ(container_config.name(),           "name");
   EXPECT_EQ(container_config.container_type(), "type");
-  EXPECT_EQ(container_config.image_id(),       "image");
+  EXPECT_EQ(container_config.distro_series(),  "distro");
   EXPECT_EQ(container_config.install_status(), ContainerConfig::InstallStatus::New);
 }
 
@@ -45,7 +45,7 @@
         "\"id\":            \"wily3\","
         "\"name\":          \"Wily Werewolf\","
         "\"type\":          \"lxc\","
-        "\"image\":         \"wily\","
+        "\"distro\":        \"wily\","
         "\"installedApps\": ["
         "],"
         "\"installStatus\": \"ready\""
@@ -59,7 +59,7 @@
 
   EXPECT_EQ(container_config.container_id().toStdString(),   "wily3");
   EXPECT_EQ(container_config.name().toStdString(),           "Wily Werewolf");
-  EXPECT_EQ(container_config.image_id().toStdString(),       "wily");
+  EXPECT_EQ(container_config.distro_series().toStdString(),  "wily");
   EXPECT_EQ(container_config.install_status(), ContainerConfig::InstallStatus::Ready);
   EXPECT_EQ(container_config.container_apps().empty(), true);
 }
@@ -71,7 +71,7 @@
         "\"id\":            \"wily3\","
         "\"name\":          \"Wily Werewolf\","
         "\"type\":          \"lxc\","
-        "\"image\":         \"wily\","
+        "\"distro\":        \"wily\","
         "\"installedApps\": ["
             "{"
                  "\"packageName\": \"firefox\","
@@ -99,7 +99,7 @@
         "\"id\":            \"wily3\","
         "\"name\":          \"Wily Werewolf\","
         "\"type\":          \"lxc\","
-        "\"image\":         \"wily\","
+        "\"distro\":        \"wily\","
         "\"installedApps\": ["
             "{"
                  "\"packageName\": \"firefox\","

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2015-09-02 18:58:33 +0000
+++ tools/CMakeLists.txt	2015-09-18 17:06:14 +0000
@@ -1,1 +1,1 @@
-install(PROGRAMS libertine-launch libertine-session-bridge DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(PROGRAMS libertine-launch libertine-session-bridge create_bespoke_container DESTINATION ${CMAKE_INSTALL_BINDIR})

=== renamed file 'tools/create_bespoke_container.sh' => 'tools/create_bespoke_container'
--- tools/create_bespoke_container.sh	2015-08-27 06:52:57 +0000
+++ tools/create_bespoke_container	2015-09-18 17:06:14 +0000
@@ -2,14 +2,11 @@
 
 echo "Creating the base container… "
 
-libertine_container_manager create -t chroot -s trusty
-
-echo "Updating the container… "
-libertine_container_manager update
+libertine_container_manager create -t chroot -d trusty
 
 echo "Installing packages in the container… "
 libertine_container_manager install-package -p gedit
 libertine_container_manager install-package -p libreoffice
-libertine_container_manager install-package -p chromium-browser
+libertine_container_manager install-package -p firefox
 libertine_container_manager install-package -p xchat-gnome
 libertine_container_manager install-package -p gimp

=== modified file 'tools/libertine-launch'
--- tools/libertine-launch	2015-09-10 13:45:10 +0000
+++ tools/libertine-launch	2015-09-18 17:06:14 +0000
@@ -20,12 +20,10 @@
 import sys
 import json
 import lxc
-import subprocess
+import psutil
 import shlex
 import xdg.BaseDirectory as basedir
 
-from Xlib import display
-
 home_path = os.environ['HOME']
 
 libertine_json_file_path = os.path.join(basedir.xdg_data_home, 'libertine', 'ContainersConfig.json')
@@ -65,7 +63,7 @@
     libertine_session_bridge_cmd = "libertine-session-bridge " + set_dbus_session_socket_path()
 
     args = shlex.split(libertine_session_bridge_cmd)
-    subprocess.Popen(args).wait()
+    return psutil.Popen(args)
 
 def build_proot_command(container_id):
     proot_cmd = '/usr/bin/proot'
@@ -108,21 +106,26 @@
     proot_cmd = build_proot_command(container_id)
 
     args = shlex.split(proot_cmd)
+    args.extend(['compiz'])
+    compiz = psutil.Popen(args)
+
+    args = shlex.split(proot_cmd)
     args.extend(app_exec_line)
+    psutil.Popen(args).wait()
 
-    subprocess.Popen(args).wait()
+    for child in compiz.children():
+        child.terminate()
 
 if __name__ == '__main__':
     container_id = sys.argv[1]
     app_exec_line = sys.argv[2:]
     container_type = get_container_type(container_id)
 
-    launch_libertine_session_bridge()
-
-    # Work around the issue where starting some apps will close Xmir when they close the display
-    display.Display()
+    session_bridge = launch_libertine_session_bridge()
 
     if container_type == "lxc":
         launch_lxc_application(container_id, app_exec_line)
     elif container_type == "chroot":
         launch_chroot_application(container_id, app_exec_line)
+
+    session_bridge.terminate()

=== modified file 'tools/libertine-session-bridge'
--- tools/libertine-session-bridge	2015-09-02 19:04:50 +0000
+++ tools/libertine-session-bridge	2015-09-18 17:06:14 +0000
@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 
-import daemonize
 import os
 import select
 import signal
@@ -114,8 +113,4 @@
 descriptors = [container_dbus_session_sock]
 socket_pairs = []
 
-unique_id = os.environ['DISPLAY'].strip(':')
-pid = "/tmp/libertine_session_bridge" + unique_id + ".pid"
-
-daemon = daemonize.Daemonize(app="libertine_session_bridge", pid=pid, action=main_loop, auto_close_fds=False)
-daemon.start()
+main_loop()