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

[Christopher Townsend]

* Add a way to call Xmir with different options than what is hardcoded in ubuntu-app-launch. (LP: #1542028)
* Use '-title @' Xmir option to set proper XMir window titles.
* Add ability to enable or disable i386 multiarch support in a Libertine container. (LP: #1518812)
* libertine-demo: do not remove the ContainersConfig file if there are still containers.
* remove the unnecessary quotes from the .desktop file.

[Stephen M. Webb (bregma)]

Sane.

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-11-30 15:37:30 +0000
+++ data/CMakeLists.txt	2016-03-02 20:24:53 +0000
@@ -4,7 +4,7 @@
         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
+install(FILES puritine-click.conf 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)

=== added file 'data/libertine-xmir.conf'
--- data/libertine-xmir.conf	1970-01-01 00:00:00 +0000
+++ data/libertine-xmir.conf	2016-03-02 20:24:53 +0000
@@ -0,0 +1,8 @@
+description "Set global environment variable to tell u-a-l where to look to start Xmir"
+author "Christopher Townsend <[e-mail]>"
+
+start on started unity8
+
+pre-start script
+	initctl set-env --global UBUNTU_APP_LAUNCH_XMIR_PATH="/usr/bin/libertine-xmir"
+end script

=== modified file 'data/libertine.desktop'
--- data/libertine.desktop	2015-08-04 19:32:16 +0000
+++ data/libertine.desktop	2016-03-02 20:24:53 +0000
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Version=1.0
-Name="Libertine"
-Comment="Legacy Application Sandbox"
+Name=Libertine
+Comment=Legacy Application Sandbox
 Exec=libertine
 Terminal=false
 Type=Application
 Icon=/usr/share/libertine/libertine_64.png
 Categories=
-GenericName="Application Sandbox"
+GenericName=Application Sandbox
 X-Ubuntu-Touch=true

=== modified file 'data/puritine-click.conf'
--- data/puritine-click.conf	2016-01-19 16:51:14 +0000
+++ data/puritine-click.conf	2016-03-02 20:24:53 +0000
@@ -26,7 +26,9 @@
 	fi
 else
 	rm -rf $HOME/.cache/libertine-container/$CONTAINER_NAME
-	rm -rf $HOME/.local/share/libertine
+	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-02-08 17:09:07 +0000
+++ debian/changelog	2016-03-02 20:24:53 +0000
@@ -1,3 +1,19 @@
+libertine (0.99.11-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Chris Townsend ]
+  * Add a way to call Xmir with different options than what is hardcoded in 
+    ubuntu-app-launch. (LP: #1542028)
+  * Use '-title @' Xmir option to set proper XMir window titles.
+  * Add ability to enable or disable i386 multiarch support in a Libertine
+    container. (LP: #1518812)
+
+  [ Stephen M. Webb ]
+  * libertine-demo: do not remove the ContainersConfig file if there are still
+    containers.
+  * remove the unnecessary quotes from the .desktop file.
+
+ -- Chris Townsend <[e-mail]>  Wed, 02 Mar 2016 15:06:52 -0500
+
 libertine (0.99.10+16.04.20160208.1-0ubuntu1) xenial; urgency=medium
 
   [ Chris Townsend ]

=== modified file 'debian/libertine-tools.install'
--- debian/libertine-tools.install	2015-11-24 18:20:52 +0000
+++ debian/libertine-tools.install	2016-03-02 20:24:53 +0000
@@ -2,6 +2,8 @@
 usr/bin/libertine-session-bridge
 usr/bin/libertine-container-manager
 usr/bin/libertine-lxc-manager
+usr/bin/libertine-xmir
 usr/share/man
 usr/share/libertine/libertine-lxc.conf
 usr/share/upstart/sessions/libertine-lxc-manager.conf
+usr/share/upstart/sessions/libertine-xmir.conf

=== modified file 'libertine/ContainerConfig.cpp'
--- libertine/ContainerConfig.cpp	2016-01-21 21:42:28 +0000
+++ libertine/ContainerConfig.cpp	2016-03-02 20:24:53 +0000
@@ -121,6 +121,27 @@
     return distro_series;
   }
 
+  QString
+  extract_multiarch_support_from_json(QJsonObject const& json_object)
+  {
+    QString multiarch_support("disabled");
+    QJsonValue value = json_object["multiarch"];
+    if (value != QJsonValue::Undefined)
+    {
+      QJsonValue::Type value_type = value.type();
+      if (value_type == QJsonValue::String)
+      {
+        QString s = value.toString();
+        if (s.length() > 0)
+        {
+          multiarch_support = s;
+        }
+      }
+    }
+
+    return multiarch_support;
+  }
+
   const static struct { QString string; ContainerConfig::InstallStatus enumeration; } install_status_names[] =
   {
     { QObject::tr("new"),          ContainerConfig::InstallStatus::New        },
@@ -292,6 +313,7 @@
 , container_name_(extract_container_name_from_json(json_object, container_id_))
 , container_type_(extract_container_type_from_json(json_object, container_id_))
 , distro_series_(extract_distro_series_from_json(json_object, container_id_))
+, multiarch_support_(extract_multiarch_support_from_json(json_object))
 , install_status_(extract_install_status_from_json(json_object))
 , container_apps_(extract_container_apps_from_json(json_object))
 { }
@@ -331,6 +353,11 @@
 
 
 QString const& ContainerConfig::
+multiarch_support() const
+{ return multiarch_support_; }
+
+
+QString const& ContainerConfig::
 install_status() const
 { return install_status_names[(int)install_status_].string; }
 

=== modified file 'libertine/ContainerConfig.h'
--- libertine/ContainerConfig.h	2016-01-21 21:42:28 +0000
+++ libertine/ContainerConfig.h	2016-03-02 20:24:53 +0000
@@ -96,6 +96,9 @@
   distro_series() const;
 
   QString const&
+  multiarch_support() const;
+
+  QString const&
   install_status() const;
 
   void
@@ -116,6 +119,7 @@
   QString               container_name_;
   QString               container_type_;
   QString               distro_series_;
+  QString               multiarch_support_;
   InstallStatus         install_status_;
   QList<ContainerApps*> container_apps_;
 };

=== modified file 'libertine/ContainerConfigList.cpp'
--- libertine/ContainerConfigList.cpp	2016-01-22 17:15:58 +0000
+++ libertine/ContainerConfigList.cpp	2016-03-02 20:24:53 +0000
@@ -32,6 +32,7 @@
 #include <QtCore/QRegExp>
 #include <QtCore/QSettings>
 #include <QtCore/QString>
+#include <QtCore/QSysInfo>
 
 #include <sys/file.h>
 
@@ -237,6 +238,20 @@
 
 
 QString ContainerConfigList::
+getContainerMultiarchSupport(QString const& container_id)
+{
+  for (auto const& config: configs_)
+  {
+    if (config->container_id() == container_id)
+    {
+      return config->multiarch_support();
+    }
+  }
+  return nullptr;
+}
+
+
+QString ContainerConfigList::
 getContainerStatus(QString const& container_id)
 {
   for (auto const& config: configs_)
@@ -251,6 +266,13 @@
 
 
 QString ContainerConfigList::
+getHostArchitecture()
+{
+  return QSysInfo::currentCpuArchitecture();
+}
+
+
+QString ContainerConfigList::
 getHostDistroCodename()
 {
   QSettings distro_info("/etc/lsb-release", QSettings::NativeFormat);

=== modified file 'libertine/ContainerConfigList.h'
--- libertine/ContainerConfigList.h	2016-01-22 17:15:58 +0000
+++ libertine/ContainerConfigList.h	2016-03-02 20:24:53 +0000
@@ -119,11 +119,17 @@
   getContainerDistro(QString const& container_id);
 
   Q_INVOKABLE QString
+  getContainerMultiarchSupport(QString const& container_id);
+
+  Q_INVOKABLE QString
   getContainerName(QString const& container_id);
 
   Q_INVOKABLE QString
   getContainerStatus(QString const& container_id);
 
+  Q_INVOKABLE QString
+  getHostArchitecture();
+
   void
   reloadConfigs();
 

=== modified file 'libertine/ContainerManager.cpp'
--- libertine/ContainerManager.cpp	2016-01-22 17:15:58 +0000
+++ libertine/ContainerManager.cpp	2016-03-02 20:24:53 +0000
@@ -52,6 +52,18 @@
 
 
 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)
+{ }
+
+
+ContainerManagerWorker::
 ~ContainerManagerWorker()
 { }
 
@@ -134,6 +146,18 @@
 }
 
 
+QStringList ContainerManagerWorker::
+data_list()
+{ return data_list_; }
+
+
+void ContainerManagerWorker::
+data_list(QStringList data_list)
+{
+  data_list_ = data_list;
+}
+
+
 void ContainerManagerWorker::
 run()
 {
@@ -167,6 +191,10 @@
       runCommand(data_);
       break;
 
+    case ContainerAction::Configure:
+      configureContainer(data_list_);
+      break;
+
     default:
       break;
   }
@@ -362,3 +390,24 @@
   emit finishedCommand(QString(command_output));
   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())
+    quit();
+
+  libertine_cli_tool.waitForFinished(-1);
+
+  emit finished();
+  quit();
+}

=== modified file 'libertine/ContainerManager.h'
--- libertine/ContainerManager.h	2016-01-22 17:15:58 +0000
+++ libertine/ContainerManager.h	2016-03-02 20:24:53 +0000
@@ -21,6 +21,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QString>
+#include <QtCore/QStringList>
 #include <QtCore/QThread>
 
 class ContainerManagerWorker
@@ -34,6 +35,7 @@
   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(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;
@@ -47,7 +49,8 @@
     Remove,
     Search,
     Update,
-    Exec
+    Exec,
+    Configure
   };
 
 public:
@@ -59,6 +62,10 @@
                          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
@@ -97,6 +104,12 @@
   void
   data(QString const& data);
 
+  QStringList
+  data_list();
+
+  void
+  data_list(QStringList data_list);
+
 protected:
   void run() Q_DECL_OVERRIDE;
 
@@ -108,6 +121,7 @@
   void searchPackageCache(QString const& search_string);
   void updateContainer();
   void runCommand(QString const& command_line);
+  void configureContainer(QStringList configure_command);
 
 private:
   ContainerAction container_action_;
@@ -116,6 +130,7 @@
   QString container_distro_;
   QString container_name_;
   QString data_;
+  QStringList data_list_;
 
 signals:
   void containerActionChanged();
@@ -124,6 +139,7 @@
   void containerDistroChanged();
   void containerNameChanged();
   void dataChanged();
+  void dataListChanged();
   void finished();
   void finishedDestroy(QString const& container_id);
   void finishedInstall(bool result, QString const& error_msg);

=== added file 'libertine/qml/ConfigureContainer.qml'
--- libertine/qml/ConfigureContainer.qml	1970-01-01 00:00:00 +0000
+++ libertine/qml/ConfigureContainer.qml	2016-03-02 20:24:53 +0000
@@ -0,0 +1,69 @@
+/**
+ * @file configureContainer.qml
+ * @brief Libertine configure container view
+ */
+/*
+ * Copyright 2016 Canonical Ltd
+ *
+ * Libertine is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3, as published by the
+ * Free Software Foundation.
+ *
+ * Libertine 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/>.
+ */
+import Libertine 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+
+
+Page {
+    id: configureView
+    title: i18n.tr("Configure ") + mainView.currentContainer
+
+    Item {
+        visible: containerConfigList.getHostArchitecture() == 'x86_64' ? true : false
+        CheckBox {
+            id: multiarchCheckBox
+            anchors {
+                left: parent.left
+                top: parent.top
+                leftMargin: configureView.leftMargin
+            }
+            checked: containerConfigList.getContainerMultiarchSupport(mainView.currentContainer) == 'enabled' ? true : false
+            onClicked: {
+                var comp = Qt.createComponent("ContainerManager.qml")
+                if (multiarchCheckBox.checked) {
+                    var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
+                                                              "containerId": mainView.currentContainer,
+                                                              "containerType": containerConfigList.getContainerType(mainView.currentContainer),
+                                                              "data_list": ["--multiarch", "enable"]})
+                    worker.start()
+                }
+                else {
+                    var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
+                                                              "containerId": mainView.currentContainer,
+                                                              "containerType": containerConfigList.getContainerType(mainView.currentContainer),
+                                                              "data_list": ["--multiarch", "disable"]})
+                    worker.start()
+               }
+            }
+        }
+        Label {
+            anchors {
+                left: multiarchCheckBox.right
+                right: parent.right
+                top: parent.bottom
+                verticalCenter: parent.verticalCenter
+                leftMargin: units.gu(2)
+                rightMargin: configureView.rightMargin
+            }
+            text: i18n.tr("i386 multiarch support")
+        }
+
+    }
+}

