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 (community) 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
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2014-02-19 17:30:58 +0000
+++ .pc/applied-patches 2014-02-21 21:51:29 +0000
@@ -17,3 +17,4 @@
17lp1048520_delay_pin_dialog_in_greeter.patch17lp1048520_delay_pin_dialog_in_greeter.patch
18rebuild_menu_after_init.patch18rebuild_menu_after_init.patch
190001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch190001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch
20git_dont_autostart_under_GNOME.patch
2021
=== added directory '.pc/git_dont_autostart_under_GNOME.patch'
=== added file '.pc/git_dont_autostart_under_GNOME.patch/nm-applet.desktop.in'
--- .pc/git_dont_autostart_under_GNOME.patch/nm-applet.desktop.in 1970-01-01 00:00:00 +0000
+++ .pc/git_dont_autostart_under_GNOME.patch/nm-applet.desktop.in 2014-02-21 21:51:29 +0000
@@ -0,0 +1,13 @@
1[Desktop Entry]
2_Name=Network
3_Comment=Manage your network connections
4Icon=nm-device-wireless
5Exec=nm-applet
6Terminal=false
7Type=Application
8NoDisplay=true
9NotShowIn=KDE;GNOME;
10X-GNOME-Bugzilla-Bugzilla=GNOME
11X-GNOME-Bugzilla-Product=NetworkManager
12X-GNOME-Bugzilla-Component=nm-applet
13X-GNOME-UsesNotifications=true
014
=== modified file 'debian/changelog'
--- debian/changelog 2014-02-19 17:30:58 +0000
+++ debian/changelog 2014-02-21 21:51:29 +0000
@@ -1,3 +1,11 @@
1network-manager-applet (0.9.8.4-1ubuntu4) trusty; urgency=medium
2
3 * debian/patches/git_dont_autostart_under_GNOME.patch:
4 - Re-added this patch to use AutostartCondition: launch nm-applet at
5 startup on gnome-but-not-shell sessions (LP: #1267100)
6
7 -- Matthieu Baerts (matttbe) <matttbe@ubuntu.com> Fri, 21 Feb 2014 22:48:36 +0100
8
1network-manager-applet (0.9.8.4-1ubuntu3) trusty; urgency=medium9network-manager-applet (0.9.8.4-1ubuntu3) trusty; urgency=medium
210
3 * Add new patch to move on with enter in the country page of the new mobile11 * Add new patch to move on with enter in the country page of the new mobile
412
=== modified file 'debian/patches/git_dont_autostart_under_GNOME.patch'
--- debian/patches/git_dont_autostart_under_GNOME.patch 2013-10-04 22:40:22 +0000
+++ debian/patches/git_dont_autostart_under_GNOME.patch 2014-02-21 21:51:29 +0000
@@ -11,14 +11,23 @@
11---11---
12(limited to 'nm-applet.desktop.in')12(limited to 'nm-applet.desktop.in')
1313
14--- a/nm-applet.desktop.in14Note: This patch should no longer be needed with the next 0.9.8.8 version
15+++ b/nm-applet.desktop.in15thanks to the commit e192e83c1aa136512a9d4f026f81677799af8127
16@@ -9,6 +9,7 @@16Bug-Ubuntu: https://bugs.launchpad.net/bugs/1267100
17 NotShowIn=KDE;17
18Index: network-manager-applet/nm-applet.desktop.in
19===================================================================
20--- network-manager-applet.orig/nm-applet.desktop.in 2014-01-08 13:55:44.677374794 +0100
21+++ network-manager-applet/nm-applet.desktop.in 2014-01-08 13:55:44.673374794 +0100
22@@ -6,8 +6,10 @@
23 Terminal=false
24 Type=Application
25 NoDisplay=true
26-NotShowIn=KDE;GNOME;
27+NotShowIn=KDE;
18 X-GNOME-Bugzilla-Bugzilla=GNOME28 X-GNOME-Bugzilla-Bugzilla=GNOME
19 X-GNOME-Bugzilla-Product=NetworkManager29 X-GNOME-Bugzilla-Product=NetworkManager
20-X-GNOME-Bugzilla-Component=general30 X-GNOME-Bugzilla-Component=nm-applet
21+X-GNOME-Bugzilla-Component=nm-applet31+X-GNOME-Autostart-enabled=true
22 X-GNOME-Autostart-enabled=true
23+AutostartCondition=GNOME3 unless-session gnome32+AutostartCondition=GNOME3 unless-session gnome
24 X-GNOME-UsesNotifications=true33 X-GNOME-UsesNotifications=true
2534
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-02-19 17:30:58 +0000
+++ debian/patches/series 2014-02-21 21:51:29 +0000
@@ -17,3 +17,4 @@
17lp1048520_delay_pin_dialog_in_greeter.patch17lp1048520_delay_pin_dialog_in_greeter.patch
18rebuild_menu_after_init.patch18rebuild_menu_after_init.patch
190001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch190001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch
20git_dont_autostart_under_GNOME.patch
2021
=== modified file 'nm-applet.desktop.in'
--- nm-applet.desktop.in 2014-01-06 22:29:40 +0000
+++ nm-applet.desktop.in 2014-02-21 21:51:29 +0000
@@ -6,8 +6,10 @@
6Terminal=false6Terminal=false
7Type=Application7Type=Application
8NoDisplay=true8NoDisplay=true
9NotShowIn=KDE;GNOME;9NotShowIn=KDE;
10X-GNOME-Bugzilla-Bugzilla=GNOME10X-GNOME-Bugzilla-Bugzilla=GNOME
11X-GNOME-Bugzilla-Product=NetworkManager11X-GNOME-Bugzilla-Product=NetworkManager
12X-GNOME-Bugzilla-Component=nm-applet12X-GNOME-Bugzilla-Component=nm-applet
13X-GNOME-Autostart-enabled=true
14AutostartCondition=GNOME3 unless-session gnome
13X-GNOME-UsesNotifications=true15X-GNOME-UsesNotifications=true

Subscribers

People subscribed via source and target branches