Merge lp:~ken-vandine/ubuntu-system-settings/urfkill_suggests into lp:ubuntu-system-settings

[Ken VanDine]

Make urfkill a suggests and only show the flight-mode plugin if urfkill is installed.

Make urfkill a suggests and only show the flight-mode plugin if urfkill is installed.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1721
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/157/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1575/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1575
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1423
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1423/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1423
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1423/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1423
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1423/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1423
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1423/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1423
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1423/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1423
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1423/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1423/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1423/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1423/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/157/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM!

review: Approve

[lp:~ken-vandine/ubuntu-system-settings/urfkill_suggests]

1722. By Ken VanDine on 2016-09-27

merged trunk

=== modified file 'debian/control'
--- debian/control	2016-09-16 15:13:17 +0000
+++ debian/control	2016-09-27 13:30:30 +0000
@@ -103,7 +103,6 @@
          libsystemsettings1 (= ${binary:Version}),
          ubuntu-keyboard-data (>= 0.99.trunk.phablet2+15.04.20150421),
          ubuntu-wallpapers,
-         urfkill,
 # for the session-migration script (python3 itself also for the push helper)
          python3,
          python3-gi,
@@ -113,6 +112,7 @@
          qml-module-ubuntu-connectivity (>= 0.7.1)
 Suggests: system-image-dbus (>= 3.1),
           aethercast,
+          urfkill,
 Recommends: ubuntu-system-settings-online-accounts,
             ubuntu-touch-sounds,
 Conflicts: ubuntu-system-settings-example

=== modified file 'plugins/flight-mode/flight-mode.settings'
--- plugins/flight-mode/flight-mode.settings	2015-11-23 14:38:43 +0000
+++ plugins/flight-mode/flight-mode.settings	2016-09-27 13:30:30 +0000
@@ -13,5 +13,6 @@
     ],
     "has-dynamic-keywords": false,
     "has-dynamic-visibility": false,
+    "visible-if-file-exists": "/etc/dbus-1/system.d/org.freedesktop.URfkill.conf",
     "entry-component": "EntryComponent.qml"
 }