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

Proposed by Stéphane Graber on 2016-02-24
Status: Merged
Approved by: Charles Kerr on 2016-03-10
Approved revision: 432
Merged at revision: 433
Proposed branch: lp:~stgraber/indicator-datetime/fix-deps
Merge into: lp:indicator-datetime/15.10
Diff against target: 27 lines (+7/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-2)
To merge this branch: bzr merge lp:~stgraber/indicator-datetime/fix-deps
Reviewer Review Type Date Requested Status
Charles Kerr (community) 2016-02-24 Approve on 2016-03-10
PS Jenkins bot (community) continuous-integration Approve on 2016-02-24
Review via email: mp+287068@code.launchpad.net

Description of the change

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

To post a comment you must log in.
432. By Stéphane Graber on 2016-02-24

Drop systemd-services as it's provided by systemd

Stéphane Graber (stgraber) wrote :

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) wrote :

Uploaded to xenial now.

Charles Kerr (charlesk) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-01-29 18:53:46 +0000
3+++ debian/changelog 2016-02-24 17:52:57 +0000
4@@ -1,3 +1,9 @@
5+indicator-datetime (15.10+16.04.20160129-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Don't pull systemd-shim on systems with systemd installed.
8+
9+ -- Stéphane Graber <stgraber@ubuntu.com> Wed, 24 Feb 2016 12:40:28 -0500
10+
11 indicator-datetime (15.10+16.04.20160129-0ubuntu1) xenial; urgency=medium
12
13 [ Charles Kerr ]
14
15=== modified file 'debian/control'
16--- debian/control 2015-10-14 03:32:03 +0000
17+++ debian/control 2016-02-24 17:52:57 +0000
18@@ -39,8 +39,7 @@
19 Architecture: any
20 Depends: ${shlibs:Depends},
21 ${misc:Depends},
22- systemd-services,
23- systemd-shim,
24+ systemd | systemd-shim,
25 Recommends: indicator-applet | indicator-renderer,
26 evolution-data-server,
27 geoclue-ubuntu-geoip | geoclue-provider,

Subscribers

People subscribed via source and target branches