Merge lp:~saviq/unity8/split-common into lp:unity8

[Michał Sawicz]

Introduce unity8-common for shared resources, and wrap-and-sort.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes.

 * If you changed the UI, has there been a design review?
N/A

[lp:~saviq/unity8/split-common]

827. By Michał Sawicz on 2014-04-09

Fix thumbnailer dep and drop tool recommends.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:827
http://jenkins.qa.ubuntu.com/job/unity8-ci/2770/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/125
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4667/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1291
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1295
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1295/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1291
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4252
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4252/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5811
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4022/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4794
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4794/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2770/rebuild

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

your dependency on -common is wrong (I guess it should be the source version instead of the binary ones).

You can as well spot it with the lintian warning:
E: unity8 source: not-binnmuable-any-depends-all unity-scope-tool -> unity8-common
E: unity8 source: not-binnmuable-any-depends-all unity8 -> unity8-common

Other than that, the rest looks good.

review: Needs Fixing

[lp:~saviq/unity8/split-common]

828. By Michał Sawicz on 2014-04-09

Not binary, source version.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:828
http://jenkins.qa.ubuntu.com/job/unity8-ci/2773/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/130
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4678/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1298
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1298/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4261
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4261/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5823
    ABORTED: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4033/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4805
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4805/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2773/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

Would be nice to have notifications too, for greeter and welcome wizard

review: Needs Fixing

[Didier Roche-Tolomelli (didrocks)]

-common needs to depends on misc. Once done, I can +1 it.

review: Needs Fixing

[lp:~saviq/unity8/split-common]

829. By Michał Sawicz on 2014-04-14

Add misc:Depends to unity8-common.

830. By Michał Sawicz on 2014-04-14

Add Notifications to common, too.

[Michał Sawicz (saviq)]

Done on both accounts.

[Didier Roche-Tolomelli (didrocks)]

+1 on the packaging change

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:830
http://jenkins.qa.ubuntu.com/job/unity8-ci/2804/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/219
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4809/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1668
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1329
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1329/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4386
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4386/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5987
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4155/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4941
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4941/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2804/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Let's wait for a retrigger

[Andrea Cimitan (cimi)]

review: Approve

[lp:~saviq/unity8/split-common]

831. By Michał Sawicz on 2014-04-29

Merge trunk

832. By Michał Sawicz on 2014-04-29

Merge lp:~cimi/unity8/unity8.upstart_unity-mir_variables

833. By Michał Sawicz on 2014-04-29

Ensure removal of unity8-common on unity8 downgrade.

834. By Michał Sawicz on 2014-04-29

Make autopilot rely on exact same version of unity8 and -fake-env.

835. By Michał Sawicz on 2014-04-29

Wrap-and-sort.

Unmerged revisions

=== modified file 'data/unity8.conf'
--- data/unity8.conf	2014-04-09 13:22:43 +0000
+++ data/unity8.conf	2014-04-29 12:28:36 +0000
@@ -12,6 +12,9 @@
 expect stop
 
 pre-start script
+    # Tell unity-mir to raise SIGSTOP after we start
+    initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
+
     if [ -n "$MIR_SOCKET" ]; then
         if [ -z "$UNITY_MIR_SOCKET" ]; then
             # Save original value of MIR_SOCKET in case we are restarted,
@@ -46,3 +49,8 @@
 end script
 
 exec ${BINARY:-unity8} $ARGS
+
+post-stop script
+    initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
+    initctl unset-env --global UNITY_MIR_SOCKET
+end script

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-16 13:45:01 +0000
+++ debian/changelog	2014-04-29 12:28:36 +0000
@@ -1,3 +1,13 @@
+unity8 (7.86-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Andrea Cimitan ]
+  * Update upstart job to reflect latest unity-mir changes
+
+  [ Michał Sawicz ]
+  * Split out unity8-common package
+
+ -- Andrea Cimitan <[e-mail]>  Tue, 29 Apr 2014 09:13:06 +0100
+
 unity8 (7.85+14.04.20140416-0ubuntu1) trusty; urgency=low
 
   [ Albert Astals ]