=== modified file 'libertine/qml/HomeView.qml'
--- libertine/qml/HomeView.qml	2016-01-20 17:34:19 +0000
+++ libertine/qml/HomeView.qml	2016-03-02 20:24:53 +0000
@@ -43,8 +43,10 @@
 	ActionSelectionPopover {
 	    actions: ActionList {
 		Action {
-		    text: "App Sources"
-		    onTriggered: print(text)
+		    text: "Configure Container"
+		    onTriggered: {
+                        pageStack.push(Qt.resolvedUrl("ConfigureContainer.qml"))
+                    }
 		}
                 Action {
                     text: "Update Container"

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-01-22 15:19:08 +0000
+++ python/libertine/Libertine.py	2016-03-02 20:24:53 +0000
@@ -69,7 +69,7 @@
         self.container_id = container_id
         self.root_path = libertine.utils.get_libertine_container_rootfs_path(self.container_id)
 
-    def create_libertine_container(self, password=None, verbosity=1):
+    def create_libertine_container(self, password=None, multiarch=False, verbosity=1):
         pass
 
     def destroy_libertine_container(self, verbosity=1):
@@ -124,6 +124,20 @@
         return self.run_in_container(apt_command_prefix(verbosity) +
                 extra_apt_args + " install '" + package_name + "'") == 0
 
+    def configure_command(self, command, *args, verbosity=1):
+        """
+        Configures the container based on what the command is.
+
+        :param command: The configuration command to run.
+        :param *args: List of arguments used for the given configuration command
+        """
+        if command == 'multiarch':
+            if args[0] == 'enable':
+                self.run_in_container("dpkg --add-architecture i386")
+            else:
+                self.run_in_container(apt_command_prefix(verbosity) + "purge \".*:i386\"")
+                self.run_in_container("dpkg --remove-architecture i386")
+
     def get_container_distro(self, container_id):
         """
         Retrieves the distro code name for a given container ID.
@@ -230,11 +244,11 @@
         """
         self.container.destroy_libertine_container()
 
-    def create_libertine_container(self, password=None, verbosity=1):
+    def create_libertine_container(self, password=None, multiarch=False, verbosity=1):
         """
         Creates the container.
         """
-        self.container.create_libertine_container(password, verbosity)
+        self.container.create_libertine_container(password, multiarch, verbosity)
 
     def update_libertine_container(self, verbosity=1):
         """
@@ -310,3 +324,7 @@
         """
         with ContainerRunning(self.container):
             self.container.run_in_container(exec_line)
+
+    def configure_command(self, command, *args):
+        with ContainerRunning(self.container):
+            self.container.configure_command(command, *args)

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-02-04 14:11:45 +0000
+++ python/libertine/LxcContainer.py	2016-03-02 20:24:53 +0000
@@ -128,7 +128,7 @@
             self.container.stop()
             self.container.destroy()
 
-    def create_libertine_container(self, password=None, verbosity=1):
+    def create_libertine_container(self, password=None, multiarch=False, verbosity=1):
         if password is None:
             return
 
@@ -180,6 +180,11 @@
         self.run_in_container("useradd -u {} -p {} -G sudo {}".format(
                 str(user_id), crypt.crypt(password), str(username)))
 
+        if multiarch and architecture == 'amd64':
+            if verbosity == 1:
+                print("Adding i386 multiarch support...")
+            self.run_in_container("dpkg --add-architecture i386")
+
         if verbosity == 1:
             print("Updating the contents of the container after creation...")
         self.update_packages(verbosity)

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2015-12-22 15:48:32 +0000
+++ tools/CMakeLists.txt	2016-03-02 20:24:53 +0000
@@ -1,4 +1,4 @@
-install(PROGRAMS libertine-container-manager libertine-launch libertine-session-bridge libertine-lxc-manager
+install(PROGRAMS libertine-container-manager libertine-launch libertine-session-bridge libertine-lxc-manager libertine-xmir
         DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES libertine-launch.1 libertine-container-manager.1
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-01-29 17:42:37 +0000
+++ tools/libertine-container-manager	2016-03-02 20:24:53 +0000
@@ -102,6 +102,31 @@
             break
 
 
+def update_container_multiarch_support(container_id, multiarch):
+    container_list = read_container_config_file()
+
+    if multiarch == 'enabled' and libertine.utils.get_host_architecture() == 'i386':
+        multiarch = 'disabled'
+
+    for container in container_list['containerList']:
+        if container['id'] == container_id:
+            container['multiarch'] = multiarch
+
+            write_container_config_file(container_list)
+            break
+
+
+def get_container_multiarch_support(container_id):
+    container_list = read_container_config_file()
+
+    for container in container_list['containerList']:
+        if container['id'] == container_id:
+            if not 'multiarch' in container:
+                return 'disabled'
+            else:
+                return container['multiarch']
+
+
 def add_new_container(id, name, type, distro):
     if not os.path.exists(libertine.utils.get_libertine_database_dir_path()):
         os.makedirs(libertine.utils.get_libertine_database_dir_path())
@@ -237,10 +262,15 @@
             password = sys.stdin.readline().rstrip()
 
     add_new_container(args.id, args.name, args.type, args.distro)
+    
+    multiarch = 'disabled'
+    if args.multiarch:
+        multiarch = 'enabled'
+    update_container_multiarch_support(args.id, multiarch)
 
     container = LibertineContainer(args.id)
     update_container_install_status(args.id, "installing")
-    container.create_libertine_container(password, args.verbosity)
+    container.create_libertine_container(password, args.multiarch, args.verbosity)
     update_container_install_status(args.id, "ready")
 
 
@@ -352,6 +382,29 @@
     container.exec_command(args.command)
 
 
+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)
+        sys.exit(1)
+    elif not args.id:
+        args.id = get_default_container_id()
+
+    container = LibertineContainer(args.id)
+
+    if args.multiarch and libertine.utils.get_host_architecture() == 'amd64':
+        multiarch = 'disabled'
+        if args.multiarch == 'enable':
+            multiarch = 'enabled'
+
+        current_multiarch = get_container_multiarch_support(args.id)
+        if current_multiarch == multiarch:
+            print("i386 multiarch support is already %s" % multiarch)
+            sys.exit(0)
+
+        container.configure_command('multiarch', args.multiarch)
+        update_container_multiarch_support(args.id, multiarch)
+
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="Legacy X application support for Unity 8")
     parser.add_argument('-q', '--quiet',
@@ -383,6 +436,10 @@
         '--force', action='store_true',
         help=("Force the installation of the given valid Ubuntu distro even if "
               "it is no longer supported."))
+    parser_create.add_argument(
+        '-m', '--multiarch', action='store_true',
+        help=("Add i386 support to amd64 Libertine containers.  This option has "
+              "no effect when the Libertine container is i386."))
     parser_create.set_defaults(func=create)
 
     # Handle the destroy command and its options
@@ -448,6 +505,7 @@
         help=("List all Libertine containers."))
     parser_list.set_defaults(func=list)
 
+    # Handle the list-apps command and its options
     parser_list_apps = subparsers.add_parser(
         'list-apps',
         help=("List available app launchers in a container."))
@@ -460,6 +518,7 @@
         help=("use JSON output format."))
     parser_list_apps.set_defaults(func=list_apps)
 
+    # Handle the execute command and it's options
     parser_exec = subparsers.add_parser(
         'exec',
         help=("Run an arbitrary command in the specified Libertine container."))
@@ -471,7 +530,22 @@
         help=("The command to run in the specified container."))
     parser_exec.set_defaults(func=exec)
 
-# Actually parse the args
+    # Handle the configure command and it's options
+    parser_configure = subparsers.add_parser(
+        'configure',
+        help=("Configure various options in the specified Libertine container."))
+    parser_configure.add_argument(
+        '-i', '--id',
+        help=("Container identifier.  Default container is used if omitted."))
+    parser_configure.add_argument(
+        '-m', '--multiarch',
+        choices=['enable', 'disable'],
+        help=("Enables or disables i386 multiarch support for amd64 Libertine "
+              "containers.   This option has no effect when the Libertine "
+              "container is i386."))
+    parser_configure.set_defaults(func=configure)
+
+    # Actually parse the args
     args = parser.parse_args()
     if args.verbosity is None:
         args.verbosity = 1

=== added file 'tools/libertine-xmir'
--- tools/libertine-xmir	1970-01-01 00:00:00 +0000
+++ tools/libertine-xmir	2016-03-02 20:24:53 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Copyright (C) 2016 Canonical Ltd.
+# Author: Christopher Townsend <[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/>.
+
+
+# Add and/or remove Xmir options here
+exec Xmir -title @ $@