Merge lp://staging/~ken-vandine/ubuntu/wily/libqofono/ofono_1.16 into lp://staging/ubuntu/wily/libqofono

Proposed by Ken VanDine
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp://staging/~ken-vandine/ubuntu/wily/libqofono/ofono_1.16
Merge into: lp://staging/ubuntu/wily/libqofono
Diff against target: 3126 lines (+40/-2640)
41 files modified
.pc/applied-patches (+0/-4)
.pc/connman-resetcontexts.patch/src/dbus/ofono_connection_manager.xml (+0/-38)
.pc/connman-resetcontexts.patch/src/qofonoconnectionmanager.cpp (+0/-317)
.pc/connman-resetcontexts.patch/src/qofonoconnectionmanager.h (+0/-100)
.pc/connman-resetcontexts.patch/test/auto/tests/tst_qofonoconnman.cpp (+0/-119)
.pc/context-preferred.patch/src/qofonoconnectioncontext.cpp (+0/-548)
.pc/context-preferred.patch/src/qofonoconnectioncontext.h (+0/-138)
.pc/context-preferred.patch/test/auto/tests/tst_qofonoconnmancontext.cpp (+0/-184)
.pc/expose_modem_tech.patch/src/qofonoradiosettings.cpp (+0/-102)
.pc/expose_modem_tech.patch/src/qofonoradiosettings.h (+0/-69)
.pc/mtk_settings_binding.patch/plugin/qofonodeclarativeplugin.cpp (+0/-128)
.pc/mtk_settings_binding.patch/src/src.pro (+0/-337)
.pc/mtk_settings_binding.patch/test/auto/tests/tests.pro (+0/-24)
debian/changelog (+10/-0)
debian/control (+1/-1)
debian/patches/expose_modem_tech.patch (+0/-60)
debian/patches/series (+0/-1)
plugin/qofonodeclarativeplugin.cpp (+0/-2)
rpm/libqofono-qt5.spec (+1/-1)
src/dbus/ofono_connection_manager.xml (+0/-1)
src/dbus/ofono_mtk_settings.xml (+0/-18)
src/dbus/ofonomtksettings.cpp (+0/-26)
src/dbus/ofonomtksettings.h (+0/-56)
src/qofonoconnectioncontext.cpp (+0/-12)
src/qofonoconnectioncontext.h (+0/-5)
src/qofonoconnectionmanager.cpp (+0/-15)
src/qofonoconnectionmanager.h (+0/-1)
src/qofonomanager.cpp (+10/-15)
src/qofonomtksettings.cpp (+0/-121)
src/qofonomtksettings.h (+0/-61)
src/qofonoradiosettings.cpp (+4/-4)
src/qofonoradiosettings.h (+3/-3)
src/qofonosupplementaryservices.cpp (+6/-1)
src/src.pro (+0/-8)
src/version.pri (+1/-1)
test/auto/tests/tests.pro (+0/-1)
test/auto/tests/tst_qofonoconnman.cpp (+0/-37)
test/auto/tests/tst_qofonoconnmancontext.cpp (+0/-10)
test/auto/tests/tst_qofonomtksettings.cpp (+0/-61)
test/auto/tests/tst_qofonomtksettings.pro (+0/-2)
test/auto/tests/tst_qofonosimmanager.cpp (+4/-8)
To merge this branch: bzr merge lp://staging/~ken-vandine/ubuntu/wily/libqofono/ofono_1.16
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+270768@code.staging.launchpad.net

Commit message

  * New upstream release.
  * -debian/patches/expose_modem_tech.patch
    - Dropped, upstream now provides availableTechnologies
  * debian/control
    - Bumped ofono depends to 1.16 for availableTechnologies

Description of the change

  * New upstream release.
  * -debian/patches/expose_modem_tech.patch
    - Dropped, upstream now provides availableTechnologies
  * debian/control
    - Bumped ofono depends to 1.16 for availableTechnologies

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: