Merge lp:~stgraber/indicator-datetime/fix-deps into lp:indicator-datetime/15.10

[Stéphane Graber]

This should allow for systemd-shim to go away on systemd systems and
hopefully also let us remove cgmanager from default desktop installs.

[lp:~stgraber/indicator-datetime/fix-deps]

432. By Stéphane Graber on 2016-02-24

Drop systemd-services as it's provided by systemd

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:431
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/360/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/50/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/360/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:432
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/361/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/51/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/361/rebuild

review: Approve (continuous-integration)

[Stéphane Graber (stgraber)]

So this was two weeks ago now... I tried going through the proper upstream process but clearly that's not working, uploading directly to the archive now, please merge this before uploading to xenial yourself.

[Stéphane Graber (stgraber)]

Uploaded to xenial now.

[Charles Kerr (charlesk)]

Stéphane, you're right, though you could have given me a ping in IRC instead of waiting two weeks and then doing a direct upload.

Anyway, FWIW the patch is fine. Thanks for the fix.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-29 18:53:46 +0000
+++ debian/changelog	2016-02-24 17:52:57 +0000
@@ -1,3 +1,9 @@
+indicator-datetime (15.10+16.04.20160129-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Don't pull systemd-shim on systems with systemd installed.
+
+ -- Stéphane Graber <[e-mail]>  Wed, 24 Feb 2016 12:40:28 -0500
+
 indicator-datetime (15.10+16.04.20160129-0ubuntu1) xenial; urgency=medium
 
   [ Charles Kerr ]

=== modified file 'debian/control'
--- debian/control	2015-10-14 03:32:03 +0000
+++ debian/control	2016-02-24 17:52:57 +0000
@@ -39,8 +39,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
-         systemd-services,
-         systemd-shim,
+         systemd | systemd-shim,
 Recommends: indicator-applet | indicator-renderer,
             evolution-data-server,
             geoclue-ubuntu-geoip | geoclue-provider,