Merge lp://staging/~awe/network-manager/update-1.2-touch into lp://staging/~phablet-team/network-manager/touch-1.2
Proposed by
Tony Espy
| Status: | Merged |
|---|---|
| Merged at revision: | 1036 |
| Proposed branch: | lp://staging/~awe/network-manager/update-1.2-touch |
| Merge into: | lp://staging/~phablet-team/network-manager/touch-1.2 |
| Diff against target: |
944 lines (+337/-207) 15 files modified
debian/changelog (+34/-6) debian/control (+1/-1) debian/indicator-network.pkla (+6/-0) debian/libnm-dev.install (+2/-1) debian/network-manager.install (+1/-2) debian/network-manager.upstart (+24/-0) debian/patches/clear-requested-scan-when-supplicant-goes-down.patch (+31/-0) debian/patches/dbus-conf-add-sudo-for-indicator-network.patch (+30/-0) debian/patches/ignore_rild_modem_devices.patch (+15/-13) debian/patches/lp1099983_ignore-p2p-wifi-devices.patch (+18/-17) debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch (+52/-50) debian/patches/series (+4/-1) debian/patches/wifi-wpas-inactive.patch (+30/-0) debian/patches/wwan-add-ofono-modem-support.patch (+67/-105) debian/rules (+22/-11) |
| To merge this branch: | bzr merge lp://staging/~awe/network-manager/update-1.2-touch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Description of the change
This merge proposal backports the recent desktop/xenial landing of NM 1.2 to vivid for use on Touch.
Differences include:
* bluez5 explicitly disabled ( DUN ! supported on Touch yet )
* ppp disabled ( 2.4.7 needs to be backported )
* systemd logging disabled
* updates to ignore_device patches ( rild & p2p )
* updates to wwan plugin NMModemOfono and NMModemManager classes
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
