Merge lp:~pitti/ubuntu-app-launch/upstart-dep into lp:ubuntu-app-launch/14.10

[Martin Pitt]

Adjust upstart recommends to upstart-bin

Adjust upstart recommends to upstart-bin. ubuntu-app-launch is only concerned about session upstart, it does not care about pid 1. Adjust the dependency to upstart-bin to allow uninstalling upstart and installing systemd-sysv.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-utopic-armhf-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-utopic-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/295/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

[Martin Pitt (pitti)]

Thanks Ted! This is trivial and not that urgent, so probably doesn't warrant an entire landing by itself. Could you fold this into the next landing?

[lp:~pitti/ubuntu-app-launch/upstart-dep]

158. By Martin Pitt on 2014-09-26

merge trunk

[Martin Pitt (pitti)]

Updated to trunk to fix conflict.

=== modified file 'debian/control'
--- debian/control	2014-08-08 19:50:53 +0000
+++ debian/control	2014-09-26 07:44:46 +0000
@@ -22,7 +22,7 @@
                libzeitgeist-2.0-dev,
                gobject-introspection,
                python3-dbusmock,
-               upstart (>= 1.13),
+               upstart-bin (>= 1.13),
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/ubuntu-app-launch
 # If you aren't a member of ~indicator-applet-developers but need to upload packaging changes,
@@ -35,7 +35,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          click-apparmor,
-         upstart (>= 1.13),
+         upstart-bin (>= 1.13),
          zeitgeist-core,
 Replaces: upstart-app-launch
 Conflicts: upstart-app-launch