Merge lp:~jbicha/indicator-datetime/dont-recommend-ubuntu-system-settings into lp:indicator-datetime

Proposed by Jeremy Bicha on 2017-06-05
Status: Merged
Approved by: Ken VanDine on 2017-06-06
Approved revision: 487
Merged at revision: 485
Proposed branch: lp:~jbicha/indicator-datetime/dont-recommend-ubuntu-system-settings
Merge into: lp:indicator-datetime
Diff against target: 63 lines (+17/-8)
2 files modified
debian/changelog (+12/-0)
debian/control (+5/-8)
To merge this branch: bzr merge lp:~jbicha/indicator-datetime/dont-recommend-ubuntu-system-settings
Reviewer Review Type Date Requested Status
Ken VanDine 2017-06-05 Approve on 2017-06-06
Review via email: mp+325119@code.launchpad.net

Commit Message

Allow gnome-control-center as alternate for gnome-control-center recommends
Drop obsolete dependencies (click, systemd-shim, ubuntu-system-settings)

Description of the Change

To allow for ubuntu-system-settings to be removed, but let the indicators and unity-control-center stay for now

https://bileto.ubuntu.com/#/ticket/2797

To post a comment you must log in.
485. By Łukasz Zemczak on 2017-06-05

No-change rebuild (LP: #1681870)

486. By Dimitri John Ledkov on 2017-06-05

Drop language-pack-touch-en build dependency

487. By Jeremy Bicha on 2017-06-05

Drop obsolete dependencies and allow gnome-control-center to satisfy recommends

Ken VanDine (ken-vandine) wrote :

Looks good

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 2017-03-22 18:28:11 +0000
3+++ debian/changelog 2017-06-05 23:27:13 +0000
4@@ -1,3 +1,15 @@
5+indicator-datetime (15.10+17.04.20170322-0ubuntu3) artful; urgency=medium
6+
7+ * Drop language-pack-touch-en build dependency.
8+
9+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 18 May 2017 12:03:54 +0100
10+
11+indicator-datetime (15.10+17.04.20170322-0ubuntu2) zesty; urgency=medium
12+
13+ * No-change rebuild (LP: #1681870).
14+
15+ -- Åukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 11 Apr 2017 17:32:50 +0100
16+
17 indicator-datetime (15.10+17.04.20170322-0ubuntu1) zesty; urgency=medium
18
19 * no change rebuild
20
21=== modified file 'debian/control'
22--- debian/control 2017-02-27 14:29:11 +0000
23+++ debian/control 2017-06-05 23:27:13 +0000
24@@ -5,7 +5,7 @@
25 Build-Depends: cmake,
26 cmake-extras (>= 1.1),
27 dbus,
28- debhelper (>= 9),
29+ debhelper (>= 9),
30 dh-translations,
31 gcovr,
32 intltool,
33@@ -27,7 +27,7 @@
34 python3-dbusmock,
35 # for 12h/24h locale unit tests:
36 locales,
37- language-pack-touch-en | language-pack-en-base,
38+ language-pack-en-base,
39 # for running live EDS tests:
40 evolution-data-server,
41 gvfs-daemons,
42@@ -51,18 +51,15 @@
43
44 Package: indicator-datetime
45 Architecture: any
46-Depends: ${shlibs:Depends},
47+Depends: ${shlibs:Depends},
48 ${misc:Depends},
49 gsettings-ubuntu-schemas (>= 0.0.7),
50 indicator-common,
51- systemd | systemd-shim,
52+ systemd,
53 Recommends: indicator-applet | indicator-renderer,
54 evolution-data-server,
55 geoclue-ubuntu-geoip | geoclue-provider,
56- unity-control-center (>= 14.04.3) | ubuntu-system-settings,
57+ unity-control-center (>= 14.04.3) | gnome-control-center,
58 ubuntu-touch-sounds,
59-Suggests: click,
60-Conflicts: indicator-datetime (<< 13.10.0)
61-Replaces: indicator-datetime (<< 13.10.0)
62 Description: Simple clock
63 A simple clock appearing in the indicator bar

Subscribers

People subscribed via source and target branches