Merge lp:~ken-vandine/buteo-syncfw/0.8.5 into lp:buteo-syncfw

Proposed by Ken VanDine
Status: Superseded
Proposed branch: lp:~ken-vandine/buteo-syncfw/0.8.5
Merge into: lp:buteo-syncfw
Diff against target: 551 lines (+452/-0)
19 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/buteo-syncfw.install (+5/-0)
debian/changelog (+84/-0)
debian/compat (+1/-0)
debian/control (+53/-0)
debian/copyright (+23/-0)
debian/dirs (+3/-0)
debian/libbuteosyncfw5-0.install (+1/-0)
debian/libbuteosyncfw5-dev.install (+5/-0)
debian/libbuteosyncfw5-doc.install (+1/-0)
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/0002-Fixed-FUNCTION_CALL_TRACE-macro.patch (+36/-0)
debian/patches/0003-Added-upstart-service-file.patch (+60/-0)
debian/patches/0005-Initialize-network-status-on-constructor.patch (+68/-0)
debian/patches/libdir.patch (+13/-0)
debian/patches/series (+6/-0)
debian/rules (+18/-0)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/buteo-syncfw/0.8.5
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+303141@code.launchpad.net

Commit message

  * Updated to the latest upstream
  * Dropped patches that have been merged upstrean
    - debian/patches/0004-Fixed-OOP-plugin-initialization.patch
    - debian/patches/0006-Add-missing-include.patch

Description of the change

  * Updated to the latest upstream
  * Dropped patches that have been merged upstrean
    - debian/patches/0004-Fixed-OOP-plugin-initialization.patch
    - debian/patches/0006-Add-missing-include.patch

To post a comment you must log in.

Unmerged revisions

287. By Ken VanDine

* Dropped patches that have been merged upstrean
  - debian/patches/0004-Fixed-OOP-plugin-initialization.patch
  - debian/patches/0006-Add-missing-include.patch

286. By Ken VanDine

* Updated to the latest upstream
  - Dropped patches that have been merged upstrean
    * debian/patches/0004-Fixed-OOP-plugin-initialization.patch
    * debian/patches/0006-Add-missing-include.patch

285. By CI Train Bot Account

Releasing 0.7.21+16.04.20151216.1-0ubuntu1

284. By Renato Araujo Oliveira Filho

Initialize network status on constructor.

283. By CI Train Bot Account

Releasing 0.7.21+16.04.20151028-0ubuntu1

282. By Renato Araujo Oliveira Filho

Fixed OOP plugin initialization.

Wait until the OOP plugin service appear on DBUS, to continue plugin initialization. Fixes: #1509053

281. By CI Train Bot Account

Releasing 0.7.21+15.10.20151015-0ubuntu1

280. By Renato Araujo Oliveira Filho

Enable more debug messages.

279. By CI Train Bot Account

Releasing 0.7.21+15.10.20150930-0ubuntu1

278. By Renato Araujo Oliveira Filho

