ofono should conflict with modem-manager
Bug #688472 reported by
Kalle Valo
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| ofono (Ubuntu) |
Fix Released
|
Medium
|
Mathieu Trudel-Lapierre | ||
Bug Description
Binary package hint: ofono
As both ofono and modem-manager access data modems there will be huge problems if both are installed at the same. To avoid this ofono should conflict with modem-manager.
Related branches
lp:~cyphermox/ubuntu/natty/ofono/release-0.41
- Martin Pitt: Approve
- Evan Broder (community): Needs Fixing
-
Diff: 50944 lines (+21877/-10758)296 files modifiedAUTHORS (+15/-0)
ChangeLog (+65/-0)
Makefile.am (+114/-54)
Makefile.in (+409/-209)
README (+7/-0)
TODO (+301/-152)
acinclude.m4 (+1/-0)
configure (+314/-132)
configure.ac (+35/-13)
debian/changelog (+20/-0)
debian/control (+2/-0)
debian/ofono.postinst (+11/-0)
debian/patches/02-dont-handle-stacktraces.patch (+80/-0)
debian/rules (+2/-3)
doc/call-forwarding-api.txt (+5/-0)
doc/call-settings-api.txt (+29/-1)
doc/calypso-modem.txt (+22/-0)
doc/connman-api.txt (+10/-0)
doc/features.txt (+352/-0)
doc/message-api.txt (+0/-89)
doc/messagemanager-api.txt (+88/-0)
doc/modem-api.txt (+9/-0)
doc/network-api.txt (+17/-24)
doc/overview.txt (+21/-6)
doc/pushnotification-api.txt (+1/-1)
doc/radio-settings-api.txt (+47/-0)
doc/release-faq.txt (+42/-0)
doc/sim-api.txt (+14/-2)
doc/smartmessaging-api.txt (+2/-2)
doc/stk-api.txt (+21/-4)
doc/supplementaryservices-api.txt (+2/-2)
doc/text-telephony-api.txt (+39/-0)
doc/voicecall-api.txt (+20/-0)
doc/voicecallmanager-api.txt (+18/-6)
drivers/atmodem/atmodem.c (+2/-0)
drivers/atmodem/atmodem.h (+53/-50)
drivers/atmodem/atutil.c (+66/-6)
drivers/atmodem/atutil.h (+4/-5)
drivers/atmodem/call-barring.c (+5/-5)
drivers/atmodem/call-forwarding.c (+2/-10)
drivers/atmodem/call-meter.c (+2/-30)
drivers/atmodem/call-settings.c (+86/-86)
drivers/atmodem/call-volume.c (+2/-10)
drivers/atmodem/cbs.c (+10/-13)
drivers/atmodem/devinfo.c (+7/-55)
drivers/atmodem/gprs-context.c (+3/-3)
drivers/atmodem/gprs.c (+35/-12)
drivers/atmodem/network-registration.c (+131/-89)
drivers/atmodem/phonebook.c (+4/-8)
drivers/atmodem/sim-auth.c (+163/-0)
drivers/atmodem/sim-poll.c (+1/-1)
drivers/atmodem/sim.c (+250/-47)
drivers/atmodem/sms.c (+35/-37)
drivers/atmodem/ssn.c (+2/-2)
drivers/atmodem/stk.c (+4/-4)
drivers/atmodem/ussd.c (+14/-12)
drivers/atmodem/vendor.h (+2/-0)
drivers/atmodem/voicecall.c (+207/-68)
drivers/calypsomodem/calypsomodem.h (+4/-4)
drivers/calypsomodem/stk.c (+5/-5)
drivers/calypsomodem/voicecall.c (+6/-17)
drivers/cdmamodem/cdmamodem.c (+50/-0)
drivers/cdmamodem/cdmamodem.h (+27/-0)
drivers/cdmamodem/devinfo.c (+172/-0)
drivers/cdmamodem/voicecall.c (+162/-0)
drivers/hfpmodem/call-volume.c (+2/-10)
drivers/hfpmodem/hfpmodem.h (+8/-8)
drivers/hfpmodem/network-registration.c (+4/-14)
drivers/hfpmodem/voicecall.c (+30/-33)
drivers/hsomodem/gprs-context.c (+2/-9)
drivers/hsomodem/hsomodem.h (+4/-4)
drivers/hsomodem/radio-settings.c (+5/-3)
drivers/huaweimodem/audio-settings.c (+3/-3)
drivers/huaweimodem/gprs-context.c (+3/-11)
drivers/huaweimodem/huaweimodem.c (+2/-0)
drivers/huaweimodem/huaweimodem.h (+11/-8)
drivers/huaweimodem/radio-settings.c (+415/-0)
drivers/huaweimodem/voicecall.c (+20/-27)
drivers/ifxmodem/audio-settings.c (+3/-3)
drivers/ifxmodem/ctm.c (+186/-0)
drivers/ifxmodem/gprs-context.c (+6/-6)
drivers/ifxmodem/ifxmodem.c (+2/-0)
drivers/ifxmodem/ifxmodem.h (+17/-14)
drivers/ifxmodem/radio-settings.c (+3/-3)
drivers/ifxmodem/stk.c (+10/-11)
drivers/ifxmodem/voicecall.c (+40/-50)
drivers/isimodem/audio-settings.c (+45/-66)
drivers/isimodem/call-barring.c (+121/-165)
drivers/isimodem/call-forwarding.c (+243/-339)
drivers/isimodem/call-meter.c (+23/-17)
drivers/isimodem/call-settings.c (+130/-181)
drivers/isimodem/call.h (+339/-339)
drivers/isimodem/cbs.c (+101/-77)
drivers/isimodem/debug.c (+49/-60)
drivers/isimodem/debug.h (+3/-9)
drivers/isimodem/devinfo.c (+85/-113)
drivers/isimodem/gpds.h (+32/-1)
drivers/isimodem/gprs-context.c (+170/-220)
drivers/isimodem/gprs.c (+308/-188)
drivers/isimodem/gss.h (+11/-11)
drivers/isimodem/info.h (+30/-23)
drivers/isimodem/infoserver.c (+78/-58)
drivers/isimodem/isimodem.h (+50/-52)
drivers/isimodem/isiutil.h (+7/-0)
drivers/isimodem/mtc.h (+49/-49)
drivers/isimodem/network-registration.c (+450/-571)
drivers/isimodem/network.h (+130/-130)
drivers/isimodem/phonebook.c (+163/-168)
drivers/isimodem/radio-settings.c (+140/-169)
drivers/isimodem/sim.c (+204/-203)
drivers/isimodem/sim.h (+111/-109)
drivers/isimodem/sms.c (+443/-345)
drivers/isimodem/sms.h (+1/-0)
drivers/isimodem/ss.h (+6/-6)
drivers/isimodem/ssn.c (+20/-17)
drivers/isimodem/ussd.c (+89/-102)
drivers/isimodem/voicecall.c (+836/-821)
drivers/mbmmodem/gprs-context.c (+3/-10)
drivers/mbmmodem/mbmmodem.h (+4/-4)
drivers/mbmmodem/stk.c (+5/-5)
drivers/nwmodem/nwmodem.h (+2/-2)
drivers/nwmodem/radio-settings.c (+3/-3)
drivers/stemodem/caif_rtnl.c (+1/-1)
drivers/stemodem/gprs-context.c (+127/-92)
drivers/stemodem/radio-settings.c (+17/-5)
drivers/stemodem/stemodem.h (+8/-8)
drivers/stemodem/voicecall.c (+76/-66)
examples/history.c (+7/-0)
examples/nettime.c (+2/-2)
examples/provision.c (+99/-0)
gatchat/gatchat.c (+25/-29)
gatchat/gathdlc.c (+4/-4)
gatchat/gatio.c (+13/-11)
gatchat/gatmux.c (+7/-3)
gatchat/gatppp.c (+2/-2)
gatchat/gatrawip.c (+0/-2)
gatchat/gatresult.c (+22/-22)
gatchat/gatserver.c (+18/-8)
gatchat/gatsyntax.c (+2/-2)
gatchat/gatsyntax.h (+2/-2)
gatchat/gatutil.c (+7/-6)
gatchat/gsmdial.c (+3/-3)
gatchat/ppp_auth.c (+3/-3)
gatchat/ppp_cp.c (+2/-2)
gatchat/ppp_ipcp.c (+2/-2)
gatchat/ppp_lcp.c (+3/-3)
gatchat/ringbuffer.c (+7/-7)
gatchat/test-qcdm.c (+3/-3)
gatchat/test-server.c (+11/-11)
gdbus/gdbus.h (+1/-1)
gdbus/mainloop.c (+1/-1)
gdbus/object.c (+18/-17)
gdbus/polkit.c (+2/-2)
gdbus/watch.c (+16/-17)
gisi/client.c (+131/-816)
gisi/client.h (+36/-78)
gisi/common.h (+57/-0)
gisi/iter.c (+68/-13)
gisi/iter.h (+14/-9)
gisi/message.c (+157/-0)
gisi/message.h (+73/-0)
gisi/modem.c (+1156/-9)
gisi/modem.h (+85/-9)
gisi/netlink.c (+62/-65)
gisi/netlink.h (+20/-23)
gisi/pep.c (+1/-1)
gisi/pep.h (+16/-1)
gisi/pipe.c (+151/-121)
gisi/pipe.h (+20/-4)
gisi/server.c (+73/-303)
gisi/server.h (+14/-28)
gisi/socket.c (+15/-19)
gisi/socket.h (+4/-6)
gisi/verify.c (+0/-166)
include/call-barring.h (+2/-2)
include/call-settings.h (+4/-0)
include/cdma-sms.h (+67/-0)
include/cdma-voicecall.h (+85/-0)
include/ctm.h (+66/-0)
include/dbus.h (+8/-1)
include/gprs-provision.h (+59/-0)
include/gprs.h (+1/-0)
include/modem.h (+2/-0)
include/netreg.h (+0/-2)
include/radio-settings.h (+39/-6)
include/sim-auth.h (+64/-0)
include/sim.h (+15/-4)
include/types.h (+15/-9)
include/voicecall.h (+4/-3)
ofono.pc.in (+13/-0)
plugins/bluetooth.c (+41/-28)
plugins/bluetooth.h (+1/-1)
plugins/calypso.c (+2/-2)
plugins/gobi.c (+327/-0)
plugins/hfp.c (+13/-13)
plugins/hso.c (+123/-18)
plugins/huawei.c (+47/-11)
plugins/ifx.c (+18/-26)
plugins/isigen.c (+0/-477)
plugins/isiusb.c (+471/-0)
plugins/mbm.c (+20/-14)
plugins/n900.c (+218/-222)
plugins/nokia-gpio.c (+10/-10)
plugins/nokia.c (+5/-5)
plugins/nokiacdma.c (+176/-0)
plugins/novatel.c (+34/-24)
plugins/ofono.rules (+22/-3)
plugins/palmpre.c (+5/-5)
plugins/phonesim.c (+181/-22)
plugins/push-notification.c (+22/-8)
plugins/sierra.c (+270/-0)
plugins/smart-messaging.c (+5/-4)
plugins/ste.c (+44/-23)
plugins/stemgr.c (+390/-0)
plugins/tc65.c (+247/-0)
plugins/udev.c (+117/-4)
plugins/wavecom.c (+4/-4)
plugins/zte.c (+9/-8)
src/audio-settings.c (+7/-10)
src/call-barring.c (+10/-10)
src/call-forwarding.c (+301/-19)
src/call-meter.c (+19/-18)
src/call-settings.c (+218/-66)
src/call-volume.c (+8/-10)
src/cbs.c (+25/-19)
src/cdma-voicecall.c (+423/-0)
src/common.c (+67/-3)
src/common.h (+76/-54)
src/ctm.c (+332/-0)
src/dbus.c (+23/-10)
src/gprs-provision.c (+101/-0)
src/gprs.c (+216/-22)
src/history.c (+1/-2)
src/main.c (+2/-2)
src/manager.c (+2/-2)
src/message-waiting.c (+39/-20)
src/message.c (+228/-0)
src/message.h (+54/-0)
src/modem.c (+255/-44)
src/nettime.c (+1/-2)
src/network.c (+92/-100)
src/ofono.h (+47/-30)
src/phonebook.c (+5/-7)
src/plugin.c (+1/-1)
src/radio-settings.c (+256/-12)
src/sim-auth.c (+134/-0)
src/sim.c (+189/-71)
src/simfs.c (+274/-112)
src/simfs.h (+11/-3)
src/simutil.c (+77/-11)
src/simutil.h (+227/-189)
src/sms.c (+232/-248)
src/smsagent.c (+6/-6)
src/smsutil.c (+331/-40)
src/smsutil.h (+33/-3)
src/stk.c (+318/-123)
src/stkagent.c (+128/-3)
src/stkagent.h (+11/-0)
src/stkutil.c (+135/-42)
src/stkutil.h (+1/-1)
src/ussd.c (+32/-33)
src/util.c (+265/-154)
src/util.h (+7/-1)
src/voicecall.c (+212/-73)
test/cdma-dial-number (+24/-0)
test/cdma-hangup (+20/-0)
test/cdma-list-call (+25/-0)
test/disable-call-forwarding (+53/-0)
test/enter-pin (+1/-0)
test/hangup-active (+10/-4)
test/list-messages (+30/-0)
test/list-modems (+7/-1)
test/lockdown-modem (+25/-0)
test/scan-for-operators (+1/-1)
test/set-call-forwarding (+64/-0)
test/set-gsm-band (+25/-0)
test/set-tty (+25/-0)
test/set-umts-band (+25/-0)
test/set-use-sms-reports (+4/-0)
test/test-call-barring (+12/-0)
test/test-call-settings (+4/-2)
test/test-network-registration (+1/-5)
test/test-push-notification (+6/-1)
test/test-smart-messaging (+6/-1)
test/test-sms (+231/-0)
test/test-ss-control-cs (+4/-1)
test/test-stk-menu (+100/-20)
tools/auto-enable.c (+562/-0)
unit/test-caif.c (+1/-1)
unit/test-common.c (+3/-3)
unit/test-idmap.c (+2/-2)
unit/test-mux.c (+5/-5)
unit/test-simutil.c (+41/-9)
unit/test-sms.c (+254/-13)
unit/test-stkutil.c (+23/-7)
unit/test-util.c (+10/-10)
| Changed in ofono (Ubuntu): | |
| assignee: | nobody → Kalle Valo (kvalo) |
| status: | New → In Progress |
| Changed in ofono (Ubuntu): | |
| importance: | Undecided → Medium |
Revision history for this message
| Kalle Valo (kvalo) wrote | #1 |
| Changed in ofono (Ubuntu): | |
| assignee: | Kalle Valo (kvalo) → Mathieu Trudel-Lapierre (mathieu-tl) |
Revision history for this message
| Launchpad Janitor (janitor) wrote | #2 |
| Changed in ofono (Ubuntu): | |
| status: | In Progress → Fix Released |
To post a comment you must log in.
This is what I did in the daily branch:
http://