Merge lp:~vorlon/unity-greeter/no-indicator-applet into lp:unity-greeter

[Steve Langasek]

Add a dependency on unity, to hint to germinate/components-mismatches not to pull indicator-applet into main.

[Steve Langasek (vorlon)]

This change should fix a problem with germinate being unable to calculate
that indicator-applets should not be pulled into main because unity should
be used instead for indicator-datetime's recommends.

I have tested germinate output locally with modified packages files and confirmed that it does what's expected.

The problem this fixes is visible at <http://people.canonical.com/~ubuntu-archive/component-mismatches>, <http://people.canonical.com/~ubuntu-archive/component-mismatches.svg>. This is cosmetic from an end-user perspective, but the clutter on this report makes it more difficult than it ought to be to handle remaining issues.

I believe the user impact of this change is negligible because I don't see why a user would have unity-greeter installed without unity anyway, such that we're impacting the ordering of dependency resolution rather than changing anything about what a real user has installed. But if I'm mistaken about this, let me know and I'll look for another way to fix this.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1884
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-wily-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/61/rebuild

review: Approve (continuous-integration)

[Steve Langasek (vorlon)]

I have pushed this change to the archive but don't have permission to push to the branch.

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-25 12:38:14 +0000
+++ debian/changelog	2016-04-29 20:27:24 +0000
@@ -1,3 +1,10 @@
+unity-greeter (16.10.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add a dependency on unity, to hint to germinate/components-mismatches
+    not to pull indicator-applet into main.
+
+ -- Steve Langasek <[e-mail]>  Fri, 29 Apr 2016 12:41:50 -0700
+
 unity-greeter (16.10.0-0ubuntu1) yakkety; urgency=medium
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2015-07-31 00:11:21 +0000
+++ debian/control	2016-04-29 20:27:24 +0000
@@ -31,7 +31,8 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         upstart
+         upstart,
+         unity
 Recommends: unity-settings-daemon,
             indicator-application,
             indicator-datetime,