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

[Ken VanDine]

Drop the fake build depends on upstart

Drop the fake build depends on upstart

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

1766. By Ken VanDine on 2017-03-15

Removed some unused packaging files

[Iain Lane (laney)]

Yep, I had a quick look earlier and that's what I thought too, thanks!

review: Approve

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

PASSED: Continuous integration, rev:1765
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/4/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2315
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2314
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2136
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2136
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2136
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2136
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2136
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2136
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2136/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2017-02-10 19:12:25 +0000
+++ debian/control	2017-03-15 14:36:38 +0000
@@ -60,9 +60,6 @@
                python3-dbus <!nocheck>,
                python3-xdg,
                gir1.2-glib-2.0,
-# depend on upstart to not build on s390x until upstart is available and u-s-s
-# runtime dependencies can be fulfilled
-               upstart,
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/ubuntu-system-settings
 # If you aren't a member of ~system-settings-touch but need to upload packaging

=== removed file 'debian/ubuntu-system-settings-wizard.install'
--- debian/ubuntu-system-settings-wizard.install	2014-06-15 19:12:41 +0000
+++ debian/ubuntu-system-settings-wizard.install	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-usr/bin/system-settings-wizard
-usr/share/ubuntu/settings/wizard
-usr/share/upstart/sessions/ubuntu-system-settings-wizard*.conf
-var/lib/polkit-1/localauthority/10-vendor.d/50-com.ubuntu.system-settings.wizard.pkla

=== removed file 'debian/ubuntu-system-settings-wizard.lintian-overrides'
--- debian/ubuntu-system-settings-wizard.lintian-overrides	2014-09-24 11:06:06 +0000
+++ debian/ubuntu-system-settings-wizard.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-ubuntu-system-settings-wizard: binary-without-manpage usr/bin/system-settings-wizard