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

[Michał Sawicz]

SRU trunk r864: Split out unity8-common package, also wrap-and-sort.

Unmerged revisions

854. By Michał Sawicz on 2014-05-02

SRU trunk r864: Split out unity8-common package

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-16 13:45:01 +0000
+++ debian/changelog	2014-05-02 13:23:49 +0000
@@ -1,3 +1,9 @@
+unity8 (7.86-0ubuntu1) UNRELEASED; urgency=medium
+
+  * SRU from trunk r864: Split out unity8-common package
+
+ -- Michał Sawicz <[e-mail]>  Fri, 02 May 2014 15:11:48 +0200
+
 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-05-02 13:23:49 +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,
          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,
@@ -119,12 +131,12 @@
          python3-fixtures,
          python3-gi,
          ubuntu-ui-toolkit-autopilot,
-         unity8 (>= ${source:Version}),
-         unity8-fake-env (>= ${source:Version}),
+         unity8 (= ${source:Version}),
+         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-05-02 13:23:49 +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-05-02 13:23:49 +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-05-02 13:23:49 +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-05-02 13:23:49 +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/