=== modified file 'debian/control'
--- debian/control	2014-04-09 14:51:09 +0000
+++ debian/control	2014-04-29 12:28:36 +0000
@@ -11,34 +11,34 @@
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                libgl1-mesa-dri,
                libgles2-mesa-dev[armhf],
+               libglib2.0-dev,
                libgsettings-qt-dev,
                libhud-client2-dev,
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.7),
+               libqt5xmlpatterns5-dev,
                libunity-api-dev (>= 7.80.6),
                libunity-mir-dev,
                libusermetricsoutput1-dev,
                libxcb1-dev,
-               libglib2.0-dev,
                pkg-config,
-               python:any (>= 2.7),
                python-setuptools,
                python3-all:any,
                python3-setuptools,
+               python:any (>= 2.7),
                qt5-default,
                qtbase5-dev,
                qtbase5-dev-tools,
                qtbase5-private-dev,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
+               qtdeclarative5-private-dev,
                qtdeclarative5-qtmultimedia-plugin,
-               qtdeclarative5-private-dev,
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
                qtdeclarative5-ubuntu-settings-components,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
                qtdeclarative5-xmllistmodel-plugin,
-               libqt5xmlpatterns5-dev,
                ttf-ubuntu-font-family,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/unity
@@ -60,7 +60,8 @@
 
 Package: unity-scope-tool
 Architecture: any
