Merge lp:~matttbe/ubuntu/trusty/network-manager-applet/lp1267100 into lp:ubuntu/trusty/network-manager-applet

Proposed by Matthieu Baerts on 2014-01-08
Status: Merged
Merge reported by: Mathieu Trudel-Lapierre
Merged at revision: not available
Proposed branch: lp:~matttbe/ubuntu/trusty/network-manager-applet/lp1267100
Merge into: lp:ubuntu/trusty/network-manager-applet
Diff against target: 103 lines (+42/-8)
6 files modified
.pc/applied-patches (+1/-0)
.pc/git_dont_autostart_under_GNOME.patch/nm-applet.desktop.in (+13/-0)
debian/changelog (+8/-0)
debian/patches/git_dont_autostart_under_GNOME.patch (+16/-7)
debian/patches/series (+1/-0)
nm-applet.desktop.in (+3/-1)
To merge this branch: bzr merge lp:~matttbe/ubuntu/trusty/network-manager-applet/lp1267100
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2014-01-08 Approve on 2014-03-05
Dmitry Shachnev Approve on 2014-02-21
Ubuntu Sponsors Team 2014-02-21 Pending
Review via email: mp+200825@code.launchpad.net

Description of the change

Hello Mathieu and thank you for maintaining nm-applet packages!

With the latest version (0.9.8.4-1ubuntu1), nm-applet is no longer launched at startup on non Gnome-Shell sessions (e.g. on Cairo-Dock session).
It seems this is because this patch is no longer applied: git_dont_autostart_under_GNOME.patch

I'm proposing a new version (please see the branch linked to this bug report) which re-adds this patch.

Note that this patch should no longer be needed with the next 0.9.8.8 version: https://git.gnome.org/browse/network-manager-applet/commit/?id=e192e83c1aa136512a9d4f026f81677799af8127

To post a comment you must log in.
113. By Mathieu Trudel-Lapierre on 2014-01-24

* debian/rules, debian/control: Enable ModemManager1 support.
* debian/patches/nm-applet-use-indicator.patch: refresh patch for missing
  update to the get_icon function for "broadband" devices used by MM1.

Matthieu Baerts (matttbe) wrote :

Hello Mathieu,

I just updated this branch to be sync with the trunk (lp:ubuntu/network-manager-applet).

Have a nice day,

Matt

114. By Iain Lane on 2014-02-19

Add new patch to move on with enter in the country page of the new mobile
wizard

Dmitry Shachnev (mitya57) wrote :

Hi Matthieu,

Alberts Muktupāvels has notified me about this issue, and I noticed that you already have a MP for that — so thanks for saving my time :)

Hovewer, it is stuck for a month and Mathieu seems to not respond to it. Can you please add ~ubuntu-sponsors to reviewers list so that it shows up in the sponsoring queue?

review: Approve
Dmitry Shachnev (mitya57) wrote :

And, also, we got a new upload two days ago, so please update it before subscribing ubuntu-sponsors.

115. By Matthieu Baerts on 2014-02-21

* debian/patches/git_dont_autostart_under_GNOME.patch:
  - Re-added this patch to use AutostartCondition: launch nm-applet at
    startup on gnome-but-not-shell sessions (LP: #1267100)

Matthieu Baerts (matttbe) wrote :

Hello and thank you for your review.

I just update my branch: this new revision can be "pulled", tagged and pushed ;-)

Mathieu Trudel-Lapierre (cyphermox) wrote :

