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

[Matthieu Baerts]

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

[lp:~matttbe/ubuntu/trusty/network-manager-applet/lp1267100]

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)]

Hello Mathieu,

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

Have a nice day,

Matt

[lp:~matttbe/ubuntu/trusty/network-manager-applet/lp1267100]

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)]

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)]

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

[lp:~matttbe/ubuntu/trusty/network-manager-applet/lp1267100]

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)]

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)]

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

=== 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 @@
 lp1048520_delay_pin_dialog_in_greeter.patch
 rebuild_menu_after_init.patch
 0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch
+git_dont_autostart_under_GNOME.patch
 
=== 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 @@
+[Desktop Entry]
+_Name=Network
+_Comment=Manage your network connections
+Icon=nm-device-wireless
+Exec=nm-applet
+Terminal=false
+Type=Application
+NoDisplay=true
+NotShowIn=KDE;GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=NetworkManager
+X-GNOME-Bugzilla-Component=nm-applet
+X-GNOME-UsesNotifications=true
 
=== 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 @@
+network-manager-applet (0.9.8.4-1ubuntu4) trusty; urgency=medium
+
+  * 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) <[e-mail]>  Fri, 21 Feb 2014 22:48:36 +0100
+
 network-manager-applet (0.9.8.4-1ubuntu3) trusty; urgency=medium
 
   * Add new patch to move on with enter in the country page of the new mobile
 
=== 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 @@
 ---
 (limited to 'nm-applet.desktop.in')
 
---- a/nm-applet.desktop.in
-+++ b/nm-applet.desktop.in
-@@ -9,6 +9,7 @@
- NotShowIn=KDE;
+Note: This patch should no longer be needed with the next 0.9.8.8 version
+thanks to the commit e192e83c1aa136512a9d4f026f81677799af8127
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1267100
+
+Index: network-manager-applet/nm-applet.desktop.in
+===================================================================
+--- network-manager-applet.orig/nm-applet.desktop.in	2014-01-08 13:55:44.677374794 +0100
++++ network-manager-applet/nm-applet.desktop.in	2014-01-08 13:55:44.673374794 +0100
+@@ -6,8 +6,10 @@
+ Terminal=false
+ Type=Application
+ NoDisplay=true
+-NotShowIn=KDE;GNOME;
++NotShowIn=KDE;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=NetworkManager
--X-GNOME-Bugzilla-Component=general
-+X-GNOME-Bugzilla-Component=nm-applet
- X-GNOME-Autostart-enabled=true
+ X-GNOME-Bugzilla-Component=nm-applet
++X-GNOME-Autostart-enabled=true
 +AutostartCondition=GNOME3 unless-session gnome
  X-GNOME-UsesNotifications=true
 
=== 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 @@
 lp1048520_delay_pin_dialog_in_greeter.patch
 rebuild_menu_after_init.patch
 0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch
+git_dont_autostart_under_GNOME.patch
 
=== 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 @@
 Terminal=false
 Type=Application
 NoDisplay=true
-NotShowIn=KDE;GNOME;
+NotShowIn=KDE;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=NetworkManager
 X-GNOME-Bugzilla-Component=nm-applet
+X-GNOME-Autostart-enabled=true
+AutostartCondition=GNOME3 unless-session gnome
 X-GNOME-UsesNotifications=true