diff -urN 1/debian/changelog 2/debian/changelog
--- 1/debian/changelog 2015-10-20 11:25:30.000000000 +0300
+++ 2/debian/changelog 2015-10-20 11:38:59.000000000 +0300
@@ -1,12 +1,11 @@
-sync-monitor (0.2+15.10.20151014.1-0ubuntu1) wily; urgency=medium
+sync-monitor (0.2+15.10.20151020-0ubuntu1) wily; urgency=medium
[ Renato Araujo Oliveira Filho ]
* Export 'syncAcount' function over DBUs to be used during the account
migration.
- * Revert google-carddav.service.in removal. added:
- accounts/services/google-carddav.service.in
+ * Revert google-carddav.service.in removal.
- -- Bill Filler <ci-train-bot@canonical.com> Wed, 14 Oct 2015 23:32:42 +0000
+ -- Bill Filler <ci-train-bot@canonical.com> Tue, 20 Oct 2015 08:25:13 +0000
sync-monitor (0.2+15.10.20150929-0ubuntu1) wily; urgency=medium
diff -urN 1/src/sync-account.cpp 2/src/sync-account.cpp
--- 1/src/sync-account.cpp 2015-10-15 02:32:39.000000000 +0300
+++ 2/src/sync-account.cpp 2015-10-20 11:25:11.000000000 +0300
@@ -120,7 +120,6 @@
m_currentSession = 0;
if (m_state == SyncAccount::Syncing) {
- qDebug() << "Session cancelled firing syncError";
Q_EMIT syncError(serviceName, "canceled");
} else {
qDebug() << "Cancelled with no sync state";
diff -urN 1/src/sync-daemon.cpp 2/src/sync-daemon.cpp
--- 1/src/sync-daemon.cpp 2015-10-15 02:32:39.000000000 +0300
+++ 2/src/sync-daemon.cpp 2015-10-20 11:25:11.000000000 +0300
@@ -146,7 +146,7 @@
qDebug() << "Do not try re-sync the account";
}
m_currentAccount->cancel(m_currentServiceName);
- }
+ }
if (m_timeout->isActive()) {
m_timeout->stop();
}
@@ -191,7 +191,6 @@
account->deleteLater();
} else {
acc->setRetrySync(false);
- qDebug() << "ACCOUNT TO SYNC" << (void*) acc;
connect(acc, SIGNAL(syncStarted(QString, bool)),
SLOT(onAccountSyncStarted(QString, bool)));
connect(acc, SIGNAL(syncFinished(QString, bool, QString, QString)),