Approving, but his really should be done against lp:~network-manager/network-manager-applet/ubuntu; I'll apply the changes there manually and upload.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2014-02-19 17:30:58 +0000
3+++ .pc/applied-patches 2014-02-21 21:51:29 +0000
4@@ -17,3 +17,4 @@
5 lp1048520_delay_pin_dialog_in_greeter.patch
6 rebuild_menu_after_init.patch
7 0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch
8+git_dont_autostart_under_GNOME.patch
9
10=== added directory '.pc/git_dont_autostart_under_GNOME.patch'
11=== added file '.pc/git_dont_autostart_under_GNOME.patch/nm-applet.desktop.in'
12--- .pc/git_dont_autostart_under_GNOME.patch/nm-applet.desktop.in 1970-01-01 00:00:00 +0000
13+++ .pc/git_dont_autostart_under_GNOME.patch/nm-applet.desktop.in 2014-02-21 21:51:29 +0000
14@@ -0,0 +1,13 @@
15+[Desktop Entry]
16+_Name=Network
17+_Comment=Manage your network connections
18+Icon=nm-device-wireless
19+Exec=nm-applet
20+Terminal=false
21+Type=Application
22+NoDisplay=true
23+NotShowIn=KDE;GNOME;
24+X-GNOME-Bugzilla-Bugzilla=GNOME
25+X-GNOME-Bugzilla-Product=NetworkManager
26+X-GNOME-Bugzilla-Component=nm-applet
27+X-GNOME-UsesNotifications=true
28
29=== modified file 'debian/changelog'
30--- debian/changelog 2014-02-19 17:30:58 +0000
31+++ debian/changelog 2014-02-21 21:51:29 +0000
32@@ -1,3 +1,11 @@
33+network-manager-applet (0.9.8.4-1ubuntu4) trusty; urgency=medium
34+
35+ * debian/patches/git_dont_autostart_under_GNOME.patch:
36+ - Re-added this patch to use AutostartCondition: launch nm-applet at
37+ startup on gnome-but-not-shell sessions (LP: #1267100)
38+
39+ -- Matthieu Baerts (matttbe) <matttbe@ubuntu.com> Fri, 21 Feb 2014 22:48:36 +0100
40+
41 network-manager-applet (0.9.8.4-1ubuntu3) trusty; urgency=medium
42
43 * Add new patch to move on with enter in the country page of the new mobile
44
45=== modified file 'debian/patches/git_dont_autostart_under_GNOME.patch'
46--- debian/patches/git_dont_autostart_under_GNOME.patch 2013-10-04 22:40:22 +0000
47+++ debian/patches/git_dont_autostart_under_GNOME.patch 2014-02-21 21:51:29 +0000
48@@ -11,14 +11,23 @@
49 ---
50 (limited to 'nm-applet.desktop.in')
51
52---- a/nm-applet.desktop.in
53-+++ b/nm-applet.desktop.in
54-@@ -9,6 +9,7 @@
55- NotShowIn=KDE;
56+Note: This patch should no longer be needed with the next 0.9.8.8 version
57+thanks to the commit e192e83c1aa136512a9d4f026f81677799af8127
58+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1267100
59+
60+Index: network-manager-applet/nm-applet.desktop.in
61+===================================================================
62+--- network-manager-applet.orig/nm-applet.desktop.in 2014-01-08 13:55:44.677374794 +0100
63++++ network-manager-applet/nm-applet.desktop.in 2014-01-08 13:55:44.673374794 +0100
64+@@ -6,8 +6,10 @@
65+ Terminal=false
66+ Type=Application
67+ NoDisplay=true
68+-NotShowIn=KDE;GNOME;
69++NotShowIn=KDE;
70 X-GNOME-Bugzilla-Bugzilla=GNOME
71 X-GNOME-Bugzilla-Product=NetworkManager
72--X-GNOME-Bugzilla-Component=general
73-+X-GNOME-Bugzilla-Component=nm-applet
74- X-GNOME-Autostart-enabled=true
75+ X-GNOME-Bugzilla-Component=nm-applet
76++X-GNOME-Autostart-enabled=true
77 +AutostartCondition=GNOME3 unless-session gnome
78 X-GNOME-UsesNotifications=true
79
80=== modified file 'debian/patches/series'
81--- debian/patches/series 2014-02-19 17:30:58 +0000
82+++ debian/patches/series 2014-02-21 21:51:29 +0000
83@@ -17,3 +17,4 @@
84 lp1048520_delay_pin_dialog_in_greeter.patch
85 rebuild_menu_after_init.patch
86 0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch
87+git_dont_autostart_under_GNOME.patch
88
89=== modified file 'nm-applet.desktop.in'
90--- nm-applet.desktop.in 2014-01-06 22:29:40 +0000
91+++ nm-applet.desktop.in 2014-02-21 21:51:29 +0000
92@@ -6,8 +6,10 @@
93 Terminal=false
94 Type=Application
95 NoDisplay=true
96-NotShowIn=KDE;GNOME;
97+NotShowIn=KDE;
98 X-GNOME-Bugzilla-Bugzilla=GNOME
99 X-GNOME-Bugzilla-Product=NetworkManager
100 X-GNOME-Bugzilla-Component=nm-applet
101+X-GNOME-Autostart-enabled=true
102+AutostartCondition=GNOME3 unless-session gnome
103 X-GNOME-UsesNotifications=true

Subscribers

People subscribed via source and target branches