lp:~renatofilho/buteo-syncfw/ubuntu-changes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~phablet-team/buteo-syncfw/ubuntu at revision 278

Michael Sheldon (community): Approve on 2015-09-29

Ken VanDine: Approve on 2015-09-28

Diff: 3177 lines (+584/-1725)

28 files modified

debian/patches/0001-Check-for-WLAN-or-ETHERNET-connections.patch (+47/-0)
debian/patches/0001-Disable-sheduled-syncs-over-cellular-connections.patch (+25/-0)
debian/patches/0001-Ubuntu-phone-changes.patch (+0/-1544)
debian/patches/0002-Fixed-FUNCTION_CALL_TRACE-macro.patch (+36/-0)
debian/patches/0003-Added-upstart-service-file.patch (+59/-0)
debian/patches/series (+4/-1)
libbuteosyncfw/common/Logger.cpp (+2/-2)
libbuteosyncfw/common/NetworkManager.cpp (+79/-17)
libbuteosyncfw/common/NetworkManager.h (+15/-3)
libbuteosyncfw/common/SyncCommonDefs.h (+17/-0)
libbuteosyncfw/common/TransportTracker.cpp (+12/-12)
libbuteosyncfw/common/TransportTracker.h (+4/-3)
libbuteosyncfw/profile/ProfileManager.cpp (+9/-5)
libbuteosyncfw/profile/SyncProfile.cpp (+5/-8)
msyncd/AccountsHelper.cpp (+48/-16)
msyncd/AccountsHelper.h (+29/-30)
msyncd/SyncDBusAdaptor.cpp (+8/-0)
msyncd/SyncDBusAdaptor.h (+5/-0)
msyncd/SyncDBusInterface.h (+22/-15)
msyncd/SyncOnChangeScheduler.cpp (+9/-0)
msyncd/SyncOnChangeScheduler.h (+2/-1)
msyncd/SyncSession.h (+1/-1)
msyncd/gschemas/com.meego.msyncd.gschema.xml (+10/-0)
msyncd/msyncd-app.pro (+4/-1)
msyncd/msyncd-lib.pro (+1/-1)
msyncd/synchronizer.cpp (+115/-59)
msyncd/synchronizer.h (+14/-4)
unittests/tests/msyncdtests/TransportTrackerTest.cpp (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

281. By Renato Araujo Oliveira Filho on 2015-09-30

Disable debug messages.

280. By Renato Araujo Oliveira Filho on 2015-09-22

Check for specific WLAN or ETHERNET connection to avoid problems with Unknown types.

279. By Renato Araujo Oliveira Filho on 2015-09-15

Remove patches already applied on trunk.

Create individual patches for ubuntu specific changes.

278. By Renato Araujo Oliveira Filho on 2015-09-15

Trunk merged.

277. By Ken VanDine on 2015-09-14

cleaned up changelog

276. By Ken VanDine on 2015-09-11

added packaging

275. By Chris Adams on 2015-06-01

Bump version

274. By Chris Adams on 2015-06-01

[buteo-syncfw] Use try-restart in %post. Contributes to MER#1044

This commit ensures that the %post script doesn't attempt to restart
any daemons or services if they're not already running, since this
causes problems during device upgrades.

Contributes to MER#1044

273. By Antti Seppälä <email address hidden> on 2015-04-08

Bump version

272. By Antti Seppälä on 2015-04-08

Merge pull request #85 from nemomobile/fixpath

[buteo-syncfw] Make sure sync path exists