Network Menu

Merge lp:~pete-woods/indicator-network/ofono-optional into lp:indicator-network/15.10

  1. ofono-optional
  2. Merge into trunk.15.10
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 558
Merged at revision: 558
Proposed branch: lp:~pete-woods/indicator-network/ofono-optional
Merge into: lp:indicator-network/15.10
Prerequisite: lp:~pete-woods/indicator-network/connectivity-api-fixes
Diff against target: 28 lines (+2/-1)
2 files modified
debian/changelog (+1/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~pete-woods/indicator-network/ofono-optional
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+282574@code.launchpad.net

Commit message

Make ofono dependency optional

Description of the change

Make ofono dependency optional

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) :
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-14 13:42:03 +0000
3+++ debian/changelog 2016-01-14 13:42:03 +0000
4@@ -2,6 +2,7 @@
5
6 * Fix Connectivity::status property. (LP: #1531380)
7 * Add PPTP support to VPN editor.
8+ * Make ofono dependency optional. (LP: #1521142)
9
10 -- Pete Woods <pete.woods@canonical.com> Tue, 12 Jan 2016 18:10:06 +0000
11
12
13=== modified file 'debian/control'
14--- debian/control 2015-12-15 12:23:53 +0000
15+++ debian/control 2016-01-14 13:42:03 +0000
16@@ -47,11 +47,11 @@
17 ${shlibs:Depends},
18 network-manager,
19 network-manager-openvpn,
20- ofono,
21 ubuntu-mobile-icons (>= 13.04+13.10.20131014),
22 # For apport hook
23 python3-xdg,
24 urfkill,
25+Recommends: ofono
26 Conflicts: chewie,
27 indicators-client-plugin-network,
28 Description: Systems settings menu service - Network indicator

Subscribers

People subscribed via source and target branches