diff -Nru kdepim-runtime-15.07.90/debian/changelog kdepim-runtime-15.08.0/debian/changelog
--- kdepim-runtime-15.07.90/debian/changelog	2015-08-24 09:21:53.000000000 +0000
+++ kdepim-runtime-15.08.0/debian/changelog	2015-08-27 16:39:09.000000000 +0000
@@ -1,3 +1,9 @@
+kdepim-runtime (4:15.08.0-0ubuntu1) wily; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 21 Aug 2015 17:41:27 +0100
+
 kdepim-runtime (4:15.07.90-0ubuntu2) wily; urgency=medium
 
   * Remove explicit libkolab dependency
diff -Nru kdepim-runtime-15.07.90/debian/control kdepim-runtime-15.08.0/debian/control
--- kdepim-runtime-15.07.90/debian/control	2015-08-24 09:10:27.000000000 +0000
+++ kdepim-runtime-15.08.0/debian/control	2015-08-26 16:23:12.000000000 +0000
@@ -25,6 +25,7 @@
                libkf5codecs-dev,
                libkf5config-dev,
                libkf5contacts-dev,
+               libkf5gapi-dev,
                libkf5identitymanagement-dev,
                libkf5imap-dev,
                libkf5itemmodels-dev,
diff -Nru kdepim-runtime-15.07.90/debian/kdepim-runtime.install kdepim-runtime-15.08.0/debian/kdepim-runtime.install
--- kdepim-runtime-15.07.90/debian/kdepim-runtime.install	2015-08-19 15:33:33.000000000 +0000
+++ kdepim-runtime-15.08.0/debian/kdepim-runtime.install	2015-08-26 16:23:12.000000000 +0000
@@ -3,6 +3,8 @@
 usr/bin/akonadi_birthdays_resource
 usr/bin/akonadi_contacts_resource
 usr/bin/akonadi_davgroupware_resource
+usr/bin/akonadi_googlecalendar_resource
+usr/bin/akonadi_googlecontacts_resource
 usr/bin/akonadi_ical_resource
 usr/bin/akonadi_icaldir_resource
 usr/bin/akonadi_imap_resource
@@ -63,6 +65,8 @@
 usr/share/akonadi/agents/birthdaysresource.desktop
 usr/share/akonadi/agents/contactsresource.desktop
 usr/share/akonadi/agents/davgroupwareresource.desktop
+usr/share/akonadi/agents/googlecalendarresource.desktop
+usr/share/akonadi/agents/googlecontactsresource.desktop
 usr/share/akonadi/agents/icaldirresource.desktop
 usr/share/akonadi/agents/icalresource.desktop
 usr/share/akonadi/agents/imapresource.desktop
