Merge lp:unity-system-compositor/0.9 into lp:unity-system-compositor/ubuntu

[Stephen M. Webb]

release 0.9.2

Unmerged revisions

317. By Stephen M. Webb on 2017-04-05

debian/changelog: update for 0.9.2

316. By Stephen M. Webb on 2017-04-05

added autopkgtest (DEP-8) support and some tests

315. By Stephen M. Webb on 2017-04-05

added manpages for binaries

314. By Stephen M. Webb on 2017-04-05

added the lightdm log files to the apport dump for error reporting

313. By Stephen M. Webb on 2017-04-05

fix assorted lintian warnings in Deb packaging

312. By Stephen M. Webb on 2017-04-05

src/com.canonical.Unity.conf: remove at_console policy stanza

311. By Alan Griffiths on 2017-04-05

Fix build against lp:mir (and Mir 0.26!).

310. By Stephen M. Webb on 2017-03-30

synch with lp:unity-systems-compositor/ubuntu

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-16 16:37:33 +0000
+++ debian/changelog	2017-04-05 15:09:16 +0000
@@ -1,3 +1,17 @@
+unity-system-compositor (0.9.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Alan Griffiths ]
+  * changes for Mir 0.26
+
+  [ Stephen M. Webb ]
+  * removed at_console stanza from D-Bus policy (lp: #1677743)
+  * fixed assorted lintian warnings in Deb package (lp: #1677734)
+  * added additional log files to apport dump (lp: #1676931)
+  * added manpages for binaries (lp: #1677721)
+  * added autopkgtest (DEP-8) support and some tests (lp: #1678202)
+
+ -- Stephen M. Webb <[e-mail]>  Wed, 05 Apr 2017 10:52:04 -0400
+
 unity-system-compositor (0.9.1+17.04.20170216-0ubuntu1) zesty; urgency=medium
 
   [ Alexandros Frantzis ]

=== modified file 'debian/control'
--- debian/control	2017-01-17 21:10:21 +0000
+++ debian/control	2017-04-05 15:09:16 +0000
@@ -13,30 +13,30 @@
                libboost-system-dev,
                libdbus-1-dev,
                libgdk-pixbuf2.0-dev,
+               libgles2-mesa-dev,
                libglib2.0-dev,
-               libgles2-mesa-dev,
                libglm-dev,
                libmirclient-dev (>= 0.26.0),
                libmirserver-dev (>= 0.26.0),
                pkg-config,
                python3,
+               python3-pil:native,
                python3-setuptools,
-               python3-pil:native,
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Homepage: https://launchpad.net/unity-system-compositor
 # if you don't have have commit access to this branch but would like to upload
 # directly to Ubuntu, don't worry: your changes will be merged back into the
 # upstream branch
-Vcs-Bzr: lp:unity-system-compositor
+Vcs-Bzr: https://bazaar.launchpad.net/+branch/unity-system-compositor/
 
 Package: unity-system-compositor
 Architecture: any
-Depends: ${misc:Depends},
+Depends: ubuntu-wallpapers,
+         ${misc:Depends},
          ${shlibs:Depends},
-         ubuntu-wallpapers,
 Suggests: repowerd,
-Description: System compositor for Ubuntu
- System compositor used by the Mir display server in Ubuntu. If the Unity
+Description: Mir System Compositor
+ This is the system compositor using the Mir display server.  If the Unity
  System Compositor can't start, LightDM will fallback to plain Xorg display
  server.
 
@@ -46,5 +46,20 @@
          unity-system-compositor (>= ${source:Version}),
          ${misc:Depends},
          ${python3:Depends},
-Description: Test package for Unity System Compositor
- Autopilots tests for Unity System Compositor
+Description: Mir System Compositor autopilot integration tests
+ This is the system compositor using the Mir display server.
+ .
+ This package contains the Autopilots integration tests for the Unity System
+ Compositor.
+
+Package: unity-system-compositor-tests
+Architecture: any
+Depends: unity-system-compositor (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Mir System Compositor unit tests
+ This is the system compositor using the Mir display server.
+ .
+ General tests for Unity System Compositor targeted at autopkgtest runs when a
+ dependency has changed.
+

=== modified file 'debian/source_unity-system-compositor.py'
--- debian/source_unity-system-compositor.py	2013-09-06 03:07:18 +0000
+++ debian/source_unity-system-compositor.py	2017-04-05 15:09:16 +0000
@@ -1,3 +1,6 @@
+#!/usr/bin/python3
+
+import os
 from apport.hookutils import *
 
 def attach_graphic_card_pci_info(report, ui=None):
@@ -26,10 +29,18 @@
 
 def add_info(report, ui=None):
     attach_file_if_exists(report, '/var/log/boot.log', 'BootLog')
-    attach_root_command_outputs(report, { 'LightDMLog': 'cat /var/log/lightdm/lightdm.log',
-                                          'LightDMLogOld': 'cat /var/log/lightdm/lightdm.log.old',
-                                          'UnitySystemCompositorLog': 'cat /var/log/lightdm/unity-system-compositor.log',
-                                          'UnitySystemCompositorLogOld': 'cat /var/log/lightdm/unity-system-compositor.log.old' })
+
+    display_manager_files = {}
+    if os.path.lexists('/var/log/lightdm'):
+        display_manager_files['LightDMLog'] = \
+                'test -f /var/log/lightdm/lightdm.log && cat /var/log/lightdm/lightdm.log'
+        display_manager_files['LightDMLogOld'] = \
+                'test -f /var/log/lightdm/lightdm.log.1.gz && zcat /var/log/lightdm/lightdm.log.1.gz'
+        display_manager_files['USCLog'] = \
+                'test -f /var/log/lightdm/unity-system-compositor.log && cat /var/log/lightdm/unity-system-compositor.log'
+        display_manager_files['USCLogOld'] = \
+                'test -f /var/log/lightdm/unity-system-compositor.log.1.gz && zcat /var/log/lightdm/unity-system-compositor.log.1.gz'
+    attach_root_command_outputs(report, display_manager_files)
 
     report['version.libdrm'] = package_versions('libdrm2')
     report['version.lightdm'] = package_versions('lightdm')
@@ -45,7 +56,6 @@
     if not add_info(report, None):
         print("Unreportable")
         sys.exit(1)
-    keys = report.keys()
-    keys.sort()
+    keys = sorted(report.keys())
     for key in keys:
         print("[%s]\n%s\n" %(key, report[key]))

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2017-04-05 15:09:16 +0000
@@ -0,0 +1,2 @@
+Tests: mir
+Depends: unity-system-compositor-tests

=== added file 'debian/tests/mir'
--- debian/tests/mir	1970-01-01 00:00:00 +0000
+++ debian/tests/mir	2017-04-05 15:09:16 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+/usr/bin/usc_integration_tests
+exit 0

=== added file 'debian/unity-system-compositor-spinner.1'
--- debian/unity-system-compositor-spinner.1	1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor-spinner.1	2017-04-05 15:09:16 +0000
@@ -0,0 +1,45 @@
+.TH unity-system-compositor-spinner 1 "March 2017" unity-system-compositor-spinner "User Commands"
+
+.SH NAME
+unity-system-compositor-spinner \- animate the Ubuntu logo at boot
+
+.SH SYNOPSIS
+.B unity-system-compositor-spinner
+[
+.I <options>
+]
+
+.SH DESCRIPTION
+
+Animates the spinning Ubuntu logo.  Provides a soothing and relaxing visual
+experience during the boot sequence of a Ubuntu device between initial kernel
+loading and the presentation of a greeter screen.
+
+.SH OPTIONS
+.TP
+.BI -b " opacity"
+Set the background opacity (0.0 \- 1.0).
+.TP
+.B -h
+Output a usage message and exit.
+.TP
+.BI -o " id"
+Force placement on output monitor
+.IR id .
+.TP
+.B -n
+Don't sync to vblank.
+.TP
+.BI -m " socket"
+Set Mir server socket.
+.TP
+.BI "-s " WIDTH x HEIGHT
+Force surface size to 
+.I WIDTH
+x
+.I HEIGHT.
+.TP
+.B -q
+Quiet mode (no messages output).
+No surfaces are created.
+

=== added file 'debian/unity-system-compositor-tests.install'
--- debian/unity-system-compositor-tests.install	1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor-tests.install	2017-04-05 15:09:16 +0000
@@ -0,0 +1,2 @@
+usr/bin/usc_integration_tests
+usr/bin/usc_test_helper_wait_for_signal

=== added file 'debian/unity-system-compositor.1'
--- debian/unity-system-compositor.1	1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor.1	2017-04-05 15:09:16 +0000
@@ -0,0 +1,170 @@
+'\" t
+.TH unity-system-compositor 1 "March 2017" "unity-system-compositor" "User Commands"
+
+.SH NAME
+unity-system-compositor \- a systemwide compositing display manager built on Mir
+
+.SH SYNOPSIS
+.B unity-system-compositor [
+.B options
+.B ]
+
+.SH DESCRIPTION
+.B unity-system-compositor
+is the compositing display manager run on a single seat to provide a graphical
+environment in the Unity desktop envirionment.
+
+.SH OPTIONS
+.PP
+The following options are supported.
+.TP
+.BI --host-socket " path"
+Specifies the host socket path.
+.TP
+.BI "-f, --file" " path"
+Specifies the client socket path. The default is
+.IR $XDG_RUNTIME_DIR /mir_socket
+or /tmp/mir_socket.
+.TP
+.B --no-file                             
+Do not provide a socket filename for client connections.
+.TP
+.B --arw-file
+Makes socket filename globally readable and writable (equivalent to chmod a=rw).
+.TP
+.B -p, --prompt-file
+Provides a "..._trusted" filename for prompt helper connections.
+.TP
+.BI --platform-graphics-lib " path"
+Specifies the library to use for platform graphics support (default: autodetect).
+.TP
+.BI --platform-input-lib " filepath"
+Specifies the library to use for platform input support (default: input-stub.so).
+.TP
+.BI --platform-path " directory"
+Specifies the directory to look for platform libraries
+(default: /usr/lib/x86_64-linux-gnu/mir/server-platform).
+.TP
+.BI "-i, --enable-input" " bool"
+Enables input.
+.TP
+.BI --compositor-report " {log|lttng|off}"
+Specifies the compositor report log setting.
+.TP
+.BI --connector-report " {log|lttng|off}"
+Specifies the connector report log setting.
+.TP
+.BI --display-report " {log|lttng|off}"
+Specifies the display report log setting.
+.TP
+.BI --input-report " {log|lttng|off}"
+Specifies the input report log setting.
+.TP
+.BI --legacy-input-report " {log|off}"
+Specifies the legacy Input report log setting.
+.TP
+.BI --seat-report " {log|off}"
+Specifies the seat report log setting.
+.TP
+.BI --session-mediator-report " {log|lttng|off}"
+Specifies the session Mediator report log setting.
+.TP
+.BI --msg-processor-report " {log|lttng|off}"
+Specifies the message processor report log setting.
+.TP
+.BI --scene-report " {log|lttng|off}"
+Specifies the scene report log setting.
+.TP
+.BI --shared-library-prober-report " {log|lttng|off}"
+Specifies the shared library prober report log setting.
+.TP
+.BI --shell-report " {log|off}"
+Specifies the shell report log setting.
+.TP
+.BI --composite-delay " milliseconds"
+Tells the compositor how long to wait for new frames from clients before compositing.
+Higher values result in lower latency but risk causing frame skipping.
+A negative value indicates the value should be decided automatically.
+Default: decide automatically.
+.TP
+.BI --name " string"
+The name Mir uses when registering with the host as a nested server.
+.TP
+.BI --nested-passthrough " arg"
+Attempt to pass a client's graphics content directly to the host to avoid a
+composition pass as a nested server.
+.TP
+.B --enable-touchspots
+Enables the visualization of touchspots (e.g. for screencasting).
+.TP
+.BI --enable-key-repeat " arg"
+Enables server\-generated key repeat.
+.TP
+.B --on-fatal-error-except
+Throws an exception on "fatal error" conditions (e.g.  drivers behaving in unexpected ways)
+instead of a dumping core.
+.TP
+.B --debug
+Enables extra development debugging.  This is only interesting for people doing Mir server or client development.
+.TP
+.BI --x11-displays " WIDTHxHEIGHT"
+[mir-on-X specific] Sets the size of the "display" window.
+.TP
+.BI --from-dm-fd " fd"
+Passes the file descriptor for the read end of the pipe from display manager.
+.TP
+.BI --to-dm-fd " fd"
+Passes the file descriptor for the write end of the pipe to display manager.
+.TP
+.B --debug-without-dm
+Run without a display manager (only useful when debugging).
+.TP
+.BI --debug-active-session-name " arg"
+Expected connection when run without a display manager (only useful when
+debugging).
+.TP
+.BI --blacklist " arg"
+Indicates the video blacklist regex to use.
+.TP
+.B --version
+Outputs the version information and exits.
+.TP
+.BI --spinner " filepath"
+Sets the path of the spinner executable.
+.TP
+.BI --public-socket " bool"
+Makes the socket file publicly writable.
+.TP
+.BI --enable-hardware-cursor " arg"
+Enables the hardware cursor (disabled by default).
+.TP
+.BI --display-config " {clone|sidebyside|single}"
+Sets the display configuration.
+.TP
+.B -h, --help
+Outputs the usage message and exits.
+
+.SH ENVIRONMENT
+.PP
+The following environment variable can control the diagnostics reported.
+See the equivalent
+.IR xxx \-report
+option above.
+.PP
+.B Table 1: Component Report Environment Variables
+.TS
+tab(;);
+l ; l .
+Environment Variable ; Values
+=
+MIR_SERVER_CONNECTION_REPORT            ; log,lttng
+MIR_SERVER_COMPOSITOR_REPORT            ; log,lttng
+MIR_SERVER_DISPLAY_REPORT               ; log,lttng
+MIR_SERVER_INPUT_REPORT                 ; log,lttng
+MIR_SERVER_LEGACY_INPUT_REPORT          ; log
+MIR_SERVER_SEAT_REPORT                  ; log
+MIR_SERVER_MSG_PROCESSOR_REPORT         ; log,lttng
+MIR_SERVER_SESSION_MEDIATOR_REPORT      ; log,lttng
+MIR_SERVER_SCENE_REPORT                 ; log,lttng
+MIR_SERVER_SHARED_LIBRARY_PROBER_REPORT ; log,lttng
+.TE

=== modified file 'debian/unity-system-compositor.install'
--- debian/unity-system-compositor.install	2016-05-24 13:56:28 +0000
+++ debian/unity-system-compositor.install	2017-04-05 15:09:16 +0000
@@ -3,7 +3,7 @@
 etc/dbus-1/system.d/com.canonical.Unity.conf
 usr/bin/unity-system-compositor-spinner
 usr/sbin/unity-system-compositor
-usr/share/dbus-1/interfaces/com.canonical.Unity.PowerButton.xml
 usr/share/dbus-1/interfaces/com.canonical.Unity.Display.xml
 usr/share/dbus-1/interfaces/com.canonical.Unity.Input.xml
+usr/share/dbus-1/interfaces/com.canonical.Unity.PowerButton.xml
 usr/share/dbus-1/interfaces/com.canonical.Unity.UserActivity.xml

=== added file 'debian/unity-system-compositor.manpages'
--- debian/unity-system-compositor.manpages	1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor.manpages	2017-04-05 15:09:16 +0000
@@ -0,0 +1,3 @@
+debian/unity-system-compositor.1
+debian/unity-system-compositor-spinner.1
+

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2017-04-05 15:09:16 +0000
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/unity-system-compositor/+download .*/unity-system-compositor[-_]([0-9.]+)\.tar\.xz

=== modified file 'src/com.canonical.Unity.conf'
--- src/com.canonical.Unity.conf	2016-05-24 13:56:28 +0000
+++ src/com.canonical.Unity.conf	2017-04-05 15:09:16 +0000
@@ -30,11 +30,4 @@
 		       send_interface="org.freedesktop.DBus.Introspectable"/>
 	</policy>
 
-	<policy at_console="true">
-		<allow send_destination="com.canonical.Unity.Display"/>
-		<allow send_destination="com.canonical.Unity.Input"/>
-		<allow send_destination="com.canonical.Unity.PowerButton"/>
-		<allow send_destination="com.canonical.Unity.UserActivity"/>
-	</policy>
-
 </busconfig>

=== modified file 'tests/include/usc/test/mock_display.h'
--- tests/include/usc/test/mock_display.h	2016-11-09 18:13:05 +0000
+++ tests/include/usc/test/mock_display.h	2017-04-05 15:09:16 +0000
@@ -21,6 +21,7 @@
 
 #include <mir/graphics/display.h>
 #include <mir/graphics/virtual_output.h>
+#include <mir/version.h>
 #include <gmock/gmock.h>
 
 namespace usc
@@ -53,11 +54,15 @@
 
     void resume() override {};
 
+#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 27, 0)
     std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor(
         std::shared_ptr<mir::graphics::CursorImage> const&) override
     {
         return {};
     };
+#else
+    std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor() override { return {}; }
+#endif
 
     std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int, int) override
     { return std::unique_ptr<mir::graphics::VirtualOutput>{}; }

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2016-04-18 14:58:36 +0000
+++ tests/integration-tests/CMakeLists.txt	2017-04-05 15:09:16 +0000
@@ -57,3 +57,6 @@
 
 add_dependencies(usc_integration_tests GMock)
 add_dependencies(usc_integration_tests usc_test_helper_wait_for_signal)
+
+install(TARGETS usc_integration_tests usc_test_helper_wait_for_signal
+        RUNTIME DESTINATION bin)

=== modified file 'tests/unit-tests/test_mir_input_configuration.cpp'
--- tests/unit-tests/test_mir_input_configuration.cpp	2017-01-19 19:49:44 +0000
+++ tests/unit-tests/test_mir_input_configuration.cpp	2017-04-05 15:09:16 +0000
@@ -25,6 +25,11 @@
 #include "mir/input/mir_keyboard_config.h"
 #include "mir/input/mir_pointer_config.h"
 #include "mir/input/mir_touchpad_config.h"
+#include <mir/version.h>
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+#include <mir/input/mir_touchscreen_config.h>
+#endif
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -54,6 +59,11 @@
         ON_CALL(*this, capabilities()).WillByDefault(Return(this->caps));
     }
 
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+    mir::optional_value<MirTouchscreenConfig> touchscreen_configuration() const { return {}; }
+    void apply_touchscreen_configuration(MirTouchscreenConfig const&) {}
+#endif
+
     mi::DeviceCapabilities caps;
 };
 

=== modified file 'tests/unit-tests/test_session_switcher.cpp'
--- tests/unit-tests/test_session_switcher.cpp	2017-01-19 19:49:44 +0000
+++ tests/unit-tests/test_session_switcher.cpp	2017-04-05 15:09:16 +0000
@@ -20,6 +20,7 @@
 #include "src/spinner.h"
 
 #include "mir/frontend/session.h"
+#include <mir/version.h>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -105,6 +106,16 @@
     {
         return {};
     }
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+    mir::graphics::BufferID create_buffer(mir::geometry::Size, MirPixelFormat) override
+    {
+        return {};
+    }
+    mir::graphics::BufferID create_buffer(mir::geometry::Size, uint32_t, uint32_t) override
+    {
+        return {};
+    }
+#endif
     void destroy_buffer(mir::graphics::BufferID) override
     {
     }