-Depends: unity8 (= ${binary:Version}),
+Depends: unity8-common (= ${source:Version}),
+         unity8-private (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Development tool for Unity scopes
@@ -71,27 +72,18 @@
 Architecture: any
 Provides: indicator-renderer,
 Depends: gsettings-desktop-schemas,
+         libcap2-bin,
          libglib2.0-bin,
-         libunity-mir1,
+         libunity-mir1 (>= 0.4),
          qmenumodel-qml (>= 0.2.7),
          qtdeclarative5-dee-plugin,
          qtdeclarative5-gsettings1.0,
          qtdeclarative5-ubuntu-settings-components,
-         qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
-         ubuntu-thumbnailer-impl-0,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin,
-         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
          qtdeclarative5-xmllistmodel-plugin,
-         unity-application-impl-2,
          unity-launcher-impl-3,
-         unity-notifications-impl-2,
-         unity8-fake-env | unity-application-impl,
+         unity8-common (= ${source:Version}),
          unity8-private (= ${binary:Version}),
          unity8-private | unity-launcher-impl,
-         unity-plugin-scopes | unity-scopes-impl,
-         unity-scopes-impl-0,
-# for setcap:
-         libcap2-bin,
          ${misc:Depends},
          ${shlibs:Depends},
 Recommends: unity-scope-click,
@@ -99,10 +91,30 @@
             unity-scope-scopes,
 Breaks: indicator-network (<< 0.5.1),
         ubuntu-touch-session (<< 0.107),
-Replaces: ubuntu-touch-session (<< 0.82~)
+Replaces: ubuntu-touch-session (<< 0.82~),
 Description: Unity 8 shell
  The Unity 8 shell is the primary user interface for Ubuntu devices.
 
+Package: unity8-common
+Architecture: all
+Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin,
+         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
+         ubuntu-thumbnailer-impl-0,
+         unity-application-impl-2,
+         unity-notifications-impl-2,
+         unity-plugin-scopes | unity-scopes-impl,
+         unity-scopes-impl-0,
+         unity8-fake-env | unity-application-impl,
+         ${misc:Depends},
+Breaks: unity8 (<< 7.86)
+Replaces: unity8 (<< 7.86)
+Description: Unity 8 shell (common files)
+ The Unity 8 shell is the primary user interface for Ubuntu devices.
+ .
+ This package contains the QML, graphics and locale files shared between
+ unity8 and unity-scope-tool.
+
 Package: unity8-autopilot
 Architecture: all
 Depends: gir1.2-glib-2.0,
@@ -123,8 +135,8 @@
          unity8-fake-env (>= ${source:Version}),
          url-dispatcher-tools,
          ${misc:Depends},
+         ${python3:Depends},
          ${python:Depends},
-         ${python3:Depends},
          ${shlibs:Depends},
 Description: Test package for Unity 8 shell
  Autopilot tests for the unity8 package
@@ -146,9 +158,9 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: gsettings-ubuntu-schemas,
-         ${misc:Depends},
-         ${shlibs:Depends},
          libunity-core-6.0-9,
+         ${misc:Depends},
+         ${shlibs:Depends},
 Provides: unity-launcher-impl,
           unity-launcher-impl-3,
 Description: Unity 8 private libs

=== added file 'debian/unity8-common.install'
--- debian/unity8-common.install	1970-01-01 00:00:00 +0000
+++ debian/unity8-common.install	2014-04-29 12:28:36 +0000
@@ -0,0 +1,5 @@
+usr/share/locale
+usr/share/unity8/Components
+usr/share/unity8/Dash
+usr/share/unity8/Notifications
+usr/share/unity8/graphics

=== modified file 'debian/unity8-fake-env.install'
--- debian/unity8-fake-env.install	2014-04-02 11:32:41 +0000
+++ debian/unity8-fake-env.install	2014-04-29 12:28:36 +0000
@@ -1,4 +1,4 @@
+usr/lib/*/unity8/qml/mocks
 usr/lib/*/unity8/qml/nonmirplugins
-usr/lib/*/unity8/qml/mocks
 usr/lib/*/unity8/qml/scopefakes
 usr/share/unity8/mocks

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2013-12-12 16:45:35 +0000
+++ debian/unity8-private.install	2014-04-29 12:28:36 +0000
@@ -1,7 +1,7 @@
 usr/lib/*/unity8/qml/AccountsService
+usr/lib/*/unity8/qml/DashViews
 usr/lib/*/unity8/qml/HudClient
 usr/lib/*/unity8/qml/LightDM
-usr/lib/*/unity8/qml/DashViews
 usr/lib/*/unity8/qml/Powerd
 usr/lib/*/unity8/qml/SessionBroadcast
 usr/lib/*/unity8/qml/Ubuntu

=== modified file 'debian/unity8.install'
--- debian/unity8.install	2014-04-10 10:02:31 +0000
+++ debian/unity8.install	2014-04-29 12:28:36 +0000
@@ -1,15 +1,10 @@
+data/unity8.conf usr/share/upstart/sessions/
 usr/bin/unity8
 usr/share/applications/unity8.desktop
-usr/share/locale
 usr/share/unity8/Bottombar
-usr/share/unity8/Components
-usr/share/unity8/Dash
 usr/share/unity8/Greeter
 usr/share/unity8/Hud
 usr/share/unity8/Launcher
-usr/share/unity8/Notifications
 usr/share/unity8/Panel
 usr/share/unity8/Shell.qml
 usr/share/unity8/Stages
-usr/share/unity8/graphics
-data/unity8.conf usr/share/upstart/sessions/

=== modified file 'tests/autopilot/unity8/shell/tests/test_upstart.py'
--- tests/autopilot/unity8/shell/tests/test_upstart.py	2014-02-23 02:42:31 +0000
+++ tests/autopilot/unity8/shell/tests/test_upstart.py	2014-04-29 12:28:36 +0000
@@ -82,7 +82,7 @@
         ))
 
     def test_no_sigstop(self):
-        self.patch_environment("UPSTART_JOB", "foo")
+        self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "")
         self._launch_unity()
         self._set_proxy()
 
@@ -91,7 +91,7 @@
         logger.debug("Unity loaded and ready.")
 
     def test_expect_sigstop(self):
-        self.patch_environment("UPSTART_JOB", "unity8")
+        self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "1")
         self._launch_unity()
         self.assertThat(lambda: os.WIFSTOPPED(self._get_status()), Eventually(Equals(True)), "Unity8 should raise SIGSTOP when ready")