Merge lp:~robru/unity-system-compositor/drop-libboost-all-dev into lp:unity-system-compositor

[Robert Bruce Park]

Stop depending on libboost-all-dev, it is verboten.

Key change here is drop dependency on 'libboost-all-dev', which xnox and cjwatson say is not allowed. Instead, depend directly on libboost-system-dev and libboost-program-options-dev which are all that is necessary.

The rest of this diff is just a minor cleanup from the 'wrap-and-sort' tool.

[lp:~robru/unity-system-compositor/drop-libboost-all-dev]

98. By Robert Bruce Park on 2013-11-19

Add some missing deps.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/63/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/63/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robru/unity-system-compositor/drop-libboost-all-dev]

99. By Robert Bruce Park on 2013-11-19

Merge trunk.

100. By Robert Bruce Park on 2013-11-19

wrap-and-sort -a -t again.

101. By Robert Bruce Park on 2013-11-19

Fix trunk merge mistake.

[Michael Terry (mterry)]

LGTM

review: Approve

[Ken VanDine (ken-vandine)]

Great!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-11-12 15:45:22 +0000
+++ debian/control	2013-11-19 21:23:34 +0000
@@ -5,18 +5,25 @@
 Build-Depends: cmake,
                cmake-data,
                debhelper (>= 9),
-               libboost1.48-all-dev | libboost-all-dev,
+               libboost-chrono-dev,
+               libboost-date-time-dev,
+               libboost-filesystem-dev,
+               libboost-program-options-dev,
+               libboost-regex-dev,
+               libboost-system-dev,
+               libboost-thread-dev,
+               libgles2-mesa-dev,
                libmirserver-dev (>= 0.1.0),
-               libgles2-mesa-dev,
                libprotobuf-dev,
                pkg-config,
                python (>= 2.7),
                python-setuptools,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/unity-system-compositor
-# If you aren't a member of ~unity-team but need to upload packaging changes,
-# just go ahead. ~unity-system-compositor-team will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~unity-system-compositor-team/unity-system-compositor/trunk
+# 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
 
 Package: unity-system-compositor
 Architecture: any
@@ -29,20 +36,20 @@
 
 Package: unity-system-compositor-autopilot
 Architecture: all
-Depends: ${misc:Depends},
+Depends: python-autopilot,
+         unity-system-compositor (>= ${source:Version}),
+         ${misc:Depends},
          ${python:Depends},
-         python-autopilot,
-         unity-system-compositor (>= ${source:Version}),
 Description: Test package for Unity System Compositor
  Autopilots tests for Unity System Compositor
 
 Package: ubuntu-desktop-mir
 Architecture: all
-Depends: ${misc:Depends},
-         unity-system-compositor,
+Depends: unity-system-compositor,
          xserver-xorg-xmir,
-Replaces: unity-system-compositor (<< 0.0.2)
-Breaks: unity-system-compositor (<< 0.0.2)
+         ${misc:Depends},
+Replaces: unity-system-compositor (<< 0.0.2),
+Breaks: unity-system-compositor (<< 0.0.2),
 Description: System compositor for Ubuntu Desktop
  Settings package which installs everything Ubuntu Desktop needs to use Mir
  (via XMir).

=== modified file 'debian/unity-system-compositor.install'
--- debian/unity-system-compositor.install	2013-11-12 15:45:22 +0000
+++ debian/unity-system-compositor.install	2013-11-19 21:23:34 +0000
@@ -1,3 +1,3 @@
+debian/source_unity-system-compositor.py usr/share/apport/package-hooks
+debian/unity-system-compositor.sleep usr/sbin/
 usr/sbin/unity-system-compositor
-debian/unity-system-compositor.sleep usr/sbin/
-debian/source_unity-system-compositor.py usr/share/apport/package-hooks