lp:~dylanmccall/ubuntu/oneiric/network-manager-applet/lp852961-disable-autostart-for-gnome-shell

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:ubuntu/oneiric/network-manager-applet

Mathieu Trudel-Lapierre: Needs Resubmitting on 2011-09-22

Dylan McCall: Pending requested 2011-09-21

Ubuntu branches: Pending requested 2011-09-21

Diff: 56 lines (+17/-7)

3 files modified

debian/changelog (+7/-0)
debian/patches/04-autostart.patch (+9/-7)
nm-applet.desktop.in (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #852961: nm-applet is wrongly started with Gnome Shell

Undecided

Fix Released

Link a bug report

Related blueprints

71. By Dylan McCall on 2011-09-21

* debian/patches/04-autostart.patch:
  - disable autostart when using gnome-shell (LP: #852961)

70. By Mathieu Trudel-Lapierre on 2011-07-08

* upstream snapshot 2011-07-07 15:24:06 (GMT)
  + 340f69597ea787cebf690b73de2d4c8c78f7b16c
  - editor: update secret flags when updating visibility
  - applet: don't show irrelevant security options during secrets requests
  - added translations
* debian/control: drop gksu from network-manager-gnome Depends.
* debian/patches/nm-applet-use-indicator.patch:
  - refreshed.
  - rework menu update code to trigger on dbusmenu about-to-show signal
    (LP: #791770, #764451)

69. By Mathieu Trudel-Lapierre on 2011-06-17

* upstream snapshot 2011-06-16 19:36:16 (GMT)
  + b2e6a33e2c870df26fca0daa618eadaa4bb81751
  - editor: fix resizing GtkNotebook when user resizes main window
  - applet: fix "Configure VPN" menu item to show the editor's VPN tab
  - editor: fix calling connections_read() on freed data
  - ui: ensure entries activate default button if Enter is pressed
  - applet: mark VPN notifications as transient (bgo #652143)
  - applet: fix possible crash when gtk_entry_get_text() returns NULL
  - gsm: add registration status notification
  - applet: use generic icons for GSM registration notifications
* debian/patches/lp460144_correctly_update_notification.patch: refreshed.
* debian/patches/nm-applet-use-indicator.patch: refreshed.

68. By Mathieu Trudel-Lapierre on 2011-05-30

* upstream snapshot 2011-05-29 17:00:33 (GMT)
  + 9ec4c5de855de5d9ee6c17752c3b0de6c68e9384
  - applet: fix leak in import/upgrade code (LP: #784756)
* debian/rules: switch back to git "master" branch.
* debian/patches/0001-applet-fix-possibly-uninitialized-variable.patch: drop,
  this is fixed upstream.
* debian/patches/04-autostart.patch: refreshed.
* debian/patches/20_use_full_vpn_dialog_service_name_path.patch: refreshed.
* debian/patches/lp328572-dxteam-connect-text.patch: refreshed.
* debian/patches/lp337960_dxteam_notification_icon_names.diff: refreshed.
* debian/patches/lp341684_device_sensitive_disconnect_notify.patch: refresh.
* debian/patches/lp460144_correctly_update_notification.patch: refreshed.
* debian/patches/lp341684_device_sensitive_disconnect_notify.patch: refresh.
* debian/patches/lp358526_generic_disconnected_notification_icon.patch:
  refreshed.
* debian/patches/nm-applet-use-indicator.patch: refreshed and modified to
  build with GTK3 appindicator.
  - properly free icon_name for indicators (LP: #724554), thanks JKL.
  - fix leak in applet_menu_item_add_complex_separator_helper due to new'ing
    a GtkSeparatorMenuItem on top of a GtkImageMenuItem (LP: #784711).
* debian/control:
  - Bump Build-Depends to libappindicator3-dev.
  - Update Build-Depends for GTK to libgtk-3-dev.
  - Bump network-manager and libnm Depends and Build-Depends to 0.8.998.
* debian/rules, debian/patches/series: pass --libexecdir to configure, which
  now renders the patch 20_use_full_vpn_dialog_service_name_path.patch
  unnecessary, so we're dropping it.
* debian/patches/20_use_full_vpn_dialog_service_name_path.patch: dropped,
  see above.

67. By Mathieu Trudel-Lapierre on 2011-05-18

* New upstream release 0.8.4.
* debian/source/format: migrate to debian source format 3.0 (quilt).
* debian/control: sync with Debian's changes:
  - drop a bunch of old, unnecessary build dependencies.
  - keep in Build-Depends: libiw-dev, libxml-parser-perl, libnss3-dev,
    libappindicator-dev
  - add to Build-Depends: dh-autoreconf and libnm-glib-vpn-dev.
  - network-manager-gnome: specify package's Section as gnome.
  - network-manager-gnome: add policykt-1-gnome, gnome-icon-theme, dbus-x11
    to Depends.
  - network-manager-gnome: now Recommends gnome-bluetooth.
  - network-manager-gnome: add Suggests for the VPN plugins.
  - adjust network-manager-gnome long description to match Debian's.
  - bump Standards-Version to 3.9.2.
* debian/compat: bump to compat level 8.
* debian/copyright: sync with Debian's copyright file.
* debian/rules:
  - migrate to dh instead of CDBS.
  - use dh-autoreconf to reconfigure the build tree.
  - drop old dapper-to-intrepid and karmic-to-lucid workarounds for icon
    changes.
  - we switch to using png icons directly instead of uuencoded png files; so
    remove the uudecode parts that are no longer necessary.
  - don't empty aclocal.m4.
  - do some extra cleanup of files left behind by the build process.
  - drop configure parameters --with-mbca, --with-nss, --without-gnutls.
* debian/icons/22/*: replace uuencoded png icons by their original, decoded
  versions.
* debian/source/include-binaries: add .png icons to included-binaries.
* debian/network-manager-gnome.README.Debian: include Debian's README.Debian
  file for network-manager-gnome, minus the part about using the netdev user.
* debian/network-manager-gnome.docs: install NEWS from upstream.
* Fix the manpage so it actually gets installed:
  - Rename network-manager-applet.manpages to network-manager-gnome.manpages.
  - Sync nm-applet.sgml with the file from Debian.
* debian/patches/04-autostart.patch,
  debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch,
  debian/patches/lp295788_xfce_menu_entry.patch:
  Install the 04-autostart.patch patch, editing the .desktop files from
  Debian and adjust it to also replace OnlyShowIn with NotShowIn=KDE for
  nm-connection-editor. This renders the two other patches obsolete, so
  drop them. Also fixes (LP: #753300).
* debian/patches/0001-applet-fix-possibly-uninitialized-variable.patch:
  Include that patch from Debian which fixes a potential FTBFS.
  - This makes debian/patches/applet-dialog-uninited-method.patch obsolete.
* debian/patches/lp328572-dxteam-connect-text.patch: refreshed so it applies
  cleanly.
* debian/patches/lp330608_dxteam_gsm_connect_text.patch: refreshed so it
  applies cleanly.
* debian/patches/lp341684_device_sensitive_disconnect_notify.patch: refreshed
  so it applies cleanly.

66. By Mathieu Trudel-Lapierre on 2011-03-23

* upstream snapshot 2011-03-18 15:29:54 (GMT)
  + 9c4c9a0f689fa3920b7b083f04479fc094cdbec2
  - release: bump version to 0.8.3.998 (0.8.4-rc1)
  - gconf: fix accessing freed memory
  - applet: don't overwrite already-migrated certificate paths (rh #682288)
  - release: bump version to 0.8.3.997 (0.8.4-beta3)
  - eap: make DER certificate checking code endian-safe
  - Updated Polish translation
  - applet: update about dialog copyright to 2011
* debian/patches/nm-applet-use-indicator.patch,
  debian/patches/indicator-accessible-desc.patch,
  debian/patches/series:
  Fold in accessible descriptions in the general indicator patch.
* debian/patches/nm-applet-use-indicator.patch: rework patch for inclusion in
  nm-applet proper, following recommendations from Dan Williams.
* debian/patches/nm-applet-use-indicator.patch: don't escape underscores in
  SSIDs. (LP: #739490)
* debian/control: bump network-manager, libnm-glib2 and libnm-util1
  Build-Depends to 0.8.4~.
* debian/control: bump network-manager Depends to 0.8.4~.

65. By Mathieu Trudel-Lapierre on 2011-03-04

* upstream snapshot 2011-02-28 14:14:30 (GMT)
  + abba62fe1c22422bb84f12875fd3612b90ead434
  - editor: fix usage of nm_connection_update_secrets() (LP: #721071)
  - release: bump version to 0.8.3.996 (0.8.4-beta2)
  - mobile: fix path to GtkBuilder file
  - applet: blacklist "Free Public Wifi" (LP: #659461)
  - applet: consolidate manufacturer default SSID lists
  - release: bump version to 0.8.3.995 (0.8.4-beta1)
  - release: update NEWS with changes since 0.8.2
  - editor: remove unused argument from CEPage 'initialized' signal
  - bluetooth: don't create empty plugin dirs when disabled (bgo #641300)
  - Updated Polish translation
* debian/patches/nm-applet-use-indicator.patch: Further update indicator
  patch to fix memory leaks in get_best_icon_name_for_ap(). (LP: #724554)
* debian/patches/nm-applet-use-indicator.patch: Set indicator icon for mobile
  according to the connection's current signal strength (LP: #726669)
* debian/patches/indicator-accessible-desc.patch: provide accessible
  descriptions for the various icons and devices states for NetworkManager
  (LP: #719736)

64. By Mathieu Trudel-Lapierre on 2011-02-15

* upstream snapshot 2011-02-03 00:33:54 (GMT)
  + 9bf0b98073bee4905bb00b4658d8fd78c84a831f
* debian/control: Drop the mobile-broadband-provider-info dependency to a
  Recommends. (LP: #582404)
* debian/patches/nm-applet-use-indicator.patch: revert Flight Mode, it's
  confusing users and not accurate; plus doesn't allow re-enabling just wifi
  from flight mode (when flights allow wifi, for instance)
  (LP: #704295, #712122)
* debian/patches/nm-applet-use-indicator.patch: disconnect a VPN connection
  when it's activated and its GtkCheckMenuItem is clicked. (LP: #701004)
* debian/patches/applet-wifi-menu-before-vpn.patch: move Connect to Hidden,
  Create New wireless items below the VPN submenu.
* debian/control: bump Standards-Version to 3.9.1.
* debian/control: move Homepage to its own field.

63. By Mathieu Trudel-Lapierre on 2011-01-28

debian/patches/nm-applet-use-indicator.patch: do not add the About menu
item.

62. By Mathieu Trudel-Lapierre on 2011-01-27

debian/patches/nm-applet-use-indicator.patch: Unbreak CDMA modems: the piece
of code added to workaround mobile disable not working shows CDMA as always
disabled. (LP: #705196)