Merge ~awe/network-manager/+git/ubuntu:touch-vivid2 into network-manager:touch-vivid
| Status: | Merged |
|---|---|
| Approved by: | Mathieu Trudel-Lapierre |
| Approved revision: | 418ce9b8e301bd50592edade23d7ff062cdb4412 |
| Merged at revision: | 832d695d64c3d9fe37fd410e80da0723dc43b0e9 |
| Proposed branch: | ~awe/network-manager/+git/ubuntu:touch-vivid2 |
| Merge into: | network-manager:touch-vivid |
| Diff against target: |
1538 lines (+832/-167) 24 files modified
debian/changelog (+22/-0) debian/control (+19/-1) debian/default-wifi-powersave-on.conf (+2/-0) debian/indicator-network.pkla (+6/-0) debian/libnm-dev.install (+1/-1) debian/network-manager.install (+1/-1) debian/patches/Add-modem-reconnect-delay-to-policy.patch (+115/-0) debian/patches/Add-new-NMSettingsConnection-reset_retries-get-set-m.patch (+1/-1) debian/patches/Add-sudo-policy-to-DBus-conf-for-indicator-network.patch (+32/-0) debian/patches/Clear-WiFi-requested_scan-if-suppl-exits.patch (+38/-0) debian/patches/Clear-WiFi-requested_scan-if-suppl-goes-INACTIVE.patch (+37/-0) debian/patches/Filter-DNS-servers-to-add-to-dnsmasq-based-on-availa.patch (+1/-0) debian/patches/Fix-openvpn-by-handling-do_add_route-EEXISTS.patch (+32/-0) debian/patches/Ignore-p2p-wifi-devices-from-android.patch (+34/-0) debian/patches/Ignore-rild-modem-devices.patch (+27/-0) debian/patches/Modify-NMDeviceModem-s-available-logic.patch (+4/-4) debian/patches/Order-IPv6-nameservers-before-IPv4-for-dns-plugins-d.patch (+2/-0) debian/patches/Track-killswitch-change-signals-from-urfkill.patch (+4/-4) debian/patches/Update-dnsmasq-parameters.patch (+1/-1) debian/patches/series (+8/-3) debian/patches/wwan-add-support-for-using-oFono-as-a-modem-manager.patch (+74/-89) debian/patches/wwan-fix-ofono-connection-problems.patch (+343/-0) debian/rules (+28/-11) dev/null (+0/-51) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Simon Fels | Approve | ||
|
Review via email:
|
|||
Description of the change
This merge proposal is a backport of the stable 1.2.2 version of NetworkManager from yakkety to Touch, intended for the Touch overlay PPA.
Changes include ( besides switching to git ):
- Dropping default WiFi powersave patch and installing a config file to do the same
- Syncing the Touch NMManager device patches
- Syncing the Touch WWAN patches
- Adding a few Touch wpa_supplicant & platform patches
- Restoring bug headers in some of the patches
- Disabling ppp and gir in the build, due to build errors on vivid. This should have no impact on our images, and will be fixed when we move to xenial.
- Adding a final patch to deal with ofono connection edge cases, and a mobile-data re-connect hang.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
LGTM