diff -Nru kdepim-runtime-15.07.90/resources/dav/common/davcollectionsfetchjob.cpp kdepim-runtime-15.08.0/resources/dav/common/davcollectionsfetchjob.cpp
--- kdepim-runtime-15.07.90/resources/dav/common/davcollectionsfetchjob.cpp	2015-08-02 15:16:39.000000000 +0000
+++ kdepim-runtime-15.08.0/resources/dav/common/davcollectionsfetchjob.cpp	2015-08-10 21:01:02.000000000 +0000
@@ -70,16 +70,23 @@
 
 void DavCollectionsFetchJob::principalFetchFinished(KJob *job)
 {
-    if (job->error()) {
-        // This may mean that the URL was not a principal URL.
-        // Retry as if it were a calendar URL.
-        qDebug() << job->errorText();
-        doCollectionsFetch(mUrl.url());
+    const DavPrincipalHomeSetsFetchJob *davJob = qobject_cast<DavPrincipalHomeSetsFetchJob *>(job);
+
+    if (davJob->error()) {
+        if ( davJob->latestResponseCode() ) {
+            // If we have a HTTP response code then this may mean that
+            // the URL was not a principal URL. Retry as if it were a calendar URL.
+            qDebug() << job->errorText();
+            doCollectionsFetch(mUrl.url());
+        }
+        else {
+            // Just give up here.
+            emitResult();
+        }
+
         return;
     }
 
-    const DavPrincipalHomeSetsFetchJob *davJob = qobject_cast<DavPrincipalHomeSetsFetchJob *>(job);
-
     const QStringList homeSets = davJob->homeSets();
     qDebug() << "Found " << homeSets.size() << " homesets";
     qDebug() << homeSets;
diff -Nru kdepim-runtime-15.07.90/resources/dav/common/davprincipalhomesetsfetchjob.cpp kdepim-runtime-15.08.0/resources/dav/common/davprincipalhomesetsfetchjob.cpp
--- kdepim-runtime-15.07.90/resources/dav/common/davprincipalhomesetsfetchjob.cpp	2015-08-02 15:16:39.000000000 +0000
+++ kdepim-runtime-15.08.0/resources/dav/common/davprincipalhomesetsfetchjob.cpp	2015-08-10 21:01:02.000000000 +0000
@@ -26,7 +26,7 @@
 #include <KLocalizedString>
 
 DavPrincipalHomeSetsFetchJob::DavPrincipalHomeSetsFetchJob(const DavUtils::DavUrl &url, QObject *parent)
-    : KJob(parent), mUrl(url)
+    : DavJobBase(parent), mUrl(url)
 {
 }
 
@@ -80,6 +80,7 @@
             err = davJob->errorText();
         }
 
+        setLatestResponseCode( responseCode );
         setError(UserDefinedError + responseCode);
         setErrorText(i18n("There was a problem with the request.\n"
                           "%1 (%2).", err, responseCode));
diff -Nru kdepim-runtime-15.07.90/resources/dav/common/davprincipalhomesetsfetchjob.h kdepim-runtime-15.08.0/resources/dav/common/davprincipalhomesetsfetchjob.h
--- kdepim-runtime-15.07.90/resources/dav/common/davprincipalhomesetsfetchjob.h	2015-08-02 15:16:39.000000000 +0000
+++ kdepim-runtime-15.08.0/resources/dav/common/davprincipalhomesetsfetchjob.h	2015-08-10 21:01:02.000000000 +0000
@@ -19,6 +19,7 @@
 #ifndef DAVPRINCIPALHOMESETSFETCHJOB_H
 #define DAVPRINCIPALHOMESETSFETCHJOB_H
 
+#include "davjobbase.h"
 #include "davutils.h"
 
 #include <kjob.h>
@@ -28,7 +29,7 @@
 /**
  * @short A job that fetches home sets for a principal.
  */
-class DavPrincipalHomeSetsFetchJob : public KJob
+class DavPrincipalHomeSetsFetchJob : public DavJobBase
 {
     Q_OBJECT
 
diff -Nru kdepim-runtime-15.07.90/resources/shared/singlefileresource/singlefileresourceconfigdialog_desktop.ui kdepim-runtime-15.08.0/resources/shared/singlefileresource/singlefileresourceconfigdialog_desktop.ui
--- kdepim-runtime-15.07.90/resources/shared/singlefileresource/singlefileresourceconfigdialog_desktop.ui	2015-08-02 15:16:39.000000000 +0000
+++ kdepim-runtime-15.08.0/resources/shared/singlefileresource/singlefileresourceconfigdialog_desktop.ui	2015-08-10 21:01:02.000000000 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>487</width>
-    <height>479</height>
+    <height>497</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
diff -Nru kdepim-runtime-15.07.90/resources/shared/singlefileresource/singlefileresourceconfigdialog.h kdepim-runtime-15.08.0/resources/shared/singlefileresource/singlefileresourceconfigdialog.h
--- kdepim-runtime-15.07.90/resources/shared/singlefileresource/singlefileresourceconfigdialog.h	2015-08-02 15:16:39.000000000 +0000
+++ kdepim-runtime-15.08.0/resources/shared/singlefileresource/singlefileresourceconfigdialog.h	2015-08-10 21:01:02.000000000 +0000
@@ -50,7 +50,7 @@
 protected:
     void save() Q_DECL_OVERRIDE {
         mManager->updateSettings();
-        mSettings->setPath(ui.kcfg_Path->url().url());
+        mSettings->setPath(ui.kcfg_Path->url().toLocalFile());
         mSettings->save();
     }
 };