Merge lp://qastaging/~cyphermox/ubuntu/natty/connman/0.69 into lp://qastaging/ubuntu/natty/connman

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 25
Proposed branch: lp://qastaging/~cyphermox/ubuntu/natty/connman/0.69
Merge into: lp://qastaging/ubuntu/natty/connman
Diff against target: 25752 lines (+11190/-7957)
127 files modified
AUTHORS (+4/-0)
ChangeLog (+44/-0)
Makefile.am (+20/-14)
Makefile.in (+277/-274)
Makefile.plugins (+42/-34)
README (+1/-16)
TODO (+6/-58)
acinclude.m4 (+1/-0)
configure (+211/-188)
configure.ac (+37/-26)
debian/changelog (+21/-0)
debian/control (+3/-2)
debian/manpages/connmand.8 (+10/-1)
debian/patches/04-wifi-add-a-disconnected-timer.patch (+58/-16)
debian/patches/09-disable-wifi-legacy.patch (+0/-38)
debian/patches/10-fix-dhcp-renewal-disconnect.patch (+172/-0)
debian/patches/series (+1/-1)
debian/rules (+3/-1)
doc/agent-api.txt (+30/-7)
doc/config-format.txt (+3/-1)
doc/counter-api.txt (+1/-1)
doc/ipconfig-api.txt (+1/-1)
doc/manager-api.txt (+0/-7)
doc/overview-api.txt (+11/-11)
doc/plugin-api.txt (+1/-1)
doc/service-api.txt (+12/-22)
doc/technology-api.txt (+23/-0)
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)
gdhcp/client.c (+322/-12)
gdhcp/common.c (+1/-0)
gdhcp/gdhcp.h (+4/-0)
gdhcp/ipv4ll.c (+139/-0)
gdhcp/ipv4ll.h (+55/-0)
gdhcp/server.c (+2/-2)
gsupplicant/dbus.c (+1/-3)
gsupplicant/gsupplicant.h (+34/-0)
gsupplicant/supplicant.c (+644/-33)
gweb/gresolv.c (+560/-93)
gweb/gweb.c (+199/-24)
gweb/gweb.h (+2/-0)
include/device.h (+2/-0)
include/dhcp.h (+0/-80)
include/inet.h (+9/-0)
include/ipconfig.h (+3/-20)
include/location.h (+3/-0)
include/network.h (+4/-3)
include/notifier.h (+1/-0)
include/ondemand.h (+0/-38)
include/provider.h (+10/-2)
include/proxy.h (+5/-0)
include/resolver.h (+2/-17)
include/service.h (+4/-0)
include/task.h (+1/-1)
include/technology.h (+6/-0)
plugins/bluetooth.c (+1/-0)
plugins/connman-nmcompat.conf (+14/-0)
plugins/dhcp.c (+0/-191)
plugins/dnsproxy.c (+0/-1371)
plugins/ethernet.c (+102/-0)
plugins/iospm.c (+1/-0)
plugins/iwmx.c (+1/-1)
plugins/mcc.h (+475/-0)
plugins/nmcompat.c (+282/-0)
plugins/ntpd.c (+2/-1)
plugins/ofono.c (+238/-65)
plugins/openconnect.c (+20/-7)
plugins/openvpn.c (+80/-56)
plugins/pacrunner.c (+163/-0)
plugins/portal.c (+45/-11)
plugins/supplicant.c (+0/-2692)
plugins/supplicant.h (+0/-41)
plugins/vpn.c (+16/-5)
plugins/vpn.h (+2/-1)
plugins/vpnc.c (+290/-0)
plugins/wifi-legacy.c (+0/-243)
plugins/wifi.c (+602/-147)
scripts/openconnect-script.c (+4/-0)
src/agent.c (+161/-1)
src/config.c (+165/-8)
src/connection.c (+8/-2)
src/connman.h (+34/-27)
src/dbus.c (+4/-0)
src/detect.c (+1/-0)
src/device.c (+48/-7)
src/dhcp.c (+183/-172)
src/dnsproxy.c (+1477/-0)
src/element.c (+8/-0)
src/inet.c (+102/-8)
src/ipconfig.c (+316/-224)
src/iptables.c (+4/-0)
src/ipv4.c (+5/-1)
src/location.c (+8/-0)
src/main.c (+7/-23)
src/manager.c (+2/-103)
src/network.c (+138/-92)
src/notifier.c (+19/-0)
src/ondemand.c (+0/-92)
src/provider.c (+230/-28)
src/proxy.c (+109/-7)
src/resolver.c (+291/-329)
src/rfkill.c (+4/-1)
src/rtnl.c (+167/-10)
src/selftest.c (+0/-43)
src/service.c (+535/-214)
src/session.c (+1/-0)
src/stats.c (+379/-51)
src/task.c (+8/-4)
src/technology.c (+258/-94)
src/tethering.c (+5/-29)
src/wpad.c (+19/-11)
test/disable-tethering (+23/-1)
test/enable-tethering (+37/-1)
test/get-services (+2/-1)
test/list-services (+3/-2)
test/monitor-services (+2/-1)
test/set-ip-method (+0/-34)
test/set-ipv4-method (+34/-0)
test/set-ipv6-method (+33/-0)
test/simple-agent (+51/-8)
test/test-manager (+9/-2)
tools/stats-ringbuffer-dump.c (+0/-408)
tools/stats-tool.c (+910/-0)
tools/web-test.c (+8/-0)
To merge this branch: bzr merge lp://qastaging/~cyphermox/ubuntu/natty/connman/0.69
Reviewer Review Type Date Requested Status
Micah Gersten (community) Approve
Review via email: mp+49322@code.qastaging.launchpad.net

Description of the change

New ConnMan release as requested by Kalle; to support the new indicator-network release.

To post a comment you must log in.
34. By Mathieu Trudel-Lapierre

debian/manpages/connmand.8: update to add BUGS section and fix AUTHORS
(LP: #587779)

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

I think this is mostly fine, I'm just wondering whether or not the binary depends on dhcp3-client is still wanted.

review: Needs Information
Revision history for this message
Daniel Holbach (dholbach) wrote :

I'm also not sure about the use of "Conflicts" - is there actual files conflicting or should it be "Breaks" instead?

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

> I'm also not sure about the use of "Conflicts" - is there actual files
> conflicting or should it be "Breaks" instead?

I was wondering the same, expecting that Breaks is indeed a better choice, but lintian disagrees with not having a version number for the Breaks field, and the following entry from the Debian Policy Manual, section 7.4; "Conflicts should be used": "in other cases where one must prevent simultaneous installation of two packages for reasons that are ongoing (not fixed in a later version of one of the packages)"

35. By Mathieu Trudel-Lapierre

debian/control: Remove binary Depends on dhcp3-client for connman.

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

> I think this is mostly fine, I'm just wondering whether or not the binary
> depends on dhcp3-client is still wanted.

Micah, that was indeed an oversight; connman provides its own DHCP client.

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

I'll upload this in the morning. Thanks. I believe the usage of Conflicts here is correct.

review: Approve

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