Merge lp:~bregma/unity-system-compositor/lp-1677734 into lp:unity-system-compositor

[Stephen M. Webb]

fix assorted lintian warnings in Deb packaging

Fixes a handful of Lintian warning from the debs created by this projects.

(1) Uses a secure Vcs-Bzr URL.
(2) Updates to Standards-Verision 3.9.8 (no changes required).
(3) Modify the wording of the binary package descriptions to conform to Debian policy.
(4) Added a debian/watch, cos it doesn't hurt.

Also ran wrap-and-sort to canonicalize formatting to minimize future change diffs.

[lp:~bregma/unity-system-compositor/lp-1677734]

313. By Stephen M. Webb on 2017-03-31

reran wrap-and-sort -at

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:312
https://mir-jenkins.ubuntu.com/job/usc-ci/60/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/83
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4527
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4517
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4517
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4517
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/87
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/87/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/87
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/87/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/87
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/87/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/87
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/87/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/87
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/87/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/60/rebuild

review: Approve (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:313
https://mir-jenkins.ubuntu.com/job/usc-ci/61/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/84
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4528
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4518
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4518
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4518
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/88
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/88/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/88
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/88/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/88
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/88/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/88
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/88/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/88
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/88/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/61/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Brandon Schaefer (brandontschaefer)]

sweet lgtm

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-01-17 21:10:21 +0000
+++ debian/control	2017-03-31 00:43:17 +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,8 @@
          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.

=== 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-03-31 00:43:17 +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/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2017-03-31 00:43:17 +0000
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/unity-system-compositor/+download .*/unity-system-compositor[-_]([0-9.]+)\.tar\.xz