Merge lp://staging/~cyphermox/ubuntu/natty/ofono/merge-683302 into lp://staging/ubuntu/natty/ofono

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 15
Proposed branch: lp://staging/~cyphermox/ubuntu/natty/ofono/merge-683302
Merge into: lp://staging/ubuntu/natty/ofono
Diff against target: 56196 lines (+30809/-10282)
328 files modified
.pc/01-check-that-modem-name-is-valid.patch/src/modem.c (+0/-1541)
.pc/applied-patches (+0/-1)
AUTHORS (+9/-0)
ChangeLog (+139/-0)
Makefile.am (+129/-57)
Makefile.in (+450/-175)
TODO (+180/-241)
configure (+330/-473)
configure.ac (+53/-31)
debian/README.source (+59/-0)
debian/changelog (+33/-0)
debian/control (+8/-2)
debian/gbp.conf (+8/-0)
debian/ofono.install (+2/-1)
debian/patches/0001-doc-ofonod.8-escape-minus-sign.patch (+25/-0)
debian/patches/01-check-that-modem-name-is-valid.patch (+8/-8)
debian/patches/series (+0/-1)
debian/rules (+10/-3)
debian/source/format (+1/-1)
debian/update-patches.mk (+10/-0)
debian/watch (+3/-1)
doc/audio-settings-api.txt (+33/-0)
doc/call-barring-api.txt (+66/-0)
doc/call-forwarding-api.txt (+9/-5)
doc/call-settings-api.txt (+3/-3)
doc/call-volume-api.txt (+42/-0)
doc/cell-broadcast-api.txt (+71/-0)
doc/connman-api.txt (+241/-0)
doc/dataconnectionmanager-api.txt (+0/-178)
doc/features.txt (+218/-0)
doc/manager-api.txt (+20/-12)
doc/message-api.txt (+115/-0)
doc/message-waiting-api.txt (+48/-0)
doc/modem-api.txt (+7/-1)
doc/network-api.txt (+15/-12)
doc/ofono-paper.txt (+2/-2)
doc/phonebook-api.txt (+18/-0)
doc/pushnotification-api.txt (+37/-0)
doc/radio-settings-api.txt (+88/-0)
doc/sim-api.txt (+147/-0)
doc/smartmessaging-api.txt (+63/-0)
doc/stk-api.txt (+263/-0)
doc/supplementaryservices-api.txt (+106/-3)
doc/voicecall-api.txt (+19/-0)
doc/voicecallmanager-api.txt (+44/-34)
drivers/atmodem/atutil.c (+97/-0)
drivers/atmodem/atutil.h (+25/-0)
drivers/atmodem/call-barring.c (+8/-7)
drivers/atmodem/call-forwarding.c (+7/-5)
drivers/atmodem/call-meter.c (+12/-14)
drivers/atmodem/call-settings.c (+64/-14)
drivers/atmodem/call-volume.c (+7/-8)
drivers/atmodem/cbs.c (+11/-6)
drivers/atmodem/devinfo.c (+9/-9)
drivers/atmodem/gprs-context.c (+43/-5)
drivers/atmodem/gprs.c (+60/-11)
drivers/atmodem/network-registration.c (+254/-27)
drivers/atmodem/phonebook.c (+123/-93)
drivers/atmodem/sim-poll.c (+2/-2)
drivers/atmodem/sim.c (+103/-72)
drivers/atmodem/sms.c (+23/-15)
drivers/atmodem/ssn.c (+6/-0)
drivers/atmodem/stk.c (+5/-8)
drivers/atmodem/ussd.c (+191/-94)
drivers/atmodem/vendor.h (+3/-0)
drivers/atmodem/voicecall.c (+87/-29)
drivers/calypsomodem/calypsomodem.c (+2/-0)
drivers/calypsomodem/calypsomodem.h (+3/-0)
drivers/calypsomodem/stk.c (+311/-0)
drivers/calypsomodem/voicecall.c (+22/-9)
drivers/hfpmodem/call-volume.c (+2/-4)
drivers/hfpmodem/network-registration.c (+2/-4)
drivers/hfpmodem/voicecall.c (+6/-10)
drivers/hsomodem/gprs-context.c (+13/-13)
drivers/hsomodem/radio-settings.c (+29/-24)
drivers/huaweimodem/audio-settings.c (+130/-0)
drivers/huaweimodem/gprs-context.c (+417/-0)
drivers/huaweimodem/huaweimodem.c (+53/-0)
drivers/huaweimodem/huaweimodem.h (+31/-0)
drivers/huaweimodem/voicecall.c (+519/-0)
drivers/ifxmodem/audio-settings.c (+156/-0)
drivers/ifxmodem/gprs-context.c (+500/-0)
drivers/ifxmodem/ifxmodem.c (+57/-0)
drivers/ifxmodem/ifxmodem.h (+37/-0)
drivers/ifxmodem/radio-settings.c (+215/-0)
drivers/ifxmodem/stk.c (+317/-0)
drivers/ifxmodem/voicecall.c (+788/-0)
drivers/isimodem/audio-settings.c (+153/-0)
drivers/isimodem/call-barring.c (+34/-23)
drivers/isimodem/call-forwarding.c (+22/-23)
drivers/isimodem/call-meter.c (+17/-17)
drivers/isimodem/call-settings.c (+19/-19)
drivers/isimodem/call.h (+17/-17)
drivers/isimodem/cbs.c (+29/-21)
drivers/isimodem/debug.c (+55/-17)
drivers/isimodem/debug.h (+20/-17)
drivers/isimodem/devinfo.c (+20/-20)
drivers/isimodem/gpds.h (+34/-16)
drivers/isimodem/gprs-context.c (+173/-195)
drivers/isimodem/gprs.c (+121/-53)
drivers/isimodem/gss.h (+17/-17)
drivers/isimodem/info.h (+17/-17)
drivers/isimodem/infoserver.c (+17/-17)
drivers/isimodem/infoserver.h (+18/-16)
drivers/isimodem/isimodem.c (+19/-418)
drivers/isimodem/isimodem.h (+20/-17)
drivers/isimodem/isiutil.h (+17/-18)
drivers/isimodem/mtc.h (+18/-17)
drivers/isimodem/network-registration.c (+23/-25)
drivers/isimodem/network.h (+17/-17)
drivers/isimodem/phonebook.c (+24/-24)
drivers/isimodem/radio-settings.c (+113/-22)
drivers/isimodem/sim.c (+30/-24)
drivers/isimodem/sim.h (+17/-17)
drivers/isimodem/sms.c (+135/-88)
drivers/isimodem/sms.h (+17/-17)
drivers/isimodem/ss.h (+17/-19)
drivers/isimodem/ssn.c (+23/-23)
drivers/isimodem/ussd.c (+109/-116)
drivers/isimodem/voicecall.c (+60/-48)
drivers/mbmmodem/gprs-context.c (+52/-14)
drivers/mbmmodem/stk.c (+73/-37)
drivers/nwmodem/radio-settings.c (+29/-24)
drivers/stemodem/caif_rtnl.c (+346/-0)
drivers/stemodem/caif_rtnl.h (+30/-0)
drivers/stemodem/caif_socket.h (+129/-90)
drivers/stemodem/gprs-context.c (+41/-78)
drivers/stemodem/if_caif.h (+8/-44)
drivers/stemodem/radio-settings.c (+230/-0)
drivers/stemodem/stemodem.c (+2/-0)
drivers/stemodem/stemodem.h (+2/-0)
drivers/stemodem/voicecall.c (+26/-17)
examples/history.c (+204/-0)
examples/nettime.c (+84/-0)
gatchat/gatchat.c (+545/-261)
gatchat/gatchat.h (+5/-0)
gatchat/gathdlc.c (+0/-1)
gatchat/gatio.c (+3/-0)
gatchat/gatmux.c (+52/-30)
gatchat/gatppp.c (+1/-1)
gatchat/gatrawip.c (+261/-0)
gatchat/gatrawip.h (+54/-0)
gatchat/gatsyntax.c (+19/-1)
gatchat/gatutil.c (+1/-1)
gatchat/gsmdial.c (+1/-1)
gatchat/ppp_net.c (+17/-17)
gatchat/test-server.c (+1/-1)
gdbus/gdbus.h (+36/-1)
gdbus/mainloop.c (+4/-0)
gdbus/object.c (+207/-23)
gdbus/polkit.c (+202/-0)
gdbus/watch.c (+174/-59)
gisi/client.c (+382/-138)
gisi/client.h (+55/-18)
gisi/iter.c (+17/-19)
gisi/iter.h (+17/-19)
gisi/modem.c (+19/-16)
gisi/modem.h (+18/-17)
gisi/netlink.c (+17/-93)
gisi/netlink.h (+17/-20)
gisi/pep.c (+21/-21)
gisi/pep.h (+17/-19)
gisi/phonet.h (+20/-18)
gisi/pipe.c (+17/-19)
gisi/pipe.h (+17/-19)
gisi/server.c (+18/-18)
gisi/server.h (+17/-17)
gisi/socket.c (+17/-19)
gisi/socket.h (+17/-19)
gisi/verify.c (+95/-34)
include/audio-settings.h (+63/-0)
include/dbus.h (+5/-3)
include/gprs-context.h (+11/-0)
include/gprs.h (+10/-0)
include/history.h (+7/-3)
include/modem.h (+4/-2)
include/radio-settings.h (+13/-0)
include/sim.h (+9/-4)
include/stk.h (+4/-0)
include/types.h (+8/-0)
include/ussd.h (+6/-3)
include/voicecall.h (+47/-2)
plugins/atgen.c (+0/-226)
plugins/bluetooth.c (+2/-1)
plugins/bluetooth.h (+3/-0)
plugins/calypso.c (+132/-53)
plugins/example_history.c (+0/-201)
plugins/example_nettime.c (+0/-84)
plugins/g1.c (+7/-4)
plugins/hfp.c (+11/-8)
plugins/hso.c (+52/-4)
plugins/huawei.c (+345/-58)
plugins/ifx.c (+783/-0)
plugins/isigen.c (+477/-0)
plugins/mbm.c (+209/-27)
plugins/modem.conf (+0/-46)
plugins/modemconf.c (+0/-232)
plugins/n900.c (+568/-0)
plugins/nokia-gpio.c (+817/-0)
plugins/nokia-gpio.h (+40/-0)
plugins/nokia.c (+289/-0)
plugins/novatel.c (+45/-8)
plugins/ofono.rules (+56/-5)
plugins/palmpre.c (+4/-2)
plugins/phonesim.c (+312/-16)
plugins/phonesim.conf (+14/-0)
plugins/push-notification.c (+234/-0)
plugins/smart-messaging.c (+368/-0)
plugins/ste.c (+130/-12)
plugins/udev.c (+222/-33)
plugins/usbpnmodem.c (+0/-104)
plugins/wavecom.c (+4/-2)
plugins/zte.c (+334/-0)
src/audio-settings.c (+252/-0)
src/call-barring.c (+19/-11)
src/call-forwarding.c (+24/-11)
src/call-meter.c (+6/-4)
src/call-settings.c (+37/-25)
src/cbs.c (+29/-10)
src/common.c (+63/-44)
src/common.h (+1/-1)
src/dbus.c (+29/-17)
src/gprs.c (+915/-309)
src/history.c (+13/-11)
src/log.c (+51/-0)
src/main.c (+19/-1)
src/manager.c (+42/-24)
src/message-waiting.c (+13/-7)
src/modem.c (+277/-144)
src/nettime.c (+1/-1)
src/network.c (+364/-370)
src/ofono.conf (+3/-0)
src/ofono.h (+137/-13)
src/ofono.service.in (+11/-0)
src/ofono.ver (+7/-0)
src/phonebook.c (+9/-8)
src/plugin.c (+30/-11)
src/radio-settings.c (+155/-38)
src/sim.c (+749/-631)
src/simfs.c (+946/-0)
src/simfs.h (+50/-0)
src/simutil.c (+64/-13)
src/simutil.h (+179/-1)
src/sms.c (+785/-154)
src/smsagent.c (+316/-0)
src/smsagent.h (+52/-0)
src/smsutil.c (+560/-96)
src/smsutil.h (+17/-11)
src/ssn.c (+4/-4)
src/stk.c (+1360/-118)
src/stkagent.c (+560/-34)
src/stkagent.h (+61/-3)
src/stkutil.c (+58/-20)
src/stkutil.h (+44/-7)
src/storage.c (+37/-12)
src/ussd.c (+230/-42)
src/util.c (+133/-18)
src/util.h (+21/-8)
src/voicecall.c (+912/-345)
test/activate-context (+16/-18)
test/answer-calls (+33/-0)
test/backtrace (+57/-0)
test/cancel-ussd (+24/-0)
test/create-context (+0/-41)
test/create-internet-context (+47/-0)
test/create-mms-context (+47/-0)
test/create-multiparty (+21/-0)
test/deactivate-all (+20/-0)
test/deactivate-context (+15/-17)
test/dial-number (+2/-2)
test/disable-gprs (+20/-0)
test/disable-modem (+2/-2)
test/enable-cbs (+2/-2)
test/enable-gprs (+20/-0)
test/enable-modem (+2/-2)
test/enter-pin (+4/-4)
test/get-icon (+31/-0)
test/get-operators (+37/-0)
test/get-tech-preference (+2/-2)
test/hangup-active (+23/-0)
test/hangup-all (+2/-3)
test/initiate-ussd (+52/-0)
test/list-calls (+30/-0)
test/list-contexts (+11/-21)
test/list-modems (+14/-16)
test/list-operators (+11/-17)
test/lock-pin (+27/-0)
test/monitor-ofono (+159/-15)
test/offline-modem (+2/-2)
test/online-modem (+2/-2)
test/private-chat (+20/-0)
test/process-context-settings (+15/-21)
test/propose-scan (+0/-40)
test/remove-contexts (+11/-16)
test/reset-pin (+23/-0)
test/scan-for-operators (+38/-0)
test/send-sms (+7/-6)
test/send-vcard (+20/-0)
test/set-cbs-topics (+4/-4)
test/set-fast-dormancy (+25/-0)
test/set-mic-volume (+2/-3)
test/set-mms-details (+43/-0)
test/set-roaming-allowed (+27/-0)
test/set-speaker-volume (+2/-3)
test/set-tech-preference (+4/-4)
test/set-use-sms-reports (+5/-5)
test/simple-agent (+0/-99)
test/test-advice-of-charge (+2/-2)
test/test-call-barring (+2/-2)
test/test-call-forwarding (+2/-5)
test/test-call-settings (+2/-2)
test/test-manager (+0/-28)
test/test-modem (+2/-4)
test/test-network-registration (+2/-22)
test/test-phonebook (+2/-6)
test/test-push-notification (+47/-0)
test/test-smart-messaging (+65/-0)
test/test-ss-control-cb (+2/-5)
test/test-ss-control-cf (+3/-6)
test/test-ss-control-cs (+2/-5)
test/test-stk-menu (+179/-0)
test/test-ussd (+21/-6)
test/test-voicecall (+34/-32)
test/unlock-pin (+27/-0)
tools/huawei-audio.c (+837/-0)
unit/test-sms.c (+234/-119)
unit/test-stkutil.c (+17/-17)
unit/test-util.c (+95/-6)
To merge this branch: bzr merge lp://staging/~cyphermox/ubuntu/natty/ofono/merge-683302
Reviewer Review Type Date Requested Status
Micah Gersten Needs Fixing
Review via email: mp+42298@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Thanks for working on this?

Curious, you bump debhelper to 7.0.50~ for override support, but the override is removed in the merge?

Also, bumping debian/compat would probably depend on whether or not you keep the above change.

review: Needs Fixing
Revision history for this message
Micah Gersten (micahg) wrote :

Sorry, that should have read:
Thanks for working on this! :)

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Hi Micah,

Sorry, the change was indeed kept, but I forgot to add it to remaining changes. See additional commit.

14. By Mathieu Trudel-Lapierre

Re-add lintian override that was forgotten in previous commits:
Override lintian to avoid script-in-etc-init.d... warnings.

15. By Mathieu Trudel-Lapierre

Re-add missing override_dh_strip target that was omitted in previous commits.

Revision history for this message
Micah Gersten (micahg) wrote :

I fixed up a few things before uploading:
Removed .pc dir (left over from the source format 1.0 reversion)
Add notices to changelog for:
 * dh_strip override
 * preinst script (needs to be kept until next LTS)
* Removed duplicate lintian override notice

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