Remove patches already applied on trunk.
Create individual patches for ubuntu specific changes.
Approved by: Ken VanDine, Michael Sheldon

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2016-08-17 14:39:59 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== added directory 'debian'
10=== added file 'debian/buteo-syncfw.install'
11--- debian/buteo-syncfw.install 1970-01-01 00:00:00 +0000
12+++ debian/buteo-syncfw.install 2016-08-17 14:39:59 +0000
13@@ -0,0 +1,5 @@
14+etc/syncwidget/*
15+usr/bin/msyncd
16+usr/lib/systemd/user/msyncd.service
17+usr/share/upstart/sessions/msyncd.conf
18+usr/share/glib-2.0
19
20=== added file 'debian/changelog'
21--- debian/changelog 1970-01-01 00:00:00 +0000
22+++ debian/changelog 2016-08-17 14:39:59 +0000
23@@ -0,0 +1,84 @@
24+buteo-syncfw (0.8.5-0ubuntu1) UNRELEASED; urgency=medium
25+
26+ * Updated to the latest upstream
27+ * Dropped patches that have been merged upstrean
28+ - debian/patches/0004-Fixed-OOP-plugin-initialization.patch
29+ - debian/patches/0006-Add-missing-include.patch
30+
31+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 17 Aug 2016 10:11:26 -0400
32+
33+buteo-syncfw (0.7.21+16.04.20151216.1-0ubuntu1) xenial; urgency=medium
34+
35+ * Initialize network status on constructor. added:
36+ debian/patches/0005-Initialize-network-status-on-constructor.patch
37+ debian/patches/0006-Add-missing-include.patch
38+
39+ -- Renato Araujo Oliveira Filho <renato.filho@canonical.com> Wed, 16 Dec 2015 19:05:25 +0000
40+
41+buteo-syncfw (0.7.21+16.04.20151028-0ubuntu1) xenial; urgency=medium
42+
43+ [ Renato Araujo Oliveira Filho ]
44+ * Fixed OOP plugin initialization. (LP: #1509053)
45+
46+ -- Bill Filler <ci-train-bot@canonical.com> Wed, 28 Oct 2015 11:58:20 +0000
47+
48+buteo-syncfw (0.7.21+15.10.20151015-0ubuntu1) wily; urgency=medium
49+
50+ [ Renato Araujo Oliveira Filho ]
51+ * Enable more debug messages.
52+
53+ -- Bill Filler <ci-train-bot@canonical.com> Thu, 15 Oct 2015 19:50:38 +0000
54+
55+buteo-syncfw (0.7.21+15.10.20150930-0ubuntu1) wily; urgency=medium
56+
57+ [ Ken VanDine ]
58+ * debian/control
59+ - Added build depends on libglib2.0-dev
60+ * added packaging removed: debian/ debian/api debian/changelog
61+ debian/compat debian/control debian/copyright debian/dirs
62+ debian/docs debian/rules debian/sync-fw-dev.dirs debian/sync-fw-
63+ dev.install debian/sync-fw-doc.install debian/sync-fw-tests.install
64+ debian/sync-fw.aegis debian/sync-fw.dirs debian/sync-fw.install
65+ debian/sync-fw.postinst debian/sync-fw.preinst added: .bzr-builddeb/
66+ .bzr-builddeb/default.conf debian/ debian/buteo-syncfw.install
67+ debian/changelog debian/compat debian/control debian/copyright
68+ debian/dirs debian/docs debian/libbuteosyncfw5-0.install
69+ debian/libbuteosyncfw5-dev.install debian/libbuteosyncfw5-
70+ doc.install debian/patches/ debian/patches/0001-Ubuntu-phone-
71+ changes.patch debian/patches/libdir.patch debian/patches/series
72+ debian/rules debian/source/ debian/source/format
73+
74+ [ Renato Araujo Oliveira Filho ]
75+ * Remove patches already applied on trunk. Create individual patches
76+ for ubuntu specific changes.
77+
78+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 30 Sep 2015 18:15:03 +0000
79+
80+buteo-syncfw (0.7.21-0ubuntu1) wily; urgency=medium
81+
82+ * New package
83+ * debian/patches/0001-Ubuntu-phone-changes.patch
84+ - Fire 'enableSOC' for accounts already created.
85+ - Make sure the the signal 'enableSOC' is fired even for accounts
86+ that already exists.
87+ - Fire 'AccountsHelper' signals on idle after the constructor, to
88+ allow connections after create object.
89+ - Save profile before fire 'signalProfileChanged'.
90+ - The profile should be saved before fire the signal
91+ 'signalProfileChanged', otherwise the receiver that retrieve
92+ the profile will have a old version of it.
93+ - Start a sync just after create a new profile.
94+ - After create a online-account we want that account to get sync.
95+ - Wait untill network connection is available to sync.
96+ - Wait for internet connection before sync scheduled sync requests.
97+ - Does not run scheduled sync over mobile data connection.
98+ - Check for internet connection type before run a scheduled sync.
99+ - Added upstart service file.
100+ - Create upstart file to start msyncd service.
101+ - Avoid sync twice.
102+ - Remove pending syncs from 'iWaitingOnlineSyncs' and
103+ 'iSyncOnChangeScheduler', before run a sync to avoid sync twice.
104+ * debian/patches/libdir.patch
105+ - Set LIBDIR to be multi-arch friendly
106+
107+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 03 Aug 2015 09:47:20 -0400
108
109=== added file 'debian/compat'
110--- debian/compat 1970-01-01 00:00:00 +0000
111+++ debian/compat 2016-08-17 14:39:59 +0000
112@@ -0,0 +1,1 @@
113+9
114
115=== added file 'debian/control'
116--- debian/control 1970-01-01 00:00:00 +0000
117+++ debian/control 2016-08-17 14:39:59 +0000
118@@ -0,0 +1,53 @@
119+Source: buteo-syncfw
120+Section: utils
121+Priority: optional
122+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
123+XSBC-Original-Maintainer: Duggirala Karthik <karthik.2.duggirala@nokia.com>
124+Build-Depends: debhelper (>= 9),
125+ doxygen,
126+ libaccounts-qt5-dev,
127+ libdbus-1-dev,
128+ libglib2.0-dev,
129+ libgsettings-qt-dev,
130+ libiphb-dev,
131+ libsignon-qt5-dev,
132+ qtsystems5-dev,
133+ qt5-default,
134+ quilt,
135+Standards-Version: 3.9.5
136+Homepage: https://github.com/nemomobile/buteo-syncfw
137+
138+Package: buteo-syncfw
139+Architecture: any
140+Depends: ${misc:Depends},
141+ ${shlibs:Depends},
142+ libbuteosyncfw5-0 (= ${binary:Version}),
143+Description: Synchronization backend
144+ Synchronization backend, plugin manager, profile db, and conflict resolver.
145+
146+Package: libbuteosyncfw5-0
147+Section: libs
148+Architecture: any
149+Multi-Arch: same
150+Pre-Depends: ${misc:Pre-Depends}
151+Depends: ${misc:Depends},
152+ ${shlibs:Depends},
153+Description: Synchronization backend
154+ Synchronization backend, plugin manager, profile db, and conflict resolver.
155+
156+Package: libbuteosyncfw5-dev
157+Section: libdevel
158+Architecture: any
159+Depends: ${misc:Depends},
160+ ${shlibs:Depends},
161+ libbuteosyncfw5-0 (= ${binary:Version}),
162+ libdbus-1-dev,
163+Description: Files required for synchronizer plugin development
164+ Header file needed for making plugins.
165+
166+Package: libbuteosyncfw5-doc
167+Section: doc
168+Architecture: all
169+Depends: ${misc:Depends},
170+Description: API documentation for sync-fw.
171+ API documentation package for sync-fw.
172
173=== added file 'debian/copyright'
174--- debian/copyright 1970-01-01 00:00:00 +0000
175+++ debian/copyright 2016-08-17 14:39:59 +0000
176@@ -0,0 +1,23 @@
177+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
178+Upstream-Name: buteo-syncfw
179+Source: https://github.com/nemomobile/buteo-syncfw.git
180+
181+Files: *
182+Copyright: 2010 Nokia Corporation and/or its subsidiary(-ies)
183+License: LGPL-2.1
184+ These headers are free software; you can redistribute them
185+ and/or modify them under the terms of the GNU Lesser General Public
186+ License version 2.1 as published by the Free Software Foundation.
187+ .
188+ These headers are distributed in the hope that it will be useful,
189+ but WITHOUT ANY WARRANTY; without even the implied warranty of
190+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
191+ See the GNU Lesser General Public License for more details.
192+ .
193+ You should have received a copy of the GNU Lesser General Public
194+ License along with these headers.
195+ If not, see <http://www.gnu.org/licenses/>.
196+ .
197+ On Debian systems, the full text of the GNU Lesser General Public License
198+ version 2.1 can be found in the file /usr/share/common-licenses/LGPL-2.1.
199+
200
201=== added file 'debian/dirs'
202--- debian/dirs 1970-01-01 00:00:00 +0000
203+++ debian/dirs 2016-08-17 14:39:59 +0000
204@@ -0,0 +1,3 @@
205+usr/bin
206+usr/sbin
207+usr/lib
208
209=== added file 'debian/docs'
210=== added file 'debian/libbuteosyncfw5-0.install'
211--- debian/libbuteosyncfw5-0.install 1970-01-01 00:00:00 +0000
212+++ debian/libbuteosyncfw5-0.install 2016-08-17 14:39:59 +0000
213@@ -0,0 +1,1 @@
214+usr/lib/*/lib*.so.*
215
216=== added file 'debian/libbuteosyncfw5-dev.install'
217--- debian/libbuteosyncfw5-dev.install 1970-01-01 00:00:00 +0000
218+++ debian/libbuteosyncfw5-dev.install 2016-08-17 14:39:59 +0000
219@@ -0,0 +1,5 @@
220+usr/include/buteosyncfw5/*
221+usr/lib/*/pkgconfig/*.pc
222+usr/lib/*/*.prl
223+usr/lib/*/lib*.so
224+
225
226=== added file 'debian/libbuteosyncfw5-doc.install'
227--- debian/libbuteosyncfw5-doc.install 1970-01-01 00:00:00 +0000
228+++ debian/libbuteosyncfw5-doc.install 2016-08-17 14:39:59 +0000
229@@ -0,0 +1,1 @@
230+usr/share/doc/buteo-syncfw-doc/*
231
232=== added directory 'debian/patches'
233=== added file 'debian/patches/0001-Check-for-WLAN-or-ETHERNET-connections.patch'
234--- debian/patches/0001-Check-for-WLAN-or-ETHERNET-connections.patch 1970-01-01 00:00:00 +0000
235+++ debian/patches/0001-Check-for-WLAN-or-ETHERNET-connections.patch 2016-08-17 14:39:59 +0000
236@@ -0,0 +1,47 @@
237+From 161e8b4ad64be49822630b601c87fa97ce030de1 Mon Sep 17 00:00:00 2001
238+From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
239+Date: Tue, 22 Sep 2015 12:41:16 -0300
240+Subject: [PATCH] Check for WLAN or ETHERNET connections.
241+
242+Check for specific WLAN or ETHERNET connection to avoid problems with
243+Unknown types.
244+---
245+ libbuteosyncfw/common/NetworkManager.cpp | 11 ++++++-----
246+ 1 file changed, 6 insertions(+), 5 deletions(-)
247+
248+diff --git a/libbuteosyncfw/common/NetworkManager.cpp b/libbuteosyncfw/common/NetworkManager.cpp
249+index 811694c..418105a 100644
250+--- a/libbuteosyncfw/common/NetworkManager.cpp
251++++ b/libbuteosyncfw/common/NetworkManager.cpp
252+@@ -1,4 +1,4 @@
253+-/*
254++/*
255+ * This file is part of buteo-syncfw package
256+ *
257+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
258+@@ -167,17 +167,18 @@ void NetworkManager::idleRefresh()
259+ {
260+ // FIXME: due this bug lp:#1444162 on nm the QNetworkConfigurationManager
261+ // returns the wrong default connection.
262+- // We will consider the connection with the smallest bearer as the
263+- // default connection, with that wifi and ethernet will be the first one
264+- // https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1444162
265++ // We will consider the first active connection as default connection
266++ // unless that there is a WLAN or Ethernet connection active
267+ connectionType = activeConfigs.first().bearerType();
268+ bearerTypeName = activeConfigs.first().bearerTypeName();
269+ foreach(const QNetworkConfiguration &conf, activeConfigs)
270+ {
271+- if (conf.bearerType() < connectionType)
272++ if ((conf.bearerType() == QNetworkConfiguration::BearerWLAN) ||
273++ (conf.bearerType() == QNetworkConfiguration::BearerEthernet))
274+ {
275+ connectionType = conf.bearerType();
276+ bearerTypeName = conf.bearerTypeName();
277++ break;
278+ }
279+ }
280+ }
281+--
282+2.1.4
283+
284
285=== added file 'debian/patches/0001-Disable-sheduled-syncs-over-cellular-connections.patch'
286--- debian/patches/0001-Disable-sheduled-syncs-over-cellular-connections.patch 1970-01-01 00:00:00 +0000
287+++ debian/patches/0001-Disable-sheduled-syncs-over-cellular-connections.patch 2016-08-17 14:39:59 +0000
288@@ -0,0 +1,25 @@
289+From b8ebc30e204c977f5f25d6176d5a82be3e399c4a Mon Sep 17 00:00:00 2001
290+From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
291+Date: Tue, 15 Sep 2015 10:18:05 -0300
292+Subject: [PATCH 1/3] Disable sheduled syncs over cellular connections.
293+
294+---
295+ msyncd/gschemas/com.meego.msyncd.gschema.xml | 2 +-
296+ 1 file changed, 1 insertion(+), 1 deletion(-)
297+
298+diff --git a/msyncd/gschemas/com.meego.msyncd.gschema.xml b/msyncd/gschemas/com.meego.msyncd.gschema.xml
299+index 4e410d5..f5b90fb 100644
300+--- a/msyncd/gschemas/com.meego.msyncd.gschema.xml
301++++ b/msyncd/gschemas/com.meego.msyncd.gschema.xml
302+@@ -4,7 +4,7 @@
303+ <key name="allow-scheduled-sync-over-cellular" type="b">
304+ <summary>Scheduled Sync over cellular</summary>
305+ <description>Allow scheduled syncs to run over cellular connections.</description>
306+- <default>true</default>
307++ <default>false</default>
308+ </key>
309+ </schema>
310+ </schemalist>
311+--
312+2.1.4
313+
314
315=== added file 'debian/patches/0002-Fixed-FUNCTION_CALL_TRACE-macro.patch'
316--- debian/patches/0002-Fixed-FUNCTION_CALL_TRACE-macro.patch 1970-01-01 00:00:00 +0000
317+++ debian/patches/0002-Fixed-FUNCTION_CALL_TRACE-macro.patch 2016-08-17 14:39:59 +0000
318@@ -0,0 +1,36 @@
319+From 512bdd8f480c0790797521884145e3e6d8661254 Mon Sep 17 00:00:00 2001
320+From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
321+Date: Mon, 14 Sep 2015 17:38:48 -0300
322+Subject: [PATCH 2/3] Fixed 'FUNCTION_CALL_TRACE' macro.
323+
324+Make sure that the macro print the correct elapsed time during the debug.
325+---
326+ libbuteosyncfw/common/LogMacros.h | 5 ++++-
327+ 1 file changed, 4 insertions(+), 1 deletion(-)
328+
329+diff --git a/libbuteosyncfw/common/LogMacros.h b/libbuteosyncfw/common/LogMacros.h
330+index bac9ef6..90f2c6f 100644
331+--- a/libbuteosyncfw/common/LogMacros.h
332++++ b/libbuteosyncfw/common/LogMacros.h
333+@@ -29,6 +29,7 @@
334+ #include <QTime>
335+ #include <QDebug>
336+ #include <QDateTime>
337++#include <QScopedPointer>
338+ #include "Logger.h"
339+
340+ //! Helper macro for writing log messages. Avoid using directly.
341+@@ -52,7 +53,9 @@
342+ * Creates a trace message to log when the function is entered and exited.
343+ * Logs also to time spent in the function.
344+ */
345+-# define FUNCTION_CALL_TRACE if (Buteo::Logger::instance()->getLogLevel() >= 9) Buteo::LogTimer timerDebugVariable(QString(__PRETTY_FUNCTION__));
346++# define FUNCTION_CALL_TRACE QScopedPointer<Buteo::LogTimer> timerDebugVariable; \
347++ if (Buteo::Logger::instance()->getLogLevel() >= 9) \
348++ timerDebugVariable.reset(new Buteo::LogTimer(QString(__PRETTY_FUNCTION__)));
349+
350+ namespace Buteo {
351+
352+--
353+2.1.4
354+
355
356=== added file 'debian/patches/0003-Added-upstart-service-file.patch'
357--- debian/patches/0003-Added-upstart-service-file.patch 1970-01-01 00:00:00 +0000
358+++ debian/patches/0003-Added-upstart-service-file.patch 2016-08-17 14:39:59 +0000
359@@ -0,0 +1,60 @@
360+From 9b680c6f63b17c72beb0e770a1fd4a79a96cb75d Mon Sep 17 00:00:00 2001
361+From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
362+Date: Fri, 3 Jul 2015 14:49:13 -0300
363+Subject: [PATCH 1/2] Added upstart service file.
364+
365+Create upstart file to start msyncd service.
366+---
367+ msyncd/bin/msyncd.conf | 15 +++++++++++++++
368+ msyncd/msyncd-app.pro | 5 ++++-
369+ 2 files changed, 19 insertions(+), 1 deletion(-)
370+ create mode 100644 msyncd/bin/msyncd.conf
371+
372+diff --git a/msyncd/bin/msyncd.conf b/msyncd/bin/msyncd.conf
373+new file mode 100644
374+index 0000000..3ceced3
375+--- /dev/null
376++++ b/msyncd/bin/msyncd.conf
377+@@ -0,0 +1,15 @@
378++description "address-book-service"
379++author "Bill Filler <bill.filler@canonical.com>"
380++
381++start on started unity8-dash
382++stop on runlevel [06]
383++
384++# give some time to nm be ready
385++pre-start script
386++ sleep 10;
387++ initctl set-env MSYNCD_LOGGING_LEVEL=6
388++end script
389++
390++respawn
391++
392++exec /usr/bin/msyncd
393+diff --git a/msyncd/msyncd-app.pro b/msyncd/msyncd-app.pro
394+index be59a8c..ca0a53d 100644
395+--- a/msyncd/msyncd-app.pro
396++++ b/msyncd/msyncd-app.pro
397+@@ -59,7 +59,9 @@ target.path = /usr/bin/
398+ loglevel.files = bin/set_sync_log_level
399+ loglevel.path = /etc/buteo/
400+ service.files = bin/msyncd.service
401++upstart.files = bin/msyncd.conf
402+ service.path = /usr/lib/systemd/user/
403++upstart.path = /usr/share/upstart/sessions/
404+ syncwidget.path = /etc/syncwidget/
405+ syncwidget.files = com.meego.msyncd
406+ gschemas.path = /usr/share/glib-2.0/schemas
407+@@ -68,7 +70,8 @@ INSTALLS += target \
408+ loglevel \
409+ syncwidget \
410+ service \
411+- gschemas
412++ gschemas \
413++ upstart
414+
415+ # #####################################################################
416+ # make coverage (debug)
417+--
418+2.1.4
419+
420
421=== added file 'debian/patches/0005-Initialize-network-status-on-constructor.patch'
422--- debian/patches/0005-Initialize-network-status-on-constructor.patch 1970-01-01 00:00:00 +0000
423+++ debian/patches/0005-Initialize-network-status-on-constructor.patch 2016-08-17 14:39:59 +0000
424@@ -0,0 +1,68 @@
425+From ad422d2895f5016f6080bb2cb64f76f2e37d7198 Mon Sep 17 00:00:00 2001
426+From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
427+Date: Wed, 16 Dec 2015 15:37:59 -0300
428+Subject: [PATCH] Initialize network status on constructor.
429+
430+---
431+ libbuteosyncfw/common/NetworkManager.cpp | 10 +++++++---
432+ msyncd/synchronizer.cpp | 7 ++++---
433+ 2 files changed, 11 insertions(+), 6 deletions(-)
434+
435+diff --git a/libbuteosyncfw/common/NetworkManager.cpp b/libbuteosyncfw/common/NetworkManager.cpp
436+index 418105a..732bd45 100644
437+--- a/libbuteosyncfw/common/NetworkManager.cpp
438++++ b/libbuteosyncfw/common/NetworkManager.cpp
439+@@ -70,8 +70,12 @@ NetworkManager::NetworkManager(QObject *parent /* = 0*/) :
440+ Qt::QueuedConnection);
441+ m_idleRefreshTimer.setSingleShot(true);
442+
443+- m_isOnline = m_networkConfigManager->isOnline();
444+- LOG_DEBUG("Online status::" << m_isOnline);
445++ // check connection status on startup
446++ idleRefresh();
447++ LOG_INFO("Networ status:");
448++ LOG_INFO("\tOnline::" << m_isOnline);
449++ LOG_INFO("\tConnection::" << m_connectionType);
450++
451+ m_sessionTimer = new QTimer(this);
452+ m_sessionTimer->setSingleShot(true);
453+ m_sessionTimer->setInterval(10000);
454+@@ -182,7 +186,7 @@ void NetworkManager::idleRefresh()
455+ }
456+ }
457+ }
458+- LOG_DEBUG("New state:" << isOnline << " New type: " << bearerTypeName << "(" << connectionType << ")");
459++ LOG_INFO("Network New state:" << isOnline << " New type: " << bearerTypeName << "(" << connectionType << ")");
460+ if ((isOnline != m_isOnline) ||
461+ ((Sync::InternetConnectionType)connectionType != m_connectionType))
462+ {
463+diff --git a/msyncd/synchronizer.cpp b/msyncd/synchronizer.cpp
464+index eae297a..dc074f2 100644
465+--- a/msyncd/synchronizer.cpp
466++++ b/msyncd/synchronizer.cpp
467+@@ -297,18 +297,19 @@ bool Synchronizer::startScheduledSync(QString aProfileName)
468+ bool accept = acceptScheduledSync(iNetworkManager->isOnline(), iNetworkManager->connectionType());
469+ if(accept)
470+ {
471++ LOG_DEBUG("Network connection is valid. Will start sheduled sync");
472+ startSync(aProfileName, true);
473+ }
474+ else if (!iWaitingOnlineSyncs.contains(aProfileName))
475+ {
476+- LOG_DEBUG("Wait for internet connection:" << aProfileName);
477++ LOG_INFO("Wait for internet connection:" << aProfileName);
478+ if (iNetworkManager->isOnline())
479+ {
480+- LOG_DEBUG("Connection over mobile data plan. The sync will be postponed untill a full connection is available;");
481++ LOG_INFO("Connection over mobile data plan. The sync will be postponed untill a full connection is available;");
482+ }
483+ else
484+ {
485+- LOG_DEBUG("Device offline. Wait for internet connection.");
486++ LOG_INFO("Device offline. Wait for internet connection.");
487+ }
488+ iWaitingOnlineSyncs.append(aProfileName);
489+ }
490+--
491+2.1.4
492+
493
494=== added file 'debian/patches/libdir.patch'
495--- debian/patches/libdir.patch 1970-01-01 00:00:00 +0000
496+++ debian/patches/libdir.patch 2016-08-17 14:39:59 +0000
497@@ -0,0 +1,13 @@
498+=== modified file 'libbuteosyncfw/libbuteosyncfw.pro'
499+--- old/libbuteosyncfw/libbuteosyncfw.pro 2015-07-09 20:09:37 +0000
500++++ new/libbuteosyncfw/libbuteosyncfw.pro 2015-07-10 15:49:12 +0000
501+@@ -99,7 +99,7 @@
502+ QMAKE_CLEAN += lib$${TARGET}.prl pkgconfig/*
503+
504+ # install
505+-target.path = /usr/lib/
506++target.path = $${LIBDIR}
507+
508+ equals(QT_MAJOR_VERSION, 4): headers.path = /usr/include/buteosyncfw
509+ equals(QT_MAJOR_VERSION, 5): headers.path = /usr/include/buteosyncfw5
510+
511
512=== added file 'debian/patches/series'
513--- debian/patches/series 1970-01-01 00:00:00 +0000
514+++ debian/patches/series 2016-08-17 14:39:59 +0000
515@@ -0,0 +1,6 @@
516+libdir.patch
517+0001-Disable-sheduled-syncs-over-cellular-connections.patch
518+0002-Fixed-FUNCTION_CALL_TRACE-macro.patch
519+0003-Added-upstart-service-file.patch
520+0001-Check-for-WLAN-or-ETHERNET-connections.patch
521+0005-Initialize-network-status-on-constructor.patch
522
523=== added file 'debian/rules'
524--- debian/rules 1970-01-01 00:00:00 +0000
525+++ debian/rules 2016-08-17 14:39:59 +0000
526@@ -0,0 +1,18 @@
527+#!/usr/bin/make -f
528+# -*- makefile -*-
529+
530+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
531+
532+override_dh_auto_configure:
533+ dh_auto_configure -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
534+
535+override_dh_auto_install:
536+ dh_auto_install
537+
538+ # remove tests
539+ rm -rf debian/tmp/opt
540+ rm -rf debian/tmp/usr/share/accounts/services/testsync-ovi.service
541+
542+%:
543+ dh $@ --fail-missing
544+
545
546=== added directory 'debian/source'
547=== added file 'debian/source/format'
548--- debian/source/format 1970-01-01 00:00:00 +0000
549+++ debian/source/format 2016-08-17 14:39:59 +0000
550@@ -0,0 +1,1 @@
551+3.0 (quilt)

Subscribers

People subscribed via source and target branches

to all changes: