Merge lp:~timo-jyrinki/ubuntu-system-settings/stop_s390x_problems_depend_on_upstart into lp:ubuntu-system-settings

[Timo Jyrinki]

Depend on upstart to prevent s390x problems until upstart has been fixed.

As discussed on #ubuntu-release, one way to stop s390x/upstart problem "ubuntu-system-settings/s390x unsatisfiable Depends: qtdeclarative5-ubuntu-content1" would be to remove u-s-s on s390x and stop building ubuntu-system-settings for it until upstart is fixed.

That would fix what we now have, and would only allow ubuntu-system-settings/s390x to be built again only when upstart is again available, and presumably at that time the whole chain like qtdeclarative5-ubuntu-content1 (a runtime dependency of u-s-s) could be also made available on s390x.

This would be better option than specifying the archs u-s-s builds for.

[Łukasz Zemczak (sil2100)]

+1 on this temporary approach.

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-07-22 14:37:28 +0000
+++ debian/control	2016-08-05 13:05:00 +0000
@@ -55,6 +55,9 @@
                python3-dbus,
                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