GNOME Settings Daemon

Merge lp:~noskcaj/gnome-settings-daemon/nm-0.9.10 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

  1. nm-0.9.10
  2. Merge into ubuntu
Proposed by Jackson Doak
Status: Merged
Merged at revision: 485
Proposed branch: lp:~noskcaj/gnome-settings-daemon/nm-0.9.10
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 25 lines (+6/-1)
2 files modified
debian/changelog (+6/-0)
debian/rules (+0/-1)
To merge this branch: bzr merge lp:~noskcaj/gnome-settings-daemon/nm-0.9.10
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Tim Lunn Approve
Review via email: mp+247942@code.launchpad.net

Description of the change

enable the sharing plugin now we have network-manager 0.9.10

To post a comment you must log in.
Revision history for this message
Tim Lunn (darkxst) wrote :

thanks, this looks correct.

review: Approve
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Thanks Jackson!

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 2014-12-20 20:23:02 +0000
3+++ debian/changelog 2015-01-29 06:08:23 +0000
4@@ -1,3 +1,9 @@
5+gnome-settings-daemon (3.14.2-2ubuntu2) vivid; urgency=medium
6+
7+ * Turn new sharing plugin on now we have network-manager 0.9.10
8+
9+ -- Jackson Doak <noskcaj@ubuntu.com> Thu, 29 Jan 2015 16:40:07 +1100
10+
11 gnome-settings-daemon (3.14.2-2ubuntu1) vivid; urgency=low
12
13 [ Jackson Doak ]
14
15=== modified file 'debian/rules'
16--- debian/rules 2014-12-19 22:37:25 +0000
17+++ debian/rules 2015-01-29 06:08:23 +0000
18@@ -9,7 +9,6 @@
19 include /usr/share/gnome-pkg-tools/1/rules/patch-translations.mk
20
21 DEB_DH_AUTORECONF_ARGS = --as-needed
22-DEB_CONFIGURE_EXTRA_FLAGS += --disable-network-manager
23
24 ifneq ($(DEB_HOST_ARCH_CPU),$(filter $(DEB_HOST_ARCH_CPU),ia64 mipsel))
25 LDFLAGS += -Wl,-z,defs

Subscribers

People subscribed via source and target branches

